diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-31 16:25:16 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-31 16:25:16 -0400 |
| commit | f9ae7b1240863b4311d24944ae7ec3c1d9b24507 (patch) | |
| tree | 2b56ef44fa89d464da16399f8432cd4807ec7d64 /engine | |
| parent | 5c73cffee6b854e4e08db04a776aa8a71d3a82cd (diff) | |
More WRAM label cleanup (still needs UNIONs and renaming)
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 8 | ||||
| -rw-r--r-- | engine/items/town_map.asm | 2 | ||||
| -rw-r--r-- | engine/menus/party_menu.asm | 2 | ||||
| -rw-r--r-- | engine/predefs.asm | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8eee39d2..f325350f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6900,9 +6900,9 @@ ResetCryModifiers: ; animates the mon "growing" out of the pokeball AnimateSendingOutMon: - ld a, [wPredefRegisters] + ld a, [wPredefHL] ld h, a - ld a, [wPredefRegisters + 1] + ld a, [wPredefHL + 1] ld l, a ldh a, [hStartTileID] ldh [hBaseTileID], a @@ -6940,9 +6940,9 @@ AnimateSendingOutMon: jr CopyUncompressedPicToHL CopyUncompressedPicToTilemap: - ld a, [wPredefRegisters] + ld a, [wPredefHL] ld h, a - ld a, [wPredefRegisters + 1] + ld a, [wPredefHL + 1] ld l, a ldh a, [hStartTileID] CopyUncompressedPicToHL:: diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index 42d313d9..a12c0c8a 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -249,7 +249,7 @@ ToText: db "To@" BuildFlyLocationsList: - ld hl, wFlyLocationsList - 1 + ld hl, wFlyAnimUsingCoordList ld [hl], $ff inc hl ld a, [wTownVisitedFlag] diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index ddb92f75..f77beb26 100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -131,7 +131,7 @@ RedrawPartyMenu_:: ld l, a ld de, wEvosMoves ld a, BANK(EvosMovesPointerTable) - ld bc, wEvosMoves.end - wEvosMoves + ld bc, wEvosMovesEnd - wEvosMoves call FarCopyData ld hl, wEvosMoves ld de, .notAbleToEvolveText diff --git a/engine/predefs.asm b/engine/predefs.asm index a9877739..faf0029e 100644 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -1,20 +1,20 @@ GetPredefPointer:: -; Store the contents of the register -; pairs (hl, de, bc) at wPredefRegisters. +; Back up the contents of the registers (hl, de, bc). ; Then put the bank and address of predef ; wPredefID in [wPredefBank] and hl. ld a, h - ld [wPredefRegisters], a + ld [wPredefHL], a ld a, l - ld [wPredefRegisters + 1], a + ld [wPredefHL + 1], a - ld hl, wPredefRegisters + 2 + ld hl, wPredefDE ld a, d ld [hli], a ld a, e ld [hli], a + ASSERT wPredefDE + 2 == wPredefBC ld a, b ld [hli], a ld [hl], c |