diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:31:09 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:31:09 -0400 |
| commit | 041c4f28a3c35e31329222769534942439b70f29 (patch) | |
| tree | 07c7998e8b8c34f25c22e4292ff0f133c787679c /engine/overworld | |
| parent | Pikachu movement functions (diff) | |
| download | pokeyellow-041c4f28a3c35e31329222769534942439b70f29.tar.gz pokeyellow-041c4f28a3c35e31329222769534942439b70f29.tar.xz pokeyellow-041c4f28a3c35e31329222769534942439b70f29.zip | |
Character dict; surfing minigame; printer debug
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/clear_loadmapdata_vars.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/daycare_exp.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/dungeon_warps.asm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/clear_loadmapdata_vars.asm b/engine/overworld/clear_loadmapdata_vars.asm index 2e7cd165..5ef2076c 100644 --- a/engine/overworld/clear_loadmapdata_vars.asm +++ b/engine/overworld/clear_loadmapdata_vars.asm @@ -14,7 +14,7 @@ ClearVariablesAfterLoadingMapData: ; c07c (3:407c) ld hl, wCardKeyDoorY ld [hli], a ld [hl], a - ld hl, wWhichTrade - ld bc, $1e + ld hl, wUnusedCD3D + ld bc, wStandingOnWarpPadOrHole - wUnusedCD3D call FillMemory - ret
\ No newline at end of file + ret diff --git a/engine/overworld/daycare_exp.asm b/engine/overworld/daycare_exp.asm index a7c7bd91..e7bf8dff 100644 --- a/engine/overworld/daycare_exp.asm +++ b/engine/overworld/daycare_exp.asm @@ -15,4 +15,4 @@ IncrementDayCareMonExp: ; c684 (3:4684) ret c ld a, $50 ld [hl], a - ret
\ No newline at end of file + ret diff --git a/engine/overworld/dungeon_warps.asm b/engine/overworld/dungeon_warps.asm index b234c3a1..d9bbe7d7 100644 --- a/engine/overworld/dungeon_warps.asm +++ b/engine/overworld/dungeon_warps.asm @@ -12,4 +12,4 @@ IsPlayerOnDungeonWarp: ; 46bf3 (11:6bf3) set 4, [hl] ld hl, wd732 set 4, [hl] - ret
\ No newline at end of file + ret |