pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	engine/items/mart.asm
This commit is contained in:
Rangi
2018-06-24 21:23:51 -04:00
parent 1a888f2200 3648546232
commit e2fb7acac0
1206 changed files with 14376 additions and 24565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
engine/items/buy_sell_toss.asm
View File

@@ -1,13 +1,12 @@
SelectQuantityToToss: ; 24fbf
SelectQuantityToToss:
ld hl, TossItem_MenuHeader
call LoadMenuHeader
call Toss_Sell_Loop
ret
; 24fc9
SelectQuantityToBuy: ; 24fc9
SelectQuantityToBuy:
farcall GetItemPrice
RooftopSale_SelectQuantityToBuy: ; 24fcf
RooftopSale_SelectQuantityToBuy:
ld a, d
ld [wBuffer1], a
ld a, e
@@ -16,9 +15,8 @@ RooftopSale_SelectQuantityToBuy: ; 24fcf
call LoadMenuHeader
call Toss_Sell_Loop
ret
; 24fe1
SelectQuantityToSell: ; 24fe1
SelectQuantityToSell:
farcall GetItemPrice
ld a, d
ld [wBuffer1], a
@@ -28,9 +26,8 @@ SelectQuantityToSell: ; 24fe1
call LoadMenuHeader
call Toss_Sell_Loop
ret
; 24ff9
Toss_Sell_Loop: ; 24ff9
Toss_Sell_Loop:
ld a, 1
ld [wItemQuantityChangeBuffer], a
.loop
@@ -45,9 +42,8 @@ Toss_Sell_Loop: ; 24ff9
.nope
and a
ret
; 2500e
BuySellToss_InterpretJoypad: ; 2500e
BuySellToss_InterpretJoypad:
call JoyTextDelay_ForcehJoyDown ; get joypad
bit B_BUTTON_F, c
jr nz, .b
@@ -126,9 +122,8 @@ BuySellToss_InterpretJoypad: ; 2500e
ld [wItemQuantityChangeBuffer], a
and a
ret
; 25072
BuySellToss_UpdateQuantityDisplay: ; 25072
BuySellToss_UpdateQuantityDisplay:
call MenuBox
call MenuBoxCoord2Tile
ld de, SCREEN_WIDTH + 1
@@ -145,26 +140,22 @@ BuySellToss_UpdateQuantityDisplay: ; 25072
ld a, [wMenuDataBank]
call FarCall_de
ret
; 25097
ret_25097: ; 25097
ret_25097:
ret
; 25098
DisplayPurchasePrice: ; 25098
DisplayPurchasePrice:
call BuySell_MultiplyPrice
call BuySell_DisplaySubtotal
ret
; 2509f
DisplaySellingPrice: ; 2509f
DisplaySellingPrice:
call BuySell_MultiplyPrice
call Sell_HalvePrice
call BuySell_DisplaySubtotal
ret
; 250a9
BuySell_MultiplyPrice: ; 250a9
BuySell_MultiplyPrice:
xor a
ld [hMultiplicand + 0], a
ld a, [wBuffer1]
@@ -177,9 +168,8 @@ BuySell_MultiplyPrice: ; 250a9
call Multiply
pop hl
ret
; 250c1
Sell_HalvePrice: ; 250c1
Sell_HalvePrice:
push hl
ld hl, hProduct + 1
ld a, [hl]
@@ -193,9 +183,8 @@ Sell_HalvePrice: ; 250c1
ld [hl], a
pop hl
ret
; 250d1
BuySell_DisplaySubtotal: ; 250d1
BuySell_DisplaySubtotal:
push hl
ld hl, hMoneyTemp
ld a, [hProduct + 1]
@@ -211,25 +200,21 @@ BuySell_DisplaySubtotal: ; 250d1
call PrintNum
call WaitBGMap
ret
; 250ed
TossItem_MenuHeader: ; 0x250ed
TossItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw ret_25097
db 0 ; default option
; 0x250f5
BuyItem_MenuHeader: ; 0x250f5
BuyItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplayPurchasePrice
db -1 ; default option
; 0x250fd
SellItem_MenuHeader: ; 0x250fd
SellItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplaySellingPrice
db 0 ; default option
; 0x25105

