diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 15:49:17 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 15:49:17 -0400 |
| commit | 356836b1cc479381d5494dbaee40c6a6345c0b43 (patch) | |
| tree | 7708fda6f16a02264e9cc7d421f9ab6b050a64d4 /engine | |
| parent | 437c7404e90dc7fb853b0c6c74a234cd2a2e3c56 (diff) | |
Harmonize home/ with pokecrystal
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/gfx/load_pics.asm | 12 | ||||
| -rw-r--r-- | engine/pokemon/correct_nick_errors.asm | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index 8b9f4f6a..869dc988 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -185,9 +185,9 @@ FixPicBank: ; Postcondition: a = repaired bank for pic ; ; Pic bank values that will get repaired (and what they'll be repaired to): -; $13 -> $1f -; $14 -> $20 -; $1f -> $2e +; $13 -> BANK("Pics 12") +; $14 -> BANK("Pics 13") +; $1f -> BANK("Pics 14") ; ; Otherwise, the repaired bank will match the defined bank. push hl @@ -211,9 +211,9 @@ FixPicBank: ret .FixPicBankTable: - db $13, $1f - db $14, $20 - db $1f, $2e + db $13, BANK("Pics 12") + db $14, BANK("Pics 13") + db $1f, BANK("Pics 14") db -1 Intro_GetMonFrontpic: diff --git a/engine/pokemon/correct_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm index 421bf92d..e7635c1d 100644 --- a/engine/pokemon/correct_nick_errors.asm +++ b/engine/pokemon/correct_nick_errors.asm @@ -65,7 +65,7 @@ CorrectNickErrors:: ; format: ; ≥ < db "<NULL>", "ガ" - db "<PLAY_G>", "<JP_18>" + 1 + db "<JP_14>", "<JP_18>" + 1 db "<NI>", "<NO>" + 1 db "<ROUTE>", "<GREEN>" + 1 db "<ENEMY>", "<ENEMY>" + 1 |