Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Identify some more unnamed labels

This commit is contained in:
Rangi 2020-10-05 20:10:01 -04:00
parent 6b7ade66da
commit 42d0a2567a
8 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/gfx/color.asm
View File

@ -743,7 +743,7 @@ CGBCopyBattleObjectPals: ; unreferenced
BattleObjectPals: BattleObjectPals:
INCLUDE "gfx/battle_anims/battle_anims.pal" INCLUDE "gfx/battle_anims/battle_anims.pal"
Function97cc: ; unreferenced CGBCopyTwoPredefObjectPals: ; unreferenced
call CheckCGB call CheckCGB
ret z ret z
ld a, (1 << rOBPI_AUTO_INCREMENT) | $10 ld a, (1 << rOBPI_AUTO_INCREMENT) | $10

3
engine/items/tmhm.asm
View File

@ -436,7 +436,8 @@ TMHMPocket_GetCurrentLineCoord:
jr nz, .loop jr nz, .loop
ret ret
Function2ca95: ; unreferenced PlaceMoveNameAfterTMHMName: ; unreferenced
; Similar to a part of TMHM_DisplayPocketItems.
pop hl pop hl
ld bc, 3 ld bc, 3
add hl, bc add hl, bc

39
engine/overworld/npc_movement.asm
View File

@ -274,14 +274,14 @@ WillObjectBumpIntoSomeoneElse:
ld e, [hl] ld e, [hl]
jr IsNPCAtCoord jr IsNPCAtCoord
Function7015: ; unreferenced IsObjectFacingSomeoneElse: ; unreferenced
ldh a, [hMapObjectIndexBuffer] ldh a, [hMapObjectIndexBuffer]
call GetObjectStruct call GetObjectStruct
call .CheckWillBeFacingNPC call .GetFacingCoords
call IsNPCAtCoord call IsNPCAtCoord
ret ret
.CheckWillBeFacingNPC: .GetFacingCoords:
ld hl, OBJECT_NEXT_MAP_X ld hl, OBJECT_NEXT_MAP_X
add hl, bc add hl, bc
ld d, [hl] ld d, [hl]
@ -289,12 +289,13 @@ Function7015: ; unreferenced
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
call GetSpriteDirection call GetSpriteDirection
and a and a ; OW_DOWN?
jr z, .down jr z, .down
cp OW_UP cp OW_UP
jr z, .up jr z, .up
cp OW_LEFT cp OW_LEFT
jr z, .left jr z, .left
; OW_RIGHT
inc d inc d
ret ret
@ -326,32 +327,31 @@ IsNPCAtCoord:
ld hl, OBJECT_PALETTE ld hl, OBJECT_PALETTE
add hl, bc add hl, bc
bit BIG_OBJECT_F, [hl] bit BIG_OBJECT_F, [hl]
jr z, .got jr z, .not_big
call WillObjectIntersectBigObject call WillObjectIntersectBigObject
jr nc, .ok jr nc, .check_current_coords
jr .ok2 jr .continue
.got .not_big
ld hl, OBJECT_NEXT_MAP_X ld hl, OBJECT_NEXT_MAP_X
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp d cp d
jr nz, .ok jr nz, .check_current_coords
ld hl, OBJECT_NEXT_MAP_Y ld hl, OBJECT_NEXT_MAP_Y
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp e cp e
jr nz, .ok jr nz, .check_current_coords
.ok2 .continue
ldh a, [hMapObjectIndexBuffer] ldh a, [hMapObjectIndexBuffer]
ld l, a ld l, a
ldh a, [hObjectStructIndexBuffer] ldh a, [hObjectStructIndexBuffer]
cp l cp l
jr nz, .setcarry jr nz, .yes
.ok .check_current_coords
ld hl, OBJECT_MAP_X ld hl, OBJECT_MAP_X
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -366,7 +366,7 @@ IsNPCAtCoord:
ld l, a ld l, a
ldh a, [hObjectStructIndexBuffer] ldh a, [hObjectStructIndexBuffer]
cp l cp l
jr nz, .setcarry jr nz, .yes
.next .next
ld hl, OBJECT_LENGTH ld hl, OBJECT_LENGTH
@ -380,7 +380,7 @@ IsNPCAtCoord:
and a and a
ret ret
.setcarry .yes
scf scf
ret ret
@ -473,7 +473,7 @@ IsObjectMovingOffEdgeOfScreen:
scf scf
ret ret
Function7113: ; unreferenced IsNPCAtPlayerCoord: ; unreferenced
ld a, [wPlayerStandingMapX] ld a, [wPlayerStandingMapX]
ld d, a ld d, a
ld a, [wPlayerStandingMapY] ld a, [wPlayerStandingMapY]
@ -484,16 +484,17 @@ Function7113: ; unreferenced
ldh [hObjectStructIndexBuffer], a ldh [hObjectStructIndexBuffer], a
call DoesObjectHaveASprite call DoesObjectHaveASprite
jr z, .next jr z, .next
ld hl, OBJECT_MOVEMENTTYPE ld hl, OBJECT_MOVEMENTTYPE
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp SPRITEMOVEDATA_BIGDOLLSYM cp SPRITEMOVEDATA_BIGDOLLSYM
jr nz, .not_snorlax jr nz, .not_big
call WillObjectIntersectBigObject call WillObjectIntersectBigObject
jr c, .yes jr c, .yes
jr .next jr .next
.not_snorlax .not_big
ld hl, OBJECT_NEXT_MAP_Y ld hl, OBJECT_NEXT_MAP_Y
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]

