diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/animations.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/mon_party_sprites.asm | 2 | ||||
| -rwxr-xr-x | engine/oak_speech2.asm | 2 | ||||
| -rwxr-xr-x | engine/predefs12.asm | 4 | ||||
| -rwxr-xr-x | engine/titlescreen.asm | 2 | ||||
| -rwxr-xr-x | engine/titlescreen2.asm | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index a17d2e51..09c8d5af 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -265,6 +265,6 @@ INCLUDE "data/credits_order.asm" INCLUDE "text/credits_text.asm" -TheEndGfx: ; 7473e (1d:473e) (7473f on blue) +TheEndGfx: INCBIN "gfx/theend.interleave.2bpp" TheEndGfxEnd: diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index ea5738bc..d6392522 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1944,7 +1944,7 @@ _AnimationSlideMonOff: ; functions below catch it by checking if the tile number is within the valid ; range and if not, replacing it with a blank tile. -.PlayerNextTile ; 79633 (1e:5633) +.PlayerNextTile ld a, [hl] add 7 ; This is a bug. The lower right corner tile of the mon back pic is blanked @@ -1955,7 +1955,7 @@ _AnimationSlideMonOff: ld a, " " ret -.EnemyNextTile ; 7963c (1e:563c) +.EnemyNextTile ld a, [hl] sub 7 ; This has the same problem as above, but it has no visible effect because diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 4770483d..96ec1ac1 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -240,7 +240,7 @@ DrawLineBox: ; 0x12ac7 ld [hl], $6f ; ← (halfarrow ending) ret -PTile: ; 12adc (4:6adc) ; This is a single 1bpp "P" tile +PTile: ; This is a single 1bpp "P" tile INCBIN "gfx/p_tile.1bpp" PTileEnd: diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 6845b790..aa9bdaeb 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -350,7 +350,7 @@ UnusedPartyMonSpriteFunction: ld [wMonPartySpriteSpecies], a jr WriteMonPartySpriteOAMBySpecies -.LoadTilePatterns ; 718ac (1c:58ac) +.LoadTilePatterns push hl add a ld c, a diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 1ae06313..1258c59b 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -184,7 +184,7 @@ DisplayIntroNameTextBox: ld [wMaxMenuItem], a jp HandleMenuInput -.namestring ; 6aa3 (1:6aa3) +.namestring db "NAME@" IF DEF(_RED) diff --git a/engine/predefs12.asm b/engine/predefs12.asm index dc79d6f3..95f0ea25 100755 --- a/engine/predefs12.asm +++ b/engine/predefs12.asm @@ -29,7 +29,7 @@ PredefShakeScreenVertically: ld [wDisableVBlankWYUpdate], a ret -.MutateWY ; 48119 (12:4119) +.MutateWY ld a, [$ff96] xor b ld [$ff96], a @@ -57,7 +57,7 @@ PredefShakeScreenHorizontally: ld [rWX], a ret -.MutateWX ; 4813f (12:413f) +.MutateWX ld a, [$ff97] xor b ld [$ff97], a diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index fb51d884..ecccbf32 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -110,7 +110,7 @@ DisplayTitleScreen: jr .next -.tileScreenCopyrightTiles ; 437f (1:437f) +.tileScreenCopyrightTiles db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc. .next diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm index 2ed77dec..6f47b080 100755 --- a/engine/titlescreen2.asm +++ b/engine/titlescreen2.asm @@ -67,7 +67,7 @@ _TitleScroll: pop bc jr _TitleScroll -.ScrollBetween ; 37292 (d:7292) +.ScrollBetween .wait ld a, [rLY] ; rLY cp l |