diff options
Diffstat (limited to 'engine/items/tmhm.asm')
| -rw-r--r-- | engine/items/tmhm.asm | 67 |
1 files changed, 29 insertions, 38 deletions
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 442f73cfa..57586e2f0 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -1,4 +1,4 @@ -TMHMPocket: ; 2c76f (b:476f) +TMHMPocket: ld a, $1 ld [hInMenu], a call TMHM_PocketLoop @@ -20,7 +20,7 @@ TMHMPocket: ; 2c76f (b:476f) scf ret -.ConvertItemToTMHMNumber: ; 2c798 (b:4798) +.ConvertItemToTMHMNumber: ld a, [wCurItem] ld c, a callfar GetNumberedTMHM @@ -28,7 +28,7 @@ TMHMPocket: ; 2c76f (b:476f) ld [wCurItem], a ret -ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7) +ConvertCurItemIntoCurTMHM: ld a, [wCurItem] ld c, a callfar GetTMHMNumber @@ -36,12 +36,12 @@ ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7) ld [wCurTMHM], a ret -GetTMHMItemMove: ; 2c7b6 (b:47b6) +GetTMHMItemMove: call ConvertCurItemIntoCurTMHM predef GetTMHMMove ret -AskTeachTMHM: ; 2c7bf (b:47bf) +AskTeachTMHM: ld hl, wOptions ld a, [hl] push af @@ -70,13 +70,13 @@ AskTeachTMHM: ; 2c7bf (b:47bf) ld [wOptions], a ret -ChooseMonToLearnTMHM: ; 2c7fb +ChooseMonToLearnTMHM: ld hl, wStringBuffer2 ld de, wTMHMMoveNameBackup ld bc, 12 call CopyBytes call ClearBGPalettes -ChooseMonToLearnTMHM_NoRefresh: ; 2c80a +ChooseMonToLearnTMHM_NoRefresh: farcall LoadPartyMenuGFX farcall InitPartyMenuWithCancel farcall InitPartyMenuGFX @@ -115,9 +115,8 @@ ChooseMonToLearnTMHM_NoRefresh: ; 2c80a pop de pop hl jr .loopback -; 2c867 -TeachTMHM: ; 2c867 +TeachTMHM: predef CanLearnTMHMMove push bc @@ -166,7 +165,6 @@ TeachTMHM: ; 2c867 .learned_move scf ret -; 2c8bf (b:48bf) Text_BootedTM: ; 0x2c8bf ; Booted up a TM. @@ -192,7 +190,7 @@ Text_TMHMNotCompatible: ; 0x2c8ce db "@" ; 0x2c8d3 -TMHM_PocketLoop: ; 2c8d3 (b:48d3) +TMHM_PocketLoop: xor a ld [hBGMapMode], a call TMHM_DisplayPocketItems @@ -225,7 +223,7 @@ TMHM_PocketLoop: ; 2c8d3 (b:48d3) ld [wMenuCursorX], a jr TMHM_ShowTMMoveDescription -TMHM_JoypadLoop: ; 2c915 (b:4915) +TMHM_JoypadLoop: call TMHM_DisplayPocketItems call StaticMenuJoypad ld b, a @@ -247,7 +245,7 @@ TMHM_JoypadLoop: ; 2c915 (b:4915) jp nz, TMHM_ExitPocket bit D_LEFT_F, a jp nz, TMHM_ExitPocket -TMHM_ShowTMMoveDescription: ; 2c946 (b:4946) +TMHM_ShowTMMoveDescription: call TMHM_CheckHoveringOverCancel jp nc, TMHM_ExitPocket hlcoord 0, 12 @@ -265,7 +263,7 @@ TMHM_ShowTMMoveDescription: ; 2c946 (b:4946) call PrintMoveDesc jp TMHM_JoypadLoop -TMHM_ChooseTMorHM: ; 2c974 (b:4974) +TMHM_ChooseTMorHM: call TMHM_PlaySFX_ReadText2 call CountTMsHMs ; This stores the count to wd265. ld a, [wMenuCursorY] @@ -277,7 +275,7 @@ TMHM_ChooseTMorHM: ; 2c974 (b:4974) ld a, [wd265] cp b jr z, _TMHM_ExitPack ; our cursor was hovering over CANCEL -TMHM_CheckHoveringOverCancel: ; 2c98a (b:498a) +TMHM_CheckHoveringOverCancel: call TMHM_GetCurrentPocketPosition ld a, [wMenuCursorY] ld b, a @@ -297,19 +295,19 @@ TMHM_CheckHoveringOverCancel: ; 2c98a (b:498a) cp -1 ret -TMHM_ExitPack: ; 2c9a5 (b:49a5) +TMHM_ExitPack: call TMHM_PlaySFX_ReadText2 -_TMHM_ExitPack: ; 2c9a8 (b:49a8) +_TMHM_ExitPack: ld a, $2 ld [wMenuJoypad], a and a ret -TMHM_ExitPocket: ; 2c9af (b:49af) +TMHM_ExitPocket: and a ret -TMHM_ScrollPocket: ; 2c9b1 (b:49b1) +TMHM_ScrollPocket: ld a, b bit 7, a jr nz, .skip @@ -339,7 +337,7 @@ TMHM_ScrollPocket: ; 2c9b1 (b:49b1) call TMHM_DisplayPocketItems jp TMHM_ShowTMMoveDescription -TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2) +TMHM_DisplayPocketItems: ld a, [wBattleType] cp BATTLETYPE_TUTORIAL jp z, Tutorial_TMHMPocket @@ -433,7 +431,7 @@ TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2) .done ret -TMHMPocket_GetCurrentLineCoord: ; 2ca86 (b:4a86) +TMHMPocket_GetCurrentLineCoord: hlcoord 5, 0 ld bc, 2 * SCREEN_WIDTH ld a, 6 @@ -445,9 +443,8 @@ TMHMPocket_GetCurrentLineCoord: ; 2ca86 (b:4a86) dec e jr nz, .loop ret -; 2ca95 (b:4a95) -Unreferenced_Function2ca95: ; 2ca95 +Unreferenced_Function2ca95: pop hl ld bc, 3 add hl, bc @@ -459,13 +456,11 @@ Unreferenced_Function2ca95: ; 2ca95 call PlaceString pop hl ret -; 2caae -TMHM_String_Cancel: ; 2caae +TMHM_String_Cancel: db "CANCEL@" -; 2cab5 -TMHM_GetCurrentPocketPosition: ; 2cab5 (b:4ab5) +TMHM_GetCurrentPocketPosition: ld hl, wTMsHMs ld a, [wTMHMPocketScrollPosition] ld b, a @@ -482,7 +477,7 @@ TMHM_GetCurrentPocketPosition: ; 2cab5 (b:4ab5) dec c ret -Tutorial_TMHMPocket: ; 2caca (b:4aca) +Tutorial_TMHMPocket: hlcoord 9, 3 push de ld de, TMHM_String_Cancel @@ -490,15 +485,14 @@ Tutorial_TMHMPocket: ; 2caca (b:4aca) pop de ret -TMHM_PlaySFX_ReadText2: ; 2cad6 (b:4ad6) +TMHM_PlaySFX_ReadText2: push de ld de, SFX_READ_TEXT_2 call PlaySFX pop de ret -; 2cadf (b:4adf) -Unreferenced_Function2cadf: ; 2cadf +Unreferenced_Function2cadf: call ConvertCurItemIntoCurTMHM call .CheckHaveRoomForTMHM ld hl, .NoRoomText @@ -506,7 +500,6 @@ Unreferenced_Function2cadf: ; 2cadf ld hl, .ReceivedText .print jp PrintText -; 2caf0 .NoRoomText: ; 0x2caf0 ; You have no room for any more @ S. @@ -520,7 +513,7 @@ Unreferenced_Function2cadf: ; 2cadf db "@" ; 0x2cafa -.CheckHaveRoomForTMHM: ; 2cafa +.CheckHaveRoomForTMHM: ld a, [wd265] dec a ld hl, wTMsHMs @@ -533,9 +526,8 @@ Unreferenced_Function2cadf: ; 2cadf ret nc ld [hl], a ret -; 2cb0c -ConsumeTM: ; 2cb0c (b:4b0c) +ConsumeTM: call ConvertCurItemIntoCurTMHM ld a, [wd265] dec a @@ -556,7 +548,7 @@ ConsumeTM: ; 2cb0c (b:4b0c) ld [wTMHMPocketScrollPosition], a ret -CountTMsHMs: ; 2cb2a (b:4b2a) +CountTMsHMs: ld b, 0 ld c, NUM_TMS + NUM_HMS ld hl, wTMsHMs @@ -572,7 +564,7 @@ CountTMsHMs: ; 2cb2a (b:4b2a) ld [wd265], a ret -PrintMoveDesc: ; 2cb3e +PrintMoveDesc: push hl ld hl, MoveDescriptions ld a, [wCurSpecies] @@ -586,4 +578,3 @@ PrintMoveDesc: ; 2cb3e ld d, [hl] pop hl jp PlaceString -; 2cb52 |