diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-09 19:28:43 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-09 19:28:43 -0400 |
| commit | 9c61b495da446c2216bcd8c56aaa55fffdbf3d61 (patch) | |
| tree | 7f8706e0e174bffa26dad81fb08af5c6a98f99a1 /home | |
| parent | b2002fdf4abee435a879522980425913c51dc9e5 (diff) | |
Fix bank1c errors and a few missed bank0 errors.
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 3 | ||||
| -rw-r--r-- | home/overworld.asm | 14 | ||||
| -rw-r--r-- | home/text.asm | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/home/audio.asm b/home/audio.asm index 991dcd01..94cf999c 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -76,13 +76,14 @@ Func_21c8:: ; 21c8 (0:21c8) Func_21e3:: ; 21e5 (0:21e5) ld c,$6 +.loop push bc push hl callba Music2_UpdateMusic ; 2:509d pop hl pop bc dec c - jr nz, Func_21e3 + jr nz, .loop ret ;Func_235f:: ; 235f (0:235f) diff --git a/home/overworld.asm b/home/overworld.asm index 42146e2f..4ae1d36a 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -25,8 +25,8 @@ EnterMap:: ; 01d7 (0:01d7) res 3, [hl] ld hl, wd72e res 4, [hl] - call IsSurfingPikachuInParty .didNotEnterUsingFlyWarpOrDungeonWarp + call IsSurfingPikachuInParty callba CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road ld hl, wd732 bit 4, [hl] @@ -59,7 +59,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) bit 3,[hl] res 3,[hl] jp nz,WarpFound2 - ld a,[wd730] + ld a,[wd732] and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp jp nz,HandleFlyWarpOrDungeonWarp ld a,[W_CUROPPONENT] @@ -173,8 +173,8 @@ OverworldLoopLessDelay:: ; 0245 (0:0245) jr z,.noDirectionButtonsPressed ld a,$01 ld [wSpriteStateData1 + 5],a -.handleDirectionButtonPress ld a,$1 +.handleDirectionButtonPress ld [wd52a],a ; new direction ld a,[wd730] bit 7,a ; are we simulating button presses? @@ -763,7 +763,7 @@ HandleFlyWarpOrDungeonWarp:: ; 0794 (0:0794) set 2, [hl] ; fly warp or dungeon warp res 5, [hl] ; forced to ride bike call LeaveMapAnim - call LoadPlayerSpriteGraphics + call Func_07c4 callbs SpecialWarpIn jp SpecialEnterMap @@ -1226,7 +1226,7 @@ CollisionCheckOnLand:: ; 0a1c (0:0a1c) ; if no sprite collision cp $f jr nz,.collision - call CheckForJumpingAndTilePairCollisions + call Func_154a jr nz,.collision ld a,[hJoyHeld] and $2 @@ -2182,8 +2182,8 @@ InitSprites:: ; 1006 (0:1006) ld a,[hli] ld [de],a ; store picture ID at C1X0 inc d - ld a,$04 - add e + ld a,e + add $4 ld e,a ld a,[hli] ld [de],a ; store Y position at C2X4 diff --git a/home/text.asm b/home/text.asm index b520d74f..c2c224e3 100644 --- a/home/text.asm +++ b/home/text.asm @@ -378,7 +378,7 @@ TextCommandProcessor:: ; 1919 (0:1919) push af set 1,a ld e,a - ld a,[$fff4] + ld a,[$fff9] xor e ld [wd358],a ld a,c |