diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-29 14:53:57 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-29 14:53:57 -0500 |
| commit | f0915e2b664f3c045cdea710aeced219396db8bb (patch) | |
| tree | 791dd3a4cc749f482593f2bd3746f904304430d0 /home | |
| parent | Start disassembling bank0F (Battle) (diff) | |
| download | pokeyellow-f0915e2b664f3c045cdea710aeced219396db8bb.tar.gz pokeyellow-f0915e2b664f3c045cdea710aeced219396db8bb.tar.xz pokeyellow-f0915e2b664f3c045cdea710aeced219396db8bb.zip | |
More BankF documentation
Also introduce bit direction constants and setpal macros
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index f08ef86a..d9949d5c 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -267,7 +267,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) .battleOccurred ld hl,wd72d res 6,[hl] - ld hl,W_FLAGS_D733 + ld hl,wFlags_D733 res 3,[hl] ld hl,wd126 set 5,[hl] @@ -390,7 +390,7 @@ CheckWarpsNoCollisionLoop:: ; 04d5 (0:04d5) pop hl jr nc,CheckWarpsNoCollisionRetry2 ; if the extra check passed - ld a,[W_FLAGS_D733] + ld a,[wFlags_D733] bit 2,a jr nz,WarpFound1 push de @@ -1603,7 +1603,7 @@ JoypadOverworld:: ; 0c51 (0:0c51) ret ForceBikeDown:: ; 0c65 (0:0c65) - ld a,[W_FLAGS_D733] + ld a,[wFlags_D733] bit 3,a ; check if a trainer wants a challenge ret nz ld a,[wCurMap] @@ -1989,7 +1989,7 @@ LoadMapData:: ; 1241 (0:1241) ld a,[wd732] and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp jr nz,.restoreRomBank - ld a,[W_FLAGS_D733] + ld a,[wFlags_D733] bit 1,a jr nz,.restoreRomBank call Func_21e3 ; music related |