diff options
Diffstat (limited to 'engine/items/tmhm.asm')
| -rw-r--r-- | engine/items/tmhm.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 4958d2afc..d249d4688 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -33,7 +33,7 @@ ConvertCurItemIntoCurTMHM: ld c, a callfar GetTMHMNumber ld a, c - ld [wCurTMHM], a + ld [wTempTMHM], a ret GetTMHMItemMove: @@ -50,7 +50,7 @@ AskTeachTMHM: cp TM01 jr c, .NotTMHM call GetTMHMItemMove - ld a, [wCurTMHM] + ld a, [wTempTMHM] ld [wPutativeTMHMMove], a call GetMoveName call CopyName1 @@ -251,9 +251,9 @@ TMHM_ShowTMMoveDescription: ld a, [wCurItem] cp NUM_TMS + NUM_HMS + 1 jr nc, TMHM_JoypadLoop - ld [wd265], a + ld [wTempTMHM], a predef GetTMHMMove - ld a, [wd265] + ld a, [wTempTMHM] ld [wCurSpecies], a hlcoord 1, 14 call PrintMoveDesc @@ -261,14 +261,14 @@ TMHM_ShowTMMoveDescription: TMHM_ChooseTMorHM: call TMHM_PlaySFX_ReadText2 - call CountTMsHMs ; This stores the count to wd265. + call CountTMsHMs ; This stores the count to wTempTMHM. ld a, [wMenuCursorY] dec a ld b, a ld a, [wTMHMPocketScrollPosition] add b ld b, a - ld a, [wd265] + ld a, [wTempTMHM] cp b jr z, _TMHM_ExitPack ; our cursor was hovering over CANCEL TMHM_CheckHoveringOverCancel: @@ -354,16 +354,16 @@ TMHM_DisplayPocketItems: jr z, .loop2 ld b, a ld a, c - ld [wd265], a + ld [wTempTMHM], a push hl push de push bc call TMHMPocket_GetCurrentLineCoord push hl - ld a, [wd265] + ld a, [wTempTMHM] cp NUM_TMS + 1 jr nc, .HM - ld de, wd265 + ld de, wTempTMHM lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum jr .okay @@ -371,17 +371,17 @@ TMHM_DisplayPocketItems: .HM: push af sub NUM_TMS - ld [wd265], a + ld [wTempTMHM], a ld [hl], "H" inc hl - ld de, wd265 + ld de, wTempTMHM lb bc, PRINTNUM_RIGHTALIGN | 1, 2 call PrintNum pop af - ld [wd265], a + ld [wTempTMHM], a .okay predef GetTMHMMove - ld a, [wd265] + ld a, [wTempTMHM] ld [wPutativeTMHMMove], a call GetMoveName pop hl @@ -403,8 +403,8 @@ TMHM_DisplayPocketItems: pop bc push bc ld a, b - ld [wd265], a - ld de, wd265 + ld [wTempTMHM], a + ld de, wTempTMHM lb bc, 1, 2 call PrintNum .hm2 @@ -445,7 +445,7 @@ Unreferenced_Function2ca95: ld bc, 3 add hl, bc predef GetTMHMMove - ld a, [wd265] + ld a, [wTempTMHM] ld [wPutativeTMHMMove], a call GetMoveName push hl @@ -508,7 +508,7 @@ Unreferenced_Function2cadf: db "@" .CheckHaveRoomForTMHM: - ld a, [wd265] + ld a, [wTempTMHM] dec a ld hl, wTMsHMs ld b, 0 @@ -523,7 +523,7 @@ Unreferenced_Function2cadf: ConsumeTM: call ConvertCurItemIntoCurTMHM - ld a, [wd265] + ld a, [wTempTMHM] dec a ld hl, wTMsHMs ld b, 0 @@ -555,7 +555,7 @@ CountTMsHMs: dec c jr nz, .loop ld a, b - ld [wd265], a + ld [wTempTMHM], a ret PrintMoveDesc: |