diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-06 21:07:35 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-06 21:17:32 -0800 |
| commit | d3054dc4cb9a874efdca06dcdb042f05d81a90b4 (patch) | |
| tree | ffaac6c3f1406e2c21073fda3eb1741feb3fb517 /engine | |
| parent | 78a0c398c25c60a04940b1f839ea51bd2200fb1f (diff) | |
More graphics and straggling static refs.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rw-r--r-- | engine/credits.asm | 4 | ||||
| -rw-r--r-- | engine/phone_scripts.asm | 24 |
3 files changed, 15 insertions, 15 deletions
diff --git a/engine/color.asm b/engine/color.asm index d3ec8cdd3..70ffaaeac 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -899,7 +899,7 @@ Function97ee: ; 97ee add hl, hl add hl, hl add hl, hl - ld bc, $68ce + ld bc, PokemonPalettes add hl, bc ret ; 97f9 diff --git a/engine/credits.asm b/engine/credits.asm index 7504898ca..8fc8ad627 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -444,7 +444,7 @@ ParseCredits: ; 1099aa xor a ld [$cf64], a ; frame call GetCreditsPalette - call $32f9 ; update hw pal registers + call Function32f9 ; update hw pal registers jr .loop .clear @@ -481,7 +481,7 @@ ParseCredits: ; 1099aa ld [$ffd4], a .done - jp $5951 + jp Function109951 .end ; Stop execution. diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index d73a28362..48863eeb3 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1226,11 +1226,11 @@ UnknownScript_0xbd8dd: trainertotext SCHOOLBOY, 3, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_ALAN - iftrue $5915 + iftrue UnknownScript_0xbd915 checkflag ENGINE_95 - iftrue $5915 + iftrue UnknownScript_0xbd915 checkflag ENGINE_ALAN_HAS_FIRE_STONE - iftrue $5915 + iftrue UnknownScript_0xbd915 farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd91c checkevent $0101 @@ -1287,11 +1287,11 @@ UnknownScript_0xbd967: trainertotext LASS, 10, $0 farscall UnknownScript_0xbe41e checkflag ENGINE_DANA - iftrue $599f + iftrue UnknownScript_0xbd99f checkflag ENGINE_96 - iftrue $599f + iftrue UnknownScript_0xbd99f checkflag ENGINE_LIZ_HAS_THUNDERSTONE - iftrue $599f + iftrue UnknownScript_0xbd99f farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbd9ae checkevent $0102 @@ -1452,11 +1452,11 @@ UnknownScript_0xbdae3: trainertotext FISHER, 7, $0 farscall UnknownScript_0xbe1b6 checkflag ENGINE_TULLY - iftrue $5b1b + iftrue UnknownScript_0xbdb1b checkflag ENGINE_98 - iftrue $5b1b + iftrue UnknownScript_0xbdb1b checkflag ENGINE_TULLY_HAS_WATER_STONE - iftrue $5b1b + iftrue UnknownScript_0xbdb1b farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbdb22 checkevent $0103 @@ -1560,11 +1560,11 @@ UnknownScript_0xbdbd0: if_equal $0, UnknownScript_0xbdc21 farscall UnknownScript_0xbe41e checkflag ENGINE_TIFFANY - iftrue $5c10 + iftrue UnknownScript_0xbdc10 checkflag ENGINE_9A - iftrue $5c10 + iftrue UnknownScript_0xbdc10 checkflag ENGINE_TIFFANY_HAS_PINK_BOW - iftrue $5c10 + iftrue UnknownScript_0xbdc10 farscall UnknownScript_0xbde42 if_equal $0, UnknownScript_0xbdc17 checkevent $0104 |