diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 16:57:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 16:57:20 -0500 |
| commit | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (patch) | |
| tree | c1d9606acc6a47212cbc6a5faa79b289deba010a /engine | |
| parent | 8a8b96138be070d0154a79adc00ce2fb2e0f12d4 (diff) | |
| parent | cbec3771e2944a502eea69aeb012bea6cdc4e26b (diff) | |
Merge pull request #417 from mid-kid/master
mid-kid's patches
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 619d5bae3..066bbb4a3 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 14a0c1d47..19f9ed419 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 |