diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 42 | ||||
| -rw-r--r-- | engine/battle/end_of_battle.asm | 2 | ||||
| -rw-r--r-- | engine/battle/init_battle.asm | 6 | ||||
| -rw-r--r-- | engine/events/diploma2.asm | 16 | ||||
| -rw-r--r-- | engine/events/hidden_objects/museum_fossils2.asm | 2 | ||||
| -rw-r--r-- | engine/events/hidden_objects/safari_game.asm | 2 | ||||
| -rw-r--r-- | engine/events/in_game_trades.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/hp_bar.asm | 4 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 6 | ||||
| -rw-r--r-- | engine/menus/link_menu.asm | 6 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 4 | ||||
| -rw-r--r-- | engine/menus/pokedex.asm | 2 | ||||
| -rw-r--r-- | engine/menus/text_box.asm | 6 | ||||
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 6 | ||||
| -rw-r--r-- | engine/movie/evolution.asm | 2 | ||||
| -rw-r--r-- | engine/movie/splash.asm | 2 | ||||
| -rw-r--r-- | engine/movie/trade.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/elevator.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_animations.asm | 1 | ||||
| -rw-r--r-- | engine/overworld/player_state.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/push_boulder.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/tilesets.asm | 4 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_pcm.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/evos_moves.asm | 1 |
24 files changed, 65 insertions, 69 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 27ed1093..8618cced 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -411,12 +411,12 @@ MainInBattleLoop: cp USING_INTERNAL_CLOCK jr z, .invertOutcome call BattleRandom - cp $80 + cp 50 percent + 1 jr c, .playerMovesFirst jr .enemyMovesFirst .invertOutcome call BattleRandom - cp $80 + cp 50 percent + 1 jr c, .enemyMovesFirst jr .playerMovesFirst .enemyMovesFirst @@ -791,7 +791,7 @@ FaintEnemyPokemon: ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -875,7 +875,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 + Ch5], a + ld [wChannelSoundIDs + CHAN5], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -1358,7 +1358,7 @@ EnemySendOutFirstMon: ld [wWhichPokemon], a jr .next3 .next - ld b, $FF + ld b, $ff .next2 inc b ld a, [wEnemyMonPartyPos] @@ -1411,7 +1411,7 @@ EnemySendOutFirstMon: cp LINK_STATE_BATTLING jr z, .next4 ld a, [wOptions] - bit 6, a + bit BIT_BATTLE_SHIFT, a jr nz, .next4 ld hl, TrainerAboutToUseText call PrintText @@ -1939,7 +1939,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + CHAN5], a ret .setLowHealthAlarm ld hl, wLowHealthAlarm @@ -2174,7 +2174,7 @@ DisplayBattleMenu:: ld [hli], a ; wMaxMenuItem ld [hl], D_RIGHT | A_BUTTON ; wMenuWatchedKeys call HandleMenuInput - bit 4, a ; check if right was pressed + bit BIT_D_RIGHT, a jr nz, .rightColumn jr .AButtonPressed ; the A button was pressed .rightColumn ; put cursor in right column of menu @@ -2455,7 +2455,7 @@ PartyMenuOrRockOrRun: xor a ld [hl], a ; wLastMenuItem call HandleMenuInput - bit 1, a ; was A pressed? + bit BIT_B_BUTTON, a jr nz, .partyMonDeselected ; if B was pressed, jump ; A was pressed call PlaceUnfilledArrowMenuCursor @@ -3131,19 +3131,19 @@ SelectEnemyMove: .chooseRandomMove push hl call BattleRandom - ld b, $1 - cp $3f ; select move 1, [0,3e] (63/256 chance) + ld b, 1 ; 25% chance to select move 1 + cp 25 percent jr c, .moveChosen inc hl - inc b - cp $7f ; select move 2, [3f,7e] (64/256 chance) + inc b ; 25% chance to select move 2 + cp 50 percent jr c, .moveChosen inc hl - inc b - cp $be ; select move 3, [7f,bd] (63/256 chance) + inc b ; 25% chance to select move 3 + cp 75 percent - 1 jr c, .moveChosen inc hl - inc b ; select move 4, [be,ff] (66/256 chance) + inc b ; 25% chance to select move 4 .moveChosen ld a, b dec a @@ -3583,7 +3583,7 @@ CheckPlayerStatusConditions: ld a, CONF_ANIM - 1 call PlayMoveAnimation call BattleRandom - cp $80 ; 50% chance to hurt itself + cp 50 percent + 1 ; chance to hurt itself jr c, .TriedToUseDisabledMoveCheck ld hl, wPlayerBattleStatus1 ld a, [hl] @@ -4792,7 +4792,7 @@ CriticalHitTest: dec hl ld c, [hl] ; read move id ld a, [de] - bit GETTING_PUMPED, 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) @@ -5548,10 +5548,10 @@ MoveHitTest: .swiftCheck 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) + ret z ; Swift never misses (this was fixed from the Japanese versions) call CheckTargetSubstitute ; substitute check (note that this overwrites a) jr z, .checkForDigOrFlyStatus -; This code is buggy. It's supposed to prevent HP draining moves from working on substitutes. +; The fix for Swift broke this code. It's supposed to prevent HP draining moves from working on Substitutes. ; Since CheckTargetSubstitute overwrites a with either $00 or $01, it never works. cp DRAIN_HP_EFFECT jp z, .moveMissed @@ -6129,7 +6129,7 @@ CheckEnemyStatusConditions: bit PAR, [hl] jr z, .checkIfUsingBide call BattleRandom - cp $3f ; 25% to be fully paralysed + cp 25 percent ; chance to be fully paralysed jr nc, .checkIfUsingBide ld hl, FullyParalyzedText call PrintText diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index e64f54e7..e07c243e 100644 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -50,7 +50,7 @@ EndOfBattle: .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + CHAN5], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a diff --git a/engine/battle/init_battle.asm b/engine/battle/init_battle.asm index 680befda..e7be112c 100644 --- a/engine/battle/init_battle.asm +++ b/engine/battle/init_battle.asm @@ -12,11 +12,11 @@ InitOpponent: DetermineWildOpponent: ld a, [wd732] bit 1, a - jr z, .asm_3ef2f + jr z, .notDebug ldh a, [hJoyHeld] - bit 1, a ; B button pressed? + bit BIT_B_BUTTON, a ret nz -.asm_3ef2f +.notDebug ld a, [wNumberOfNoRandomBattleStepsLeft] and a ret nz diff --git a/engine/events/diploma2.asm b/engine/events/diploma2.asm index efc3b9cd..87a44439 100644 --- a/engine/events/diploma2.asm +++ b/engine/events/diploma2.asm @@ -23,11 +23,11 @@ _DisplayDiploma: hlcoord 19, 0 ld [hl], a - ld de, String_e9a73 + ld de, DiplomaText hlcoord 5, 2 call PlaceString - ld de, String_e9a7d + ld de, DiplomaPlayer hlcoord 3, 4 call PlaceString @@ -35,11 +35,11 @@ _DisplayDiploma: hlcoord 10, 4 call PlaceString - ld de, String_e9a84 + ld de, DiplomaCongrats hlcoord 2, 6 call PlaceString - ld de, String_e9ac8 + ld de, DiplomaGameFreak hlcoord 9, 16 call PlaceString @@ -51,20 +51,20 @@ _DisplayDiploma: call GBPalNormal ret -String_e9a73: +DiplomaText: db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@" -String_e9a7d: +DiplomaPlayer: db "Player@" -String_e9a84: +DiplomaCongrats: db "Congrats! This" next "diploma certifies" next "that you have" next "completed your" next "#DEX.@" -String_e9ac8: +DiplomaGameFreak: db "GAME FREAK@" Func_e9ad3: diff --git a/engine/events/hidden_objects/museum_fossils2.asm b/engine/events/hidden_objects/museum_fossils2.asm index fce0f03a..d8090e0a 100644 --- a/engine/events/hidden_objects/museum_fossils2.asm +++ b/engine/events/hidden_objects/museum_fossils2.asm @@ -14,7 +14,7 @@ DisplayMonFrontSpriteInBox: ld a, [wcf91] ld [wd0b5], a call GetMonHeader - ld de, vChars1 + $310 + ld de, vChars1 tile $31 call LoadMonFrontSprite ld a, $80 ldh [hStartTileID], a diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm index 5a267346..2863a201 100644 --- a/engine/events/hidden_objects/safari_game.asm +++ b/engine/events/hidden_objects/safari_game.asm @@ -36,7 +36,7 @@ SafariZoneGameOver: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .waitForMusicToPlay - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_SAFARI_ZONE_PA jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index a0a23dfa..1b7d2678 100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm @@ -244,7 +244,7 @@ InGameTrade_CheckForTradeEvo: ld [wForceEvolution], a ld a, LINK_STATE_TRADING ld [wLinkState], a - callfar EvolveTradeMon + callfar TryEvolvingMon xor a ; LINK_STATE_NONE ld [wLinkState], a jp PlayDefaultMusic diff --git a/engine/gfx/hp_bar.asm b/engine/gfx/hp_bar.asm index fcbf1a29..6db3956d 100644 --- a/engine/gfx/hp_bar.asm +++ b/engine/gfx/hp_bar.asm @@ -216,9 +216,9 @@ UpdateHPBar_PrintHPNumber: ld de, $15 ldh a, [hUILayoutFlags] bit 0, a - jr z, .next + jr z, .hpBelowBar ld de, $9 -.next +.hpBelowBar add hl, de push hl ld a, " " diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 47d48062..c2ff34dc 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1108,7 +1108,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 + Ch5], a + ld [wChannelSoundIDs + CHAN5], a push hl push de ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) @@ -1933,7 +1933,7 @@ ItemUsePokeflute: call WaitForSoundToFinish ; wait for sound to end farcall Music_PokeFluteInBattle ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + CHAN7] and a ; music off? jr nz, .musicWaitLoop .skipMusic @@ -1999,7 +1999,7 @@ PlayedFluteHadEffectText: ld c, BANK(SFX_Pokeflute) call PlayMusic .musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch3] + ld a, [wChannelSoundIDs + CHAN3] cp SFX_POKEFLUTE jr z, .musicWaitLoop call PlayDefaultMusic ; start playing normal music again diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm index 409316c9..ada3941e 100644 --- a/engine/menus/link_menu.asm +++ b/engine/menus/link_menu.asm @@ -690,13 +690,13 @@ LinkMenu: ld b, a and $f0 cp $d0 - jr z, .asm_f5c7d + jr z, .checkEnemyMenuSelection ld a, [wLinkMenuSelectionReceiveBuffer + 1] ld b, a and $f0 cp $d0 jr nz, .exchangeMenuSelectionLoop -.asm_f5c7d +.checkEnemyMenuSelection ld a, b and $c ; did the enemy press A or B? jr nz, .enemyPressedAOrB @@ -720,7 +720,7 @@ LinkMenu: ld a, b ld [wLinkMenuSelectionSendBuffer], a and $3 - ld [wCurrentMenuItem], a ; wCurrentMenuItem + ld [wCurrentMenuItem], a .doneChoosingMenuSelection ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 6ccbb597..cfcfcb74 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -123,9 +123,9 @@ MainMenu: jp SpecialEnterMap InitOptions: - ld a, 1 ; no delay + ld a, TEXT_DELAY_FAST ld [wLetterPrintingDelayFlags], a - ld a, 3 ; medium speed + ld a, TEXT_DELAY_MEDIUM ld [wOptions], a ld a, 64 ; audio? ld [wPrinterSettings], a diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 1ab1ff9b..36b2bb04 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -100,7 +100,7 @@ HandlePokedexSideMenu: ldh [hJoy7], a .handleMenuInput call HandleMenuInput - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a ld b, 2 jr nz, .buttonBPressed ld a, [wCurrentMenuItem] diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm index 7a315af2..697fe507 100644 --- a/engine/menus/text_box.asm +++ b/engine/menus/text_box.asm @@ -173,9 +173,9 @@ DoBuySellQuitMenu: ld [wd730], a call HandleMenuInput call PlaceUnfilledArrowMenuCursor - bit 0, a ; was A pressed? + bit BIT_A_BUTTON, a jr nz, .pressedA - bit 1, a ; was B pressed? (always true since only A/B are watched) + bit BIT_B_BUTTON, a ; always true since only A/B are watched jr z, .pressedA ld a, CANCELLED_MENU ld [wMenuExitMethod], a @@ -282,7 +282,7 @@ DisplayTwoOptionMenu: res 6, [hl] ; turn on the printing delay call HandleMenuInput pop hl - bit 1, a ; A button pressed? + bit BIT_B_BUTTON, a jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed .pressedAButton ld a, [wCurrentMenuItem] diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index 3d0ed892..9e93d970 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -715,7 +715,7 @@ Func_f848d: ld [wSurfingMinigameRadnessMeter], a ld [wSurfingMinigameTrickFlags], a xor a - ld [wChannelSoundIDs + Ch8], a + ld [wChannelSoundIDs + CHAN8], a ld a, SFX_SURFING_JUMP call PlaySound ret @@ -751,7 +751,7 @@ SurfingMinigame_ScoreCurrentWave: ld a, $10 call SetCurrentAnimatedObjectCallbackAndResetFrameStateRegisters xor a - ld [wChannelSoundIDs + Ch8], a + ld [wChannelSoundIDs + CHAN8], a ld a, SFX_SURFING_CRASH call PlaySound ret @@ -1010,7 +1010,7 @@ SurfingMinigame_TileInteraction: call SufingMinigame_ReduceSpeedBy64 .action_3 xor a - ld [wChannelSoundIDs + Ch8], a + ld [wChannelSoundIDs + CHAN8], a ld a, SFX_SURFING_LAND call PlaySound and a diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index 2cf841c8..37e10188 100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -8,7 +8,7 @@ EvolveMon: push af xor a ld [wLowHealthAlarm], a - ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + CHAN5], a call StopAllMusic ld a, $1 ldh [hAutoBGTransferEnabled], a diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index 13f80bb1..03337525 100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm @@ -7,7 +7,7 @@ LoadShootingStarGraphics: call UpdateGBCPal_OBP1 ld de, AnimationTileset2 tile 3 ; star tile (top left quadrant) ld hl, vChars1 tile $20 - lb bc, BANK(AnimationTileset2), $01 + lb bc, BANK(AnimationTileset2), 1 call CopyVideoData ld de, AnimationTileset2 tile 19 ; star tile (bottom left quadrant) ld hl, vChars1 tile $21 diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index 3617f40a..7143701b 100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -624,7 +624,7 @@ Trade_WriteCircledMonOAM: Trade_AddOffsetsToOAMCoords: ld hl, wShadowOAM - ld c, $14 ; SCREEN_WIDTH? + ld c, $14 .loop ld a, [wBaseCoordY] add [hl] diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index b873ffad..3c425caa 100644 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -31,7 +31,7 @@ ShakeElevator:: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 008d5057..6f8a5c18 100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -14,7 +14,6 @@ EnterMapAnim:: ld hl, wd732 bit 4, [hl] ; used dungeon warp? pop hl - ;res 4, [hl] jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown ld a, SFX_TELEPORT_ENTER_2 diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index 4e37523b..4998360d 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -240,11 +240,11 @@ PrintSafariZoneSteps:: call PlaceString ld a, [wNumSafariBalls] cp 10 - jr nc, .numSafariBallsTwoDigits + jr nc, .tenOrMore hlcoord 5, 3 ld a, " " ld [hl], a -.numSafariBallsTwoDigits +.tenOrMore hlcoord 6, 3 ld de, wNumSafariBalls lb bc, 1, 2 diff --git a/engine/overworld/push_boulder.asm b/engine/overworld/push_boulder.asm index 09911ca3..a8e532d3 100644 --- a/engine/overworld/push_boulder.asm +++ b/engine/overworld/push_boulder.asm @@ -2,8 +2,6 @@ TryPushingBoulder:: ld a, [wd728] bit 0, a ; using Strength? ret z -Func_f0a7: -; where LoadMissableObjects predef points to now ld a, [wFlags_0xcd60] bit 1, a ; has boulder dust animation from previous push played yet? ret nz diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm index 21101e7b..11c2bef6 100644 --- a/engine/overworld/tilesets.asm +++ b/engine/overworld/tilesets.asm @@ -26,13 +26,13 @@ LoadTilesetHeader: call IsInArray pop de pop hl - jr c, .notDungeonTileset + jr c, .dungeon ld a, [wCurMapTileset] ld b, a ldh a, [hPreviousTileset] cp b jr z, .done -.notDungeonTileset +.dungeon ld a, [wDestinationWarpID] cp $ff jr z, .done diff --git a/engine/pikachu/pikachu_pcm.asm b/engine/pikachu/pikachu_pcm.asm index 844449f9..3fb5ca07 100644 --- a/engine/pikachu/pikachu_pcm.asm +++ b/engine/pikachu/pikachu_pcm.asm @@ -84,10 +84,10 @@ ENDC and $bb ldh [rNR51], a xor a - ld [wChannelSoundIDs + Ch5], a - ld [wChannelSoundIDs + Ch6], a - ld [wChannelSoundIDs + Ch7], a - ld [wChannelSoundIDs + Ch8], a + ld [wChannelSoundIDs + CHAN5], a + ld [wChannelSoundIDs + CHAN6], a + ld [wChannelSoundIDs + CHAN7], a + ld [wChannelSoundIDs + CHAN8], a ldh a, [hLoadedROMBank] ei ret diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index d5449b5c..6ff91597 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -1,6 +1,5 @@ ; try to evolve the mon in [wWhichPokemon] TryEvolvingMon: -EvolveTradeMon: ld hl, wCanEvolveFlags xor a ld [hl], a |
