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/battle | |
| 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/battle')
| -rwxr-xr-x | engine/battle/core.asm | 8 | ||||
| -rw-r--r-- | engine/battle/get_trainer_name.asm | 2 | ||||
| -rw-r--r-- | engine/battle/save_trainer_name.asm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 96ec8e2f..96318c78 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1451,7 +1451,7 @@ TrainerSentOutText: ; tests if the player has any pokemon that are not fainted ; sets d = 0 if all fainted, d != 0 if some mons are still alive -AnyPartyAlive: +AnyPartyAlive:: ld a, [wPartyCount] ld e, a xor a @@ -1996,7 +1996,7 @@ CenterMonName: pop de ret -DisplayBattleMenu: +DisplayBattleMenu:: call LoadScreenTilesFromBuffer1 ; restore saved screen ld a, [wBattleType] and a @@ -6718,7 +6718,7 @@ PlayMoveAnimation: call Delay3 predef_jump MoveAnimation -InitBattle: +InitBattle:: ld a, [wCurOpponent] and a jr z, DetermineWildOpponent @@ -6934,7 +6934,7 @@ CopyUncompressedPicToTilemap: ld a, [wPredefRegisters + 1] ld l, a ld a, [hStartTileID] -CopyUncompressedPicToHL: +CopyUncompressedPicToHL:: lb bc, 7, 7 ld de, SCREEN_WIDTH push af diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index 36ca019e..478cdc26 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,4 +1,4 @@ -GetTrainerName_: +GetTrainerName_:: ld hl, wGrassRate ld a, [wLinkState] and a diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index 114bd650..78e53b87 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -1,4 +1,4 @@ -SaveTrainerName: +SaveTrainerName:: ld hl, TrainerNamePointers ld a, [wTrainerClass] dec a |