419
engine/items/item_effects.asm
View File

File diff suppressed because it is too large Load Diff

76
engine/items/items.asm
View File

@@ -1,4 +1,4 @@
_ReceiveItem:: ; d1d5
_ReceiveItem::
call DoesHLEqualNumItems
jp nz, PutItemInPocket
push hl
@@ -10,28 +10,28 @@ _ReceiveItem:: ; d1d5
rst JumpTable
ret
.Pockets: ; d1e9
.Pockets:
; entries correspond to item types
dw .Item
dw .KeyItem
dw .Ball
dw .TMHM
.Item: ; d1f1
.Item:
ld h, d
ld l, e
jp PutItemInPocket
.KeyItem: ; d1f6
.KeyItem:
ld h, d
ld l, e
jp ReceiveKeyItem
.Ball: ; d1fb
.Ball:
ld hl, wNumBalls
jp PutItemInPocket
.TMHM: ; d201
.TMHM:
ld h, d
ld l, e
ld a, [wCurItem]
@@ -39,7 +39,7 @@ _ReceiveItem:: ; d1d5
call GetTMHMNumber
jp ReceiveTMHM
_TossItem:: ; d20d
_TossItem::
call DoesHLEqualNumItems
jr nz, .remove
push hl
@@ -58,11 +58,11 @@ _TossItem:: ; d20d
dw .Ball
dw .TMHM
.Ball: ; d228
.Ball:
ld hl, wNumBalls
jp RemoveItemFromPocket
.TMHM: ; d22e
.TMHM:
ld h, d
ld l, e
ld a, [wCurItem]
@@ -70,19 +70,19 @@ _TossItem:: ; d20d
call GetTMHMNumber
jp TossTMHM
.KeyItem: ; d23a
.KeyItem:
ld h, d
ld l, e
jp TossKeyItem
.Item: ; d23f
.Item:
ld h, d
ld l, e
.remove
jp RemoveItemFromPocket
_CheckItem:: ; d244
_CheckItem::
call DoesHLEqualNumItems
jr nz, .nope
push hl
@@ -101,11 +101,11 @@ _CheckItem:: ; d244
dw .Ball
dw .TMHM
.Ball: ; d25f
.Ball:
ld hl, wNumBalls
jp CheckTheItem
.TMHM: ; d265
.TMHM:
ld h, d
ld l, e
ld a, [wCurItem]
@@ -113,19 +113,19 @@ _CheckItem:: ; d244
call GetTMHMNumber
jp CheckTMHM
.KeyItem: ; d271
.KeyItem:
ld h, d
ld l, e
jp CheckKeyItems
.Item: ; d276
.Item:
ld h, d
ld l, e
.nope
jp CheckTheItem
DoesHLEqualNumItems: ; d27b
DoesHLEqualNumItems:
ld a, l
cp LOW(wNumItems)
ret nz
@@ -133,7 +133,7 @@ DoesHLEqualNumItems: ; d27b
cp HIGH(wNumItems)
ret
GetPocketCapacity: ; d283
GetPocketCapacity:
ld c, MAX_ITEMS
ld a, e
cp LOW(wNumItems)
@@ -155,7 +155,7 @@ GetPocketCapacity: ; d283
ld c, MAX_BALLS
ret
PutItemInPocket: ; d29c
PutItemInPocket:
ld d, h
ld e, l
inc hl
@@ -231,7 +231,7 @@ PutItemInPocket: ; d29c
scf
ret
RemoveItemFromPocket: ; d2ff
RemoveItemFromPocket:
ld d, h
ld e, l
ld a, [hli]
@@ -296,7 +296,7 @@ RemoveItemFromPocket: ; d2ff
and a
ret
CheckTheItem: ; d349
CheckTheItem:
ld a, [wCurItem]
ld c, a
.loop
@@ -313,7 +313,7 @@ CheckTheItem: ; d349
and a
ret
ReceiveKeyItem: ; d35a
ReceiveKeyItem:
ld hl, wNumKeyItems
ld a, [hli]
cp MAX_KEY_ITEMS
@@ -333,7 +333,7 @@ ReceiveKeyItem: ; d35a
and a
ret
TossKeyItem: ; d374
TossKeyItem:
ld a, [wCurItemQuantity]
ld e, a
ld d, 0
@@ -363,7 +363,7 @@ TossKeyItem: ; d374
scf
ret
.Toss: ; d396
.Toss:
ld hl, wNumKeyItems
ld a, [wCurItem]
ld c, a
@@ -384,7 +384,7 @@ TossKeyItem: ; d374
scf
ret
CheckKeyItems: ; d3b1
CheckKeyItems:
ld a, [wCurItem]
ld c, a
ld hl, wKeyItems
@@ -401,7 +401,7 @@ CheckKeyItems: ; d3b1
scf
ret
ReceiveTMHM: ; d3c4
ReceiveTMHM:
dec c
ld b, 0
ld hl, wTMsHMs
@@ -418,7 +418,7 @@ ReceiveTMHM: ; d3c4
and a
ret
TossTMHM: ; d3d8
TossTMHM:
dec c
ld b, 0
ld hl, wTMsHMs
@@ -445,7 +445,7 @@ TossTMHM: ; d3d8
and a
ret
CheckTMHM: ; d3fb
CheckTMHM:
dec c
ld b, $0
ld hl, wTMsHMs
@@ -456,7 +456,7 @@ CheckTMHM: ; d3fb
scf
ret
GetTMHMNumber:: ; d407
GetTMHMNumber::
; Return the number of a TM/HM by item id c.
ld a, c
; Skip any dummy items.
@@ -473,7 +473,7 @@ GetTMHMNumber:: ; d407
ld c, a
ret
GetNumberedTMHM: ; d417
GetNumberedTMHM:
; Return the item id of a TM/HM by number c.
ld a, c
; Skip any gaps.
@@ -491,7 +491,7 @@ GetNumberedTMHM: ; d417
ld c, a
ret
_CheckTossableItem:: ; d427
_CheckTossableItem::
; Return 1 in wItemAttributeParamBuffer and carry if wCurItem can't be removed from the bag.
ld a, ITEMATTR_PERMISSIONS
call GetItemAttr
@@ -500,7 +500,7 @@ _CheckTossableItem:: ; d427
and a
ret
CheckSelectableItem: ; d432
CheckSelectableItem:
; Return 1 in wItemAttributeParamBuffer and carry if wCurItem can't be selected.
ld a, ITEMATTR_PERMISSIONS
call GetItemAttr
@@ -509,7 +509,7 @@ CheckSelectableItem: ; d432
and a
ret
CheckItemPocket:: ; d43d
CheckItemPocket::
; Return the pocket for wCurItem in wItemAttributeParamBuffer.
ld a, ITEMATTR_POCKET
call GetItemAttr
@@ -517,7 +517,7 @@ CheckItemPocket:: ; d43d
ld [wItemAttributeParamBuffer], a
ret
CheckItemContext: ; d448
CheckItemContext:
; Return the context for wCurItem in wItemAttributeParamBuffer.
ld a, ITEMATTR_HELP
call GetItemAttr
@@ -525,7 +525,7 @@ CheckItemContext: ; d448
ld [wItemAttributeParamBuffer], a
ret
CheckItemMenu: ; d453
CheckItemMenu:
; Return the menu for wCurItem in wItemAttributeParamBuffer.
ld a, ITEMATTR_HELP
call GetItemAttr
@@ -534,7 +534,7 @@ CheckItemMenu: ; d453
ld [wItemAttributeParamBuffer], a
ret
GetItemAttr: ; d460
GetItemAttr:
; Get attribute a of wCurItem.
push hl
@@ -560,13 +560,13 @@ GetItemAttr: ; d460
pop hl
ret
ItemAttr_ReturnCarry: ; d47f
ItemAttr_ReturnCarry:
ld a, 1
ld [wItemAttributeParamBuffer], a
scf
ret
GetItemPrice: ; d486
GetItemPrice:
; Return the price of wCurItem in de.
push hl
push bc

