diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-08-21 16:27:04 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-08-21 16:27:04 -0400 |
| commit | a775ff15062bedcd05d852ba62b711141f75e245 (patch) | |
| tree | af21c3a8ffd93cd218b4968013e8aed284b60212 /predef | |
| parent | 631393caae17541cbb363e5e019fb77a4a7f31a5 (diff) | |
Label some known WRAM labels from pokecrystal.
Diffstat (limited to 'predef')
| -rwxr-xr-x | predef/cgb.asm | 10 | ||||
| -rwxr-xr-x | predef/sgb.asm | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index 5935eb19..748c3f15 100755 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -170,7 +170,7 @@ Function945e: ; 945e (2:545e) ld bc, Palettes_ad2d add hl, bc call Function9adb - ld a, [wd004] + ld a, [wCurPartySpecies] ld bc, wTempMonDVs call Function9bcb call Function9adb @@ -294,7 +294,7 @@ Function9561: ; 9561 (2:5561) ld a, $1d call Function9ac7 call Function9ad2 - ld a, [wd004] + ld a, [wCurPartySpecies] cp $ff jr nz, .asm_957b ld hl, Palettes_95cd @@ -549,7 +549,7 @@ Function976d: ; 976d (2:576d) .asm_977e ld hl, wPartyMon1DVs ld bc, $30 - ld a, [wd005] + ld a, [wCurPartyMon] call AddNTimes ld c, l ld b, h @@ -873,7 +873,7 @@ Function9a2e: ; 9a2e (2:5a2e) Function9a47: ; 9a47 (2:5a47) ld de, wTempBGPal0 - ld a, [wd004] + ld a, [wCurPartySpecies] call Function9be4 call Function9adb call Function9b1d @@ -896,7 +896,7 @@ Function9a5a: ; 9a5a (2:5a5a) Function9a7b: ; 9a7b (2:5a7b) ld de, wTempBGPal0 - ld a, [wd004] + ld a, [wCurPartySpecies] ld bc, wTempMonDVs call Function9bd3 call Function9adb diff --git a/predef/sgb.asm b/predef/sgb.asm index fc5747bf..bd1480c2 100755 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -165,7 +165,7 @@ Function8d46: ; 8d46 (2:4d46) ld [wccae], a ld a, [hl] ld [wccaf], a - ld a, [wd004] + ld a, [wCurPartySpecies] ld bc, wTempMonDVs call Function9bcb ld a, [hli] @@ -198,7 +198,7 @@ Function8d95: ; 8d95 (2:4d95) ld [hl], $5a inc hl ld [hl], $19 - ld a, [wd004] + ld a, [wCurPartySpecies] call Function9be4 ld a, [hli] ld [wccb2], a @@ -370,7 +370,7 @@ Function8eb7: ; 8eb7 (2:4eb7) .asm_8ed9 ld hl, wPartyMon1DVs ld bc, $30 - ld a, [wd005] + ld a, [wCurPartyMon] call AddNTimes ld c, l ld b, h @@ -433,7 +433,7 @@ Function8f53: ; 8f53 (2:4f53) ld de, wcca9 ld bc, $10 call CopyBytes - ld a, [wd004] + ld a, [wCurPartySpecies] ld l, a ld h, $0 add hl, hl |