Game-Decompilation/LADX-Disassembly
1
0
Fork 0
mirror of https://github.com/zladx/LADX-Disassembly.git synced 2024-11-26 22:30:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

entities: fix some wording

Browse Source
This commit is contained in:
Pierre de La Morinerie 2024-10-30 12:12:55 +01:00
parent 55b64fbcaa
commit 6c672c40f4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/code/entities/05__helpers_1.asm
View File

@ -70,7 +70,7 @@ SetEntityVariantForDirection_05::
ShouldLinkTalkToEntity_05::
;
; Check if Link is vertically close from the entity
; Check if Link is vertically close to the entity
;
ld e, b ;; 05:5506 $58
@ -97,7 +97,7 @@ ShouldLinkTalkToEntity_05::
jr nc, .dontTalk ;; 05:5523 $30 $44
;
; Check if Link is horizontally close from the entity
; Check if Link is horizontally close to the entity
;
ldh a, [hLinkPositionX] ;; 05:5525 $F0 $98

8
src/code/entities/05_marin.asm
View File

@ -85,7 +85,7 @@ MarinEntityHandler::
and a ;; 05:4E74 $A7
jp nz, MarinEntityHandler_Indoor ;; 05:4E75 $C2 $CE $51
; Didn't found sword yet: remove the outdoor entity
; Didn't find sword yet: remove the outdoor entity
ld a, [wSwordLevel] ;; 05:4E78 $FA $4E $DB
and a ;; 05:4E7B $A7
jp z, ClearEntityStatus_05 ;; 05:4E7C $CA $4B $7B
@ -141,7 +141,7 @@ MarinEntityHandler::
.jr_4ED1
;
; Spaw music notes when Marin is singing
; Spawn music notes when Marin is singing
;
call SetEntityVariantForDirection_05 ;; 05:4ED1 $CD $EA $54
@ -698,13 +698,13 @@ MarinEntityHandler_Indoor::
.letterEnd
;
; After Link retrieved its sword, Marin is no longer home. Remove the entity.
; After Link retrieves his sword, Marin is no longer home. Remove the entity.
;
ld a, [wSwordLevel] ;; 05:51FB $FA $4E $DB
and a ;; 05:51FE $A7
jp nz, ClearEntityStatus_05 ;; 05:51FF $C2 $4B $7B
; After Link retrieved its shield, set the state directly to MARIN_STATE_3
; After Link retrieves his shield, set the state directly to MARIN_LINK_OUT_OF_BED_STATE
ld a, [wShieldLevel] ;; 05:5202 $FA $44 $DB
and a ;; 05:5205 $A7
jr z, .shieldEnd ;; 05:5206 $28 $09