diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/animations.asm | 6 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 5 | ||||
| -rw-r--r-- | engine/battle/draw_hud_pokeball_gfx.asm | 2 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 6 | ||||
| -rwxr-xr-x | engine/cable_club.asm | 2 | ||||
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 1 | ||||
| -rw-r--r-- | engine/menu/bills_pc.asm | 26 | ||||
| -rwxr-xr-x | engine/menu/league_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 6 | ||||
| -rwxr-xr-x | engine/overworld/oaks_aide.asm | 2 | ||||
| -rwxr-xr-x | engine/save.asm | 2 |
12 files changed, 30 insertions, 32 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index d6392522..2578ee28 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -253,7 +253,7 @@ PlayAnimation: .nextAnimationCommand pop hl jr .animationLoop -.AnimationOver ; 417B +.AnimationOver ret LoadSubanimation: @@ -926,7 +926,7 @@ BallMoveDistances1: db $ff ; terminator ; function to make the pokeball jump up -TradeJumpPokeball: ; 507C +TradeJumpPokeball: ld de,BallMoveDistances2 .loop ld hl,wOAMBuffer ; OAM buffer @@ -2996,7 +2996,7 @@ TossBallAnimation: ; sequence of animations that make up the Poké Ball toss db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM -.BlockBall ; 5E55 +.BlockBall ld a,TOSS_ANIM ld [wAnimationID],a call PlayAnimation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f8053a9e..3b474584 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -819,7 +819,7 @@ HandleEnemyMonFainted: ld [wActionResultOrTookBattleTurn], a jp MainInBattleLoop -FaintEnemyPokemon: ; 0x3c567 +FaintEnemyPokemon: call ReadPlayerMonCurHPAndStatus ld a, [wIsInBattle] dec a @@ -945,7 +945,7 @@ FaintEnemyPokemon: ; 0x3c567 ld [wPartyGainExpFlags], a jpab GainExperience -EnemyMonFaintedText: ; 0x3c63e +EnemyMonFaintedText: TX_FAR _EnemyMonFaintedText db "@" @@ -4672,7 +4672,6 @@ UnusedHighCriticalMoves: db CRABHAMMER db SLASH db $FF -; 3e023 ; determines if attack is a critical hit ; azure heights claims "the fastest pokémon (who are,not coincidentally, diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index d477ffdf..f44d64f5 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -44,7 +44,7 @@ SetupEnemyPartyPokeballs: ld hl, wOAMBuffer + PARTY_LENGTH * 4 jp WritePokeballOAMData -SetupPokeballs: ; 0x3a8a6 +SetupPokeballs: ld a, [de] push af ld de, wBuffer diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 385cdd1b..7999a7a0 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -145,7 +145,7 @@ AIMoveChoiceModification1: ld [hl], a jr .nextMove -StatusAilmentMoveEffects: ; 57e2 +StatusAilmentMoveEffects: db $01 ; unused sleep effect db SLEEP_EFFECT db POISON_EFFECT @@ -731,7 +731,7 @@ AICureStatus: res 0,[hl] ret -AIUseXAccuracy: ; 0x3a7a8 unused +AIUseXAccuracy: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 0,[hl] @@ -745,7 +745,7 @@ AIUseGuardSpec: ld a,GUARD_SPEC jp AIPrintItemUse -AIUseDireHit: ; 0x3a7c2 unused +AIUseDireHit: ; unused call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 2,[hl] diff --git a/engine/cable_club.asm b/engine/cable_club.asm index d9893f1f..bd9ed683 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -23,7 +23,7 @@ CableClub_DoBattleOrTrade: ; fall through ; This is called after completing a trade. -CableClub_DoBattleOrTradeAgain: ; 5345 +CableClub_DoBattleOrTradeAgain: ld hl, wSerialPlayerDataBlock ld a, SERIAL_PREAMBLE_BYTE ld b, 6 diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index dee5efea..1b571d35 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -432,7 +432,6 @@ GymTrashCans: db 2, 9, 13, 0, 0 ; 12 db 3, 10, 12, 14, 0 ; 13 db 2, 11, 13, 0, 0 ; 14 -; 5dec8 VermilionGymTrashSuccessText1: TX_FAR _VermilionGymTrashSuccessText1 diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 384ab485..f6865b6c 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -92,7 +92,7 @@ OaksPCText: db "PROF.OAK's PC@" PKMNLeaguePCText: db $4a, "LEAGUE@" LogOffPCText: db "LOG OFF@" -BillsPC_:: ; 0x214c2 +BillsPC_:: ld hl, wd730 set 6, [hl] xor a @@ -457,51 +457,51 @@ StatsCancelPCText: db "STATS" next "CANCEL@" -SwitchOnText: ; 0x217e9 +SwitchOnText: TX_FAR _SwitchOnText db "@" -WhatText: ; 0x217ee +WhatText: TX_FAR _WhatText db "@" -DepositWhichMonText: ; 0x217f3 +DepositWhichMonText: TX_FAR _DepositWhichMonText db "@" -MonWasStoredText: ; 0x217f8 +MonWasStoredText: TX_FAR _MonWasStoredText db "@" -CantDepositLastMonText: ; 0x217fd +CantDepositLastMonText: TX_FAR _CantDepositLastMonText db "@" -BoxFullText: ; 0x21802 +BoxFullText: TX_FAR _BoxFullText db "@" -MonIsTakenOutText: ; 0x21807 +MonIsTakenOutText: TX_FAR _MonIsTakenOutText db "@" -NoMonText: ; 0x2180c +NoMonText: TX_FAR _NoMonText db "@" -CantTakeMonText: ; 0x21811 +CantTakeMonText: TX_FAR _CantTakeMonText db "@" -ReleaseWhichMonText: ; 0x21816 +ReleaseWhichMonText: TX_FAR _ReleaseWhichMonText db "@" -OnceReleasedText: ; 0x2181b +OnceReleasedText: TX_FAR _OnceReleasedText db "@" -MonWasReleasedText: ; 0x21820 +MonWasReleasedText: TX_FAR _MonWasReleasedText db "@" diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index e1359063..170c0ef3 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -1,4 +1,4 @@ -PKMNLeaguePC: ; 0x7657e +PKMNLeaguePC: ld hl, AccessedHoFPCText call PrintText ld hl, wd730 diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 759be189..217d6e54 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -49,7 +49,7 @@ AskName: ld bc, NAME_LENGTH jp CopyData -DoYouWantToNicknameText: ; 0x6557 +DoYouWantToNicknameText: TX_FAR _DoYouWantToNicknameText db "@" diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 96ec1ac1..a7076d35 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -223,7 +223,7 @@ OKText: db "OK@" ; Draws a line starting from hl high b and wide c -DrawLineBox: ; 0x12ac7 +DrawLineBox: ld de, SCREEN_WIDTH ; New line .PrintVerticalLine ld [hl], $78 ; │ @@ -335,11 +335,11 @@ StatusScreen2: ld c, a ld a, "-" call StatusScreen_PrintPP ; Fill the rest with -- -.InitPP ; 12bbb +.InitPP ld hl, wLoadedMonMoves coord de, 14, 10 ld b, 0 -.PrintPP ; 12bc3 +.PrintPP ld a, [hli] and a jr z, .PPDone diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index d73174c4..54ba6b7a 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -1,4 +1,4 @@ -OaksAideScript: ; 0x59035 +OaksAideScript: ld hl, OaksAideHiText call PrintText call YesNoChoice diff --git a/engine/save.asm b/engine/save.asm index 4a2ac196..58326187 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -183,7 +183,7 @@ SaveSAVConfirm: ld a,[wCurrentMenuItem] ret -WouldYouLikeToSaveText: ; 0x7377d +WouldYouLikeToSaveText: TX_FAR _WouldYouLikeToSaveText db "@" |