diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-27 15:32:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-27 15:32:24 -0400 |
| commit | 4b853ad676e061a6c4b0fcc030855a2705776864 (patch) | |
| tree | a6d6f2976827862f4a5f402e92c8479ccf7fb349 /engine/overworld/trainers.asm | |
| parent | Merge pull request #250 from Rangi42/master (diff) | |
| download | pokeyellow-4b853ad676e061a6c4b0fcc030855a2705776864.tar.gz pokeyellow-4b853ad676e061a6c4b0fcc030855a2705776864.tar.xz pokeyellow-4b853ad676e061a6c4b0fcc030855a2705776864.zip | |
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251)
Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
Diffstat (limited to 'engine/overworld/trainers.asm')
| -rwxr-xr-x | engine/overworld/trainers.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm index 655c6b2a..5a68b627 100755 --- a/engine/overworld/trainers.asm +++ b/engine/overworld/trainers.asm @@ -1,4 +1,4 @@ -_GetSpritePosition1: +_GetSpritePosition1:: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -17,7 +17,7 @@ _GetSpritePosition1: ld [$ffee], a ret -_GetSpritePosition2: +_GetSpritePosition2:: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -36,7 +36,7 @@ _GetSpritePosition2: ld [wSavedSpriteMapX], a ret -_SetSpritePosition1: +_SetSpritePosition1:: ld hl, wSpriteStateData1 ld de, $4 ld a, [wSpriteIndex] @@ -55,7 +55,7 @@ _SetSpritePosition1: ld [hl], a ret -_SetSpritePosition2: +_SetSpritePosition2:: ld hl, wSpriteStateData1 ld de, 4 ld a, [wSpriteIndex] @@ -74,7 +74,7 @@ _SetSpritePosition2: ld [hl], a ; c2x5 (map X pos) ret -TrainerWalkUpToPlayer: +TrainerWalkUpToPlayer:: ld a, [wSpriteIndex] swap a ld [wTrainerSpriteOffset], a |