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 /scripts | |
| parent | ff927ba730e45a843c1e183b5f05646f96378af0 (diff) | |
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 'scripts')
| -rwxr-xr-x | scripts/PokemonMansion1F.asm | 2 | ||||
| -rwxr-xr-x | scripts/PokemonMansion2F.asm | 2 | ||||
| -rwxr-xr-x | scripts/PokemonMansion3F.asm | 2 | ||||
| -rwxr-xr-x | scripts/PokemonMansionB1F.asm | 2 | ||||
| -rwxr-xr-x | scripts/RocketHideoutB2F.asm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm index 41f40635..028097af 100755 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm @@ -45,7 +45,7 @@ Mansion1ReplaceBlock: predef ReplaceTileBlock ret -Mansion1Script_Switches: +Mansion1Script_Switches:: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm index a7b90bcd..f5643dad 100755 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm @@ -41,7 +41,7 @@ Mansion2Script_5202f: ld [wNewTileBlockID], a predef_jump ReplaceTileBlock -Mansion2Script_Switches: +Mansion2Script_Switches:: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index ff172413..532394d4 100755 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -72,7 +72,7 @@ Mansion3Script_5225b: set 4, [hl] ret -Mansion3Script_Switches: +Mansion3Script_Switches:: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index 887b4762..f8a20590 100755 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -43,7 +43,7 @@ Mansion4Script_523cf: call Mansion2Script_5202f ret -Mansion4Script_Switches: +Mansion4Script_Switches:: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm index 1b487df2..7805f67a 100755 --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -313,7 +313,7 @@ RocketHideout2Script3: ld [wCurMapScript], a ret -LoadSpinnerArrowTiles: +LoadSpinnerArrowTiles:: ld a, [wSpriteStateData1 + 2] srl a srl a |