237
engine/items/mart.asm
View File

File diff suppressed because it is too large Load Diff

389
engine/items/pack.asm
View File

File diff suppressed because it is too large Load Diff

6
engine/items/pack_kris.asm
View File

@@ -1,4 +1,4 @@
DrawKrisPackGFX: ; 48e81
DrawKrisPackGFX:
ld hl, PackFGFXPointers
add hl, de
add hl, de
@@ -10,11 +10,11 @@ DrawKrisPackGFX: ; 48e81
call Request2bpp
ret
PackFGFXPointers: ; 48e93
PackFGFXPointers:
dw PackFGFX + (15 tiles) * 1 ; ITEM_POCKET
dw PackFGFX + (15 tiles) * 3 ; BALL_POCKET
dw PackFGFX + (15 tiles) * 0 ; KEY_ITEM_POCKET
dw PackFGFX + (15 tiles) * 2 ; TM_HM_POCKET
PackFGFX: ; 48e9b
PackFGFX:
INCBIN "gfx/pack/pack_f.2bpp"

3
engine/items/print_item_description.asm
View File

@@ -1,4 +1,4 @@
PrintItemDescription: ; 0x1c8955
PrintItemDescription:
; Print the description for item [wCurSpecies] at de.
ld a, [wCurSpecies]
@@ -28,4 +28,3 @@ PrintItemDescription: ; 0x1c8955
ld d, [hl]
pop hl
jp PlaceString
; 0x1c8987

