diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 17:30:29 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 17:30:29 -0500 |
| commit | b805d343f36019ae9fdf5d248d78a0d9b12f25d7 (patch) | |
| tree | e296a2d4a3805aee0340ad05eb61da9ce7ed7db6 /engine | |
| parent | ef9090b9a07b3d727b1508957c76c899bbc39987 (diff) | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rwxr-xr-x | engine/stats_screen.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/link.asm b/engine/link.asm index 390855338..a2aec3a10 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -740,7 +740,7 @@ Link_PrepPartyData_Gen1: ; 28499 ld hl, BaseData + BASE_TYPES ld bc, BASE_DATA_SIZE call AddNTimes - ld bc, 2 + ld bc, BASE_CATCH_RATE - BASE_TYPES ld a, BANK(BaseData) call FarCopyBytes pop bc diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 5f35d4d8b..1f019c105 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -377,7 +377,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea) call .PlaceHPBar xor a ld [hBGMapMode], a - ld a, [CurBaseData] + ld a, [BaseDexNo] ld [wd265], a ld [CurSpecies], a hlcoord 8, 0 @@ -401,7 +401,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea) hlcoord 9, 4 ld a, "/" ld [hli], a - ld a, [CurBaseData] + ld a, [BaseDexNo] ld [wd265], a call GetPokemonName call PlaceString |