diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-09 10:20:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-09 10:20:05 -0700 |
| commit | 40b27505b32bac1d96e20a168ac96ab3384878b3 (patch) | |
| tree | 9de98df1188d19ded55bed9f943d785bb1392409 /main.asm | |
| parent | f1612ae5bfcf3e8e7c250b214883f9ae1abe7fbd (diff) | |
| parent | 51b81e4d9734c9db8b673074e6ab26dd8280f61c (diff) | |
Merge pull request #18 from TwitchPlaysPokemon/chaos_requests
stationary text labeling
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -186,13 +186,13 @@ SECTION "bank4", ROMX Func_10000: ; 0x10000 ld c, a - ld a, [wInSpecialMode] + ld a, [wInSpecialMode] ;special mode in c and a - ret z + ret z ;if mot in special mode, ret ld a, c ld [wd54c], a ld a, [wSpecialMode] - cp SPECIAL_MODE_CATCHEM + cp SPECIAL_MODE_CATCHEM ;branch based on mode jp z, Func_10a95 cp SPECIAL_MODE_EVOLUTION jr nz, .next @@ -1500,11 +1500,11 @@ CallTable_3021f: ; 0x3021f Func_3022b: ; 0x3022b xor a - ld [wd5ca], a - call FillBottomMessageBufferWithBlackTile + ld [wd5ca], a ;turn text off + call FillBottomMessageBufferWithBlackTile ;clear text xor a ld [wInSpecialMode], a - ld [wSpecialMode], a + ld [wSpecialMode], a ;no longer in special modes callba StopTimer ld a, [wCurrentStage] rst JumpTable ; calls JumpToFuncInTable @@ -2081,7 +2081,7 @@ Func_31660: ; 0x31660 ret Func_31672: ; 0x31672 - ld a, [wd5ca] + ld a, [wd5ca] ;if text is off and a ret nz call FillBottomMessageBufferWithBlackTile |