24
engine/items/switch_items.asm
View File

@@ -1,4 +1,4 @@
SwitchItemsInBag: ; 2490c (9:490c)
SwitchItemsInBag:
ld a, [wSwitchItem]
and a
jr z, .init
@@ -84,7 +84,7 @@ SwitchItemsInBag: ; 2490c (9:490c)
ld [wSwitchItem], a
ret
Function249a7: ; 249a7 (9:49a7)
Function249a7:
ld a, [wSwitchItem]
call ItemSwitch_GetNthItem
ld d, h
@@ -110,7 +110,7 @@ Function249a7: ; 249a7 (9:49a7)
scf
ret
Function249d1: ; 249d1 (9:49d1)
Function249d1:
ld a, [wSwitchItem]
call ItemSwitch_GetNthItem
inc hl
@@ -180,14 +180,14 @@ Function249d1: ; 249d1 (9:49d1)
ld [wSwitchItem], a
ret
Function24a40: ; 24a40 (9:4a40)
Function24a40:
call ItemSwitch_GetNthItem
ld de, wd002
call ItemSwitch_ConvertSpacingToDW
call CopyBytes
ret
Function24a4d: ; 24a4d (9:4a4d)
Function24a4d:
call ItemSwitch_GetNthItem
ld d, h
ld e, l
@@ -196,7 +196,7 @@ Function24a4d: ; 24a4d (9:4a4d)
call CopyBytes
ret
ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
ItemSwitch_GetNthItem:
push af
call ItemSwitch_ConvertSpacingToDW
ld hl, wMenuData_ItemsPointerAddr
@@ -208,7 +208,7 @@ ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
call AddNTimes
ret
Function24a6c: ; 24a6c (9:4a6c)
Function24a6c:
push hl
call ItemSwitch_ConvertSpacingToDW
ld a, d
@@ -224,7 +224,7 @@ Function24a6c: ; 24a6c (9:4a6c)
pop hl
ret
ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
ItemSwitch_ConvertSpacingToDW:
; This function is absolutely idiotic.
push hl
ld a, [wMenuData_ScrollingMenuSpacing]
@@ -239,13 +239,11 @@ ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
pop hl
ret
; 24a91 (9:4a91)
.spacing_dws ; 24a91
.spacing_dws
dw 0, 1, 2
; 24a97
Function24a97: ; 24a97 (9:4a97)
Function24a97:
push af
call ItemSwitch_ConvertSpacingToDW
ld a, c
@@ -262,7 +260,7 @@ Function24a97: ; 24a97 (9:4a97)
ld a, $1
ret
Function24aab: ; 24aab (9:4aab)
Function24aab:
.loop
ld a, [hld]
ld [de], a

