diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
| commit | 66bc517605860c9f716a176ed467d34097985895 (patch) | |
| tree | 4c126cbb3bbdb2b0a236375c2140e7a6c25260a6 /main.asm | |
| parent | Replace some hardcoded data sizes (diff) | |
| parent | commented audio code (diff) | |
| download | pokeyellow-66bc517605860c9f716a176ed467d34097985895.tar.gz pokeyellow-66bc517605860c9f716a176ed467d34097985895.tar.xz pokeyellow-66bc517605860c9f716a176ed467d34097985895.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -86,7 +86,7 @@ LoadMonData_: ; 2: boxmon ; 3: daycaremon ; Return monster id at wcf91 and its data at wLoadedMon. -; Also load base stats at W_MONHDEXNUM for convenience. +; Also load base stats at W_MONHEADER for convenience. ld a, [wDayCareMonSpecies] ld [wcf91], a @@ -284,7 +284,7 @@ DetectCollisionBetweenSprites: ld [hld], a ; zero [$c1ic] (directions in which collisions occurred) ld a, [$ff91] - ld [hld], a ; [$c1ib] = adjusted X coordiate + ld [hld], a ; [$c1ib] = adjusted X coordinate ld a, [$ff90] ld [hl], a ; [$c1ia] = adjusted Y coordinate |