diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-04-16 09:30:50 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-04-16 09:30:50 -0400 |
| commit | 58b377f25bf673702f26551824b329fb4675f64d (patch) | |
| tree | 10144e3fb75ae2181bb834a186851d57c9df44cc /engine | |
| parent | 3540578cb3452944d6c60bc13db16bc1f19b3586 (diff) | |
Fix #709 miscellaneous issues
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/odd_egg.asm | 4 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/events.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_object.asm | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm index a6ca15b8c..d6d8f344e 100644 --- a/engine/events/odd_egg.asm +++ b/engine/events/odd_egg.asm @@ -23,13 +23,13 @@ _GiveOddEgg: .not_done ; Break when [hRandom] <= de. - ldh a, [hRandom + 1] + ldh a, [hRandomSub] cp d jr c, .done jr z, .ok jr .next .ok - ldh a, [hRandom + 0] + ldh a, [hRandomAdd] cp e jr c, .done jr z, .done diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 76f94c680..83c5a06de 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -985,7 +985,7 @@ Function104faf: cpl ld b, a xor a - ldh [hMGJoypadPressed + 2], a + ldh [hMGPrevTIMA], a call Function104d86 .asm_104fd2 inc b @@ -1008,10 +1008,10 @@ Function104faf: bit 1, a jr nz, .asm_104fe5 .asm_104fed - ldh a, [hMGJoypadPressed + 2] + ldh a, [hMGPrevTIMA] ld d, a ldh a, [rTIMA] - ldh [hMGJoypadPressed + 2], a + ldh [hMGPrevTIMA], a sub d cp $12 jr c, .asm_104ffd diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index bdac21c94..7c79d41df 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -813,7 +813,7 @@ PlayerMovement: CheckMenuOW: xor a ldh [hMenuReturn], a - ldh [hMenuReturn + 1], a + ldh [hUnusedFFA1], a ldh a, [hJoyPressed] bit SELECT_F, a diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 75d1de594..6905c83f0 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -20,10 +20,10 @@ SpawnPlayer: ld a, -1 ld [wObjectFollow_Leader], a ld [wObjectFollow_Follower], a - ld a, $0 + ld a, PLAYER ld hl, PlayerObjectTemplate call CopyPlayerObjectTemplate - ld b, $0 + ld b, PLAYER call PlayerSpawn_ConvertCoords ld a, PLAYER_OBJECT call GetMapObject |