85
engine/items/tmhm.asm
View File

@@ -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,33 +165,28 @@ TeachTMHM: ; 2c867
.learned_move
scf
ret
; 2c8bf (b:48bf)
Text_BootedTM: ; 0x2c8bf
Text_BootedTM:
; Booted up a TM.
text_jump UnknownText_0x1c0373
db "@"
; 0x2c8c4
Text_BootedHM: ; 0x2c8c4
Text_BootedHM:
; Booted up an HM.
text_jump UnknownText_0x1c0384
db "@"
; 0x2c8c9
Text_ItContained: ; 0x2c8c9
Text_ItContained:
; It contained @ . Teach @ to a #MON?
text_jump UnknownText_0x1c0396
db "@"
; 0x2c8ce
Text_TMHMNotCompatible: ; 0x2c8ce
Text_TMHMNotCompatible:
; is not compatible with @ . It can't learn @ .
text_jump UnknownText_0x1c03c2
db "@"
; 0x2c8d3
TMHM_PocketLoop: ; 2c8d3 (b:48d3)
TMHM_PocketLoop:
xor a
ld [hBGMapMode], a
call TMHM_DisplayPocketItems
@@ -225,7 +219,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 +241,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 +259,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 +271,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 +291,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 +333,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 +427,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 +439,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 +452,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 +473,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 +481,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,21 +496,18 @@ Unreferenced_Function2cadf: ; 2cadf
ld hl, .ReceivedText
.print
jp PrintText
; 2caf0
.NoRoomText: ; 0x2caf0
.NoRoomText:
; You have no room for any more @ S.
text_jump UnknownText_0x1c03fa
db "@"
; 0x2caf5
.ReceivedText: ; 0x2caf5
.ReceivedText:
; You received @ !
text_jump UnknownText_0x1c0421
db "@"
; 0x2cafa
.CheckHaveRoomForTMHM: ; 2cafa
.CheckHaveRoomForTMHM:
ld a, [wd265]
dec a
ld hl, wTMsHMs
@@ -533,9 +520,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 +542,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 +558,7 @@ CountTMsHMs: ; 2cb2a (b:4b2a)
ld [wd265], a
ret
PrintMoveDesc: ; 2cb3e
PrintMoveDesc:
push hl
ld hl, MoveDescriptions
ld a, [wCurSpecies]
@@ -586,4 +572,3 @@ PrintMoveDesc: ; 2cb3e
ld d, [hl]
pop hl
jp PlaceString
; 2cb52

6
engine/items/tmhm2.asm
View File

@@ -1,4 +1,4 @@
CanLearnTMHMMove: ; 11639
CanLearnTMHMMove:
ld a, [wCurPartySpecies]
ld [wCurSpecies], a
call GetBaseData
@@ -31,9 +31,8 @@ CanLearnTMHMMove: ; 11639
pop hl
ld c, 0
ret
; 1166a
GetTMHMMove: ; 1166a
GetTMHMMove:
ld a, [wd265]
dec a
ld hl, TMHMMoves
@@ -43,7 +42,6 @@ GetTMHMMove: ; 1166a
ld a, [hl]
ld [wd265], a
ret
; 1167a
INCLUDE "data/moves/tmhm_moves.asm"

2
engine/items/update_item_description.asm
View File

@@ -1,4 +1,4 @@
UpdateItemDescription: ; 0x244c3
UpdateItemDescription:
ld a, [wMenuSelection]
ld [wCurSpecies], a
hlcoord 0, 12