diff options
| author | dannye <33dannye@gmail.com> | 2024-09-29 10:50:46 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-29 10:50:46 -0500 |
| commit | 716f8608c13fbee20b8fb71118e0691344098591 (patch) | |
| tree | a69f3805e6e8e372a8fe9c064aa77d76efbed3a3 /engine/events | |
| parent | Identify more bit flags (#119) (diff) | |
| download | pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.tar.gz pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.tar.xz pokeyellow-716f8608c13fbee20b8fb71118e0691344098591.zip | |
Rename off-by-one wram labels
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/black_out.asm | 2 | ||||
| -rw-r--r-- | engine/events/hidden_objects/cinnabar_gym_quiz.asm | 4 | ||||
| -rw-r--r-- | engine/events/pikachu_happiness.asm | 2 | ||||
| -rw-r--r-- | engine/events/poison.asm | 2 | ||||
| -rw-r--r-- | engine/events/try_pikachu_movement.asm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/black_out.asm b/engine/events/black_out.asm index 2a74125a..c45c3101 100644 --- a/engine/events/black_out.asm +++ b/engine/events/black_out.asm @@ -1,7 +1,7 @@ ResetStatusAndHalveMoneyOnBlackout:: ; Reset player status on blackout. xor a - ld [wd435], a + ld [wd434], a xor a ; gamefreak copypasting functions (double xor a) ld [wBattleResult], a ld [wWalkBikeSurfState], a diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm index f5a2db44..da280345 100644 --- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm +++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm @@ -9,7 +9,7 @@ CinnabarGymQuiz:: text_asm xor a ld [wOpponentAfterWrongAnswer], a - ld hl, wd475 + ld hl, wd474 res 7, [hl] ld a, [wHiddenObjectFunctionArgument] push af @@ -125,7 +125,7 @@ CinnabarGymQuiz_AskQuestion: ldh a, [hGymGateIndex] add $2 ld [wOpponentAfterWrongAnswer], a - ld hl, wd475 + ld hl, wd474 set 7, [hl] ret diff --git a/engine/events/pikachu_happiness.asm b/engine/events/pikachu_happiness.asm index 0d79e32b..0aee04f9 100644 --- a/engine/events/pikachu_happiness.asm +++ b/engine/events/pikachu_happiness.asm @@ -73,7 +73,7 @@ ModifyPikachuHappiness:: jr c, .decreased cp b jr nc, .done - ld a, [wd49c] + ld a, [wd49b] and a jr nz, .done jr .update_mood diff --git a/engine/events/poison.asm b/engine/events/poison.asm index 3b0acbe4..467d1a5f 100644 --- a/engine/events/poison.asm +++ b/engine/events/poison.asm @@ -148,5 +148,5 @@ Func_c4c7: ret nz .asm_c4ef xor a - ld [wd49c], a + ld [wd49b], a ret diff --git a/engine/events/try_pikachu_movement.asm b/engine/events/try_pikachu_movement.asm index 70cf65b4..9dd25008 100644 --- a/engine/events/try_pikachu_movement.asm +++ b/engine/events/try_pikachu_movement.asm @@ -1,5 +1,5 @@ TryApplyPikachuMovementData:: - ld a, [wd472] + ld a, [wd471] bit 7, a ret z ld a, [wWalkBikeSurfState] |