diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 4 | ||||
| -rw-r--r-- | home/yes_no.asm | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 95b94646..bac16375 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1218,9 +1218,6 @@ SignLoop:: ; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing) ; sets the carry flag if there is a collision, and unsets it if there isn't a collision CollisionCheckOnLand:: - ld a, [wSlopNoclip] ; SL0P noclip: walk through everything (carry clear) - and a - ret nz ld a, [wMovementFlags] bit BIT_LEDGE_OR_FISHING, a jr nz, .noCollision @@ -1232,7 +1229,6 @@ CollisionCheckOnLand:: ld d, a ld a, [wSpritePlayerStateData1CollisionData] and d ; check if a sprite is in the direction the player is trying to go - nop ; ??? why is this in the code jr nz, .collision xor a ldh [hTextID], a diff --git a/home/yes_no.asm b/home/yes_no.asm index 8d995832..befcd3c4 100644 --- a/home/yes_no.asm +++ b/home/yes_no.asm @@ -5,11 +5,7 @@ YesNoChoice:: call InitYesNoTextBoxParameters jr DisplayYesNoChoice -TwoOptionMenu:: ; unreferenced - ld a, TWO_OPTION_MENU - ld [wTextBoxID], a - call InitYesNoTextBoxParameters - jp DisplayTextBoxID +; SL0P: removed unreferenced TwoOptionMenu to reclaim ROM0 for the noclip guard. InitYesNoTextBoxParameters:: xor a ; YES_NO_MENU @@ -26,12 +22,7 @@ YesNoChoicePokeCenter:: lb bc, 8, 12 jr DisplayYesNoChoice -WideYesNoChoice:: ; unreferenced - call SaveScreenTilesToBuffer1 - ld a, WIDE_YES_NO_MENU - ld [wTwoOptionMenuID], a - hlcoord 12, 7 - lb bc, 8, 13 +; SL0P: removed unreferenced WideYesNoChoice to reclaim ROM0. DisplayYesNoChoice:: ld a, TWO_OPTION_MENU |