diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-09-29 11:24:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-29 10:24:35 -0500 |
| commit | 7d9858fec42d0cef1f0349c3cef250003c5ed66d (patch) | |
| tree | 7cf362d6e8949e098159cb7778bbcf40301ad4de /home | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-7d9858fec42d0cef1f0349c3cef250003c5ed66d.tar.gz pokeyellow-7d9858fec42d0cef1f0349c3cef250003c5ed66d.tar.xz pokeyellow-7d9858fec42d0cef1f0349c3cef250003c5ed66d.zip | |
Identify more bit flags (#119)
* Identify more bit flags
* Bit serves dual use in debug mode
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index f9aaa089..2b32eb16 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1233,7 +1233,7 @@ CollisionCheckOnLand:: ldh [hTextID], a call IsSpriteInFrontOfPlayer ; check for sprite collisions again? when does the above check fail to detect a sprite collision? jr nc, .asm_0a5c - res 7, [hl] + res BIT_FACE_PLAYER, [hl] ldh a, [hTextID] and a ; was there a sprite collision? jr z, .asm_0a5c diff --git a/home/text.asm b/home/text.asm index d6baf35c..9bc7f3cf 100644 --- a/home/text.asm +++ b/home/text.asm @@ -244,7 +244,7 @@ Paragraph:: PageChar:: ldh a, [hUILayoutFlags] - bit 3, a + bit BIT_PAGE_CHAR_IS_NEXT, a jr z, .pageChar ld a, "<NEXT>" jp PlaceNextChar.NotTerminator |