diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 17:32:21 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 17:32:21 -0400 |
| commit | 64da1f5d6bf96ff7f35165476ecc8d623f76060d (patch) | |
| tree | a41a8b72ddf548ad53c1373b5082e247527efe37 /scripts | |
| parent | 62e137f6cedeeebb8457fdb710ea725f73ded49f (diff) | |
Move graphics-only object file sources into gfx/
Previously this wasn't working, but now the Makefile uses pokegold's technique for running scan_includes.
It also enables and fixes some rgbds warnings ("Non-local labels without a colon are deprecated").
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/CeladonMart3F.asm | 2 | ||||
| -rwxr-xr-x | scripts/CeruleanCaveB1F.asm | 2 | ||||
| -rwxr-xr-x | scripts/PowerPlant.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm index e7e216d9..c8d8b509 100755 --- a/scripts/CeladonMart3F.asm +++ b/scripts/CeladonMart3F.asm @@ -74,7 +74,7 @@ CeladonMart3Text5: TX_FAR _CeladonMart3Text5 db "@" -CeladonMart3Text12 +CeladonMart3Text12: CeladonMart3Text10: CeladonMart3Text8: CeladonMart3Text6: diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index a570ab18..9017bec3 100755 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -7,7 +7,7 @@ CeruleanCaveB1F_Script: ld [wCeruleanCaveB1FCurScript], a ret -CeruleanCaveB1F_ScriptPointers +CeruleanCaveB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm index 35b4893f..f720b6f8 100755 --- a/scripts/PowerPlant.asm +++ b/scripts/PowerPlant.asm @@ -7,7 +7,7 @@ PowerPlant_Script: ld [wPowerPlantCurScript], a ret -PowerPlant_ScriptPointers +PowerPlant_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle |