diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 6 | ||||
| -rw-r--r-- | engine/menu/options.asm | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 8f799867..ec95a5d9 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -91,12 +91,6 @@ GetBattleTransitionID_WildOrTrainer: ret GetBattleTransitionID_CompareLevels: -; no error handling to check if you have a Pokemon yet -; this causes bugs with the transition in the Oak Pikachu catch -; wPartyMon1HP reads from wRivalName+6 -; this causes the faster transition to be manipulable either by -; using a default rival name or -; setting and then deleting 6 characters in a custom Rival name ld hl, wPartyMon1HP .faintedLoop ld a, [hli] diff --git a/engine/menu/options.asm b/engine/menu/options.asm index b6042ab9..e78ac2ee 100644 --- a/engine/menu/options.asm +++ b/engine/menu/options.asm @@ -1,6 +1,4 @@ DisplayOptionMenu_: -; executes each menu option's update function via GetOptionPointer, but the joypad isn't cleared until the ret back to optionMenuLoop -; this results in the options each being shifted left or right if the respective button is pressed along with A while opening options call InitOptions .optionMenuLoop call JoypadLowSensitivity @@ -424,7 +422,7 @@ InitOptions: call GetOptionPointer ; updates the next option pop bc ld hl, wOptionsCursorLocation - inc [hl] ; moves the options cursor + inc [hl] ; moves the cursor for the highlighted option dec c jr nz, .loop xor a |