4
engine/pokemon/bills_pc_top.asm
View File

@ -139,7 +139,7 @@ BillsPC_DepositMenu:
and a and a
ret ret
Functione512: ; unreferenced BillsPC_Deposit_CheckPartySize: ; unreferenced
ld a, [wPartyCount] ld a, [wPartyCount]
and a and a
jr z, .no_mon jr z, .no_mon
@ -206,7 +206,7 @@ BillsPC_WithdrawMenu:
and a and a
ret ret
Functione56d: ; unreferenced BillsPC_Withdraw_CheckPartySize: ; unreferenced
ld a, [wPartyCount] ld a, [wPartyCount]
cp PARTY_LENGTH cp PARTY_LENGTH
jr nc, .party_full jr nc, .party_full

3
engine/pokemon/mail_2.asm
View File

@ -709,7 +709,8 @@ MailGFX_PlaceMessage:
.place_author .place_author
jp PlaceString jp PlaceString
Functionb984e: ; unreferenced InvertBytes: ; unreferenced
; invert bc bytes starting at hl
.loop .loop
ld a, [hl] ld a, [hl]
xor $ff xor $ff

4
engine/printer/printer.asm
View File

@ -575,7 +575,9 @@ PlacePrinterStatusString:
ld [wPrinterStatus], a ld [wPrinterStatus], a
ret ret
Function847bd: ; unreferenced PlacePrinterStatusStringBorderless: ; unreferenced
; Similar to PlacePrinterStatusString, but with different hlcoords
; and ClearBox instead of TextBox.
ld a, [wPrinterStatus] ld a, [wPrinterStatus]
and a and a
ret z ret z

3
engine/rtc/print_hours_mins.asm
View File

@ -1,9 +1,10 @@
Function1dd6a9: ; unreferenced Function1dd6a9: ; unreferenced
; Debug function? ; Debug function?
; Input: bc = value, de = destination
ld a, b ld a, b
ld b, c ld b, c
ld c, a ld c, a
push bc push bc ; de points to this on the stack for PrintNum
push de push de
ld hl, sp+2 ld hl, sp+2
ld d, h ld d, h

2
engine/rtc/timeset.asm
View File

@ -196,7 +196,7 @@ DisplayHourOClock:
pop hl pop hl
ret ret
Function907f1: ; unreferenced DisplayHoursMinutesWithMinString: ; unreferenced
ld h, d ld h, d
ld l, e ld l, e
push hl push hl