Game-Decompilation/LADX-Disassembly
1
0
Fork 0
mirror of https://github.com/zladx/LADX-Disassembly.git synced 2025-02-18 14:40:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Label the kids throwing the ball back and forward a bit better. This also labels two common used functions in bank 6, and removes some labels that are not references anywhere.

Browse Source
This commit is contained in:
Daid 2023-03-28 21:16:39 +02:00
parent 9012fd3df0
commit 4bd070c027
13 changed files with 61 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/code/entities/06_armos_knight.asm
View File

@ -95,7 +95,7 @@ jr_006_5361:
call ReturnIfNonInteractive_06 ; $5361: $CD $C6 $64
call BossIntro ; $5364: $CD $E8 $3E
call label_3B70 ; $5367: $CD $70 $3B
call func_006_641A ; $536A: $CD $1A $64
call PushLinkOutOfEntity_06 ; $536A: $CD $1A $64
call AddEntityZSpeedToPos_06 ; $536D: $CD $7A $65
ld hl, wEntitiesSpeedZTable ; $5370: $21 $20 $C3
add hl, bc ; $5373: $09

4
src/code/entities/06_crazy_tracy.asm
View File

@ -102,7 +102,7 @@ CrazyTracyEntityHandler::
call func_015_7964_trampoline ; $5F0A: $CD $A0 $3D
call CopyEntityPositionToActivePosition ; $5F0D: $CD $8A $3D
call ReturnIfNonInteractive_06 ; $5F10: $CD $C6 $64
call func_006_641A ; $5F13: $CD $1A $64
call PushLinkOutOfEntity_06 ; $5F13: $CD $1A $64
ldh a, [hActiveEntityState] ; $5F16: $F0 $F0
JP_TABLE ; $5F18
@ -119,7 +119,7 @@ ShouldLinkTalkToTracy::
sub [hl] ; $5F28: $96
add $28 ; $5F29: $C6 $28
cp $50 ; $5F2B: $FE $50
jp func_006_645D.label_006_647E ; $5F2D: $C3 $7E $64
jp CheckLinkInteractionWithEntity_06.label_006_647E ; $5F2D: $C3 $7E $64
CrazyTracyGreetingHandler::
call ShouldLinkTalkToTracy ; $5F30: $CD $23 $5F

2
src/code/entities/06_giant_goponga_flower.asm
View File

@ -3,7 +3,7 @@ GiantGopongaFlowerEntityHandler::
call ReturnIfNonInteractive_06 ; $62B6: $CD $C6 $64
call DecrementEntityIgnoreHitsCountdown ; $62B9: $CD $56 $0C
call label_3B70 ; $62BC: $CD $70 $3B
call func_006_641A ; $62BF: $CD $1A $64
call PushLinkOutOfEntity_06 ; $62BF: $CD $1A $64
ldh a, [hActiveEntityState] ; $62C2: $F0 $F0
JP_TABLE ; $62C4
._00 dw GiantGopongaState0Handler

2
src/code/entities/06_goponga_flower.asm
View File

@ -14,7 +14,7 @@ GopongaFlowerEntityHandler::
call ReturnIfNonInteractive_06 ; $6402: $CD $C6 $64
call DecrementEntityIgnoreHitsCountdown ; $6405: $CD $56 $0C
call label_3B70 ; $6408: $CD $70 $3B
call func_006_641A ; $640B: $CD $1A $64
call PushLinkOutOfEntity_06 ; $640B: $CD $1A $64
; Every 48 frame…
ldh a, [hFrameCounter] ; $640E: $F0 $E7

4
src/code/entities/06_grandpa_ulrira.asm
View File

@ -26,8 +26,8 @@ GrandpaUlriraEntityHandler::
rra ; $5C34: $1F
and $01 ; $5C35: $E6 $01
call SetEntitySpriteVariant ; $5C37: $CD $0C $3B
call func_006_641A ; $5C3A: $CD $1A $64
call func_006_645D ; $5C3D: $CD $5D $64
call PushLinkOutOfEntity_06 ; $5C3A: $CD $1A $64
call CheckLinkInteractionWithEntity_06 ; $5C3D: $CD $5D $64
ret nc ; $5C40: $D0
ld a, [wRichardSpokenFlag] ; $5C41: $FA $55 $DB

4
src/code/entities/06_kid_70_73.asm
View File

@ -23,9 +23,9 @@ Kid73EntityHandler::
func_006_6230::
ldh a, [hActiveEntityPosY] ; $6230: $F0 $EF
ldh [hActiveEntityVisualPosY], a ; $6232: $E0 $EC
call func_006_641A ; $6234: $CD $1A $64
call PushLinkOutOfEntity_06 ; $6234: $CD $1A $64
call CopyEntityPositionToActivePosition ; $6237: $CD $8A $3D
call func_006_645D ; $623A: $CD $5D $64
call CheckLinkInteractionWithEntity_06 ; $623A: $CD $5D $64
ret nc ; $623D: $D0
ld a, [wTradeSequenceItem] ; $623E: $FA $0E $DB

98
src/code/entities/06_kid_71_72.asm
View File

@ -43,7 +43,7 @@ Unknown019SpriteVariants::
db $7E, OAM_GBC_PAL_0 | OAMF_PAL0 | OAMF_XFLIP
db $7C, OAM_GBC_PAL_0 | OAMF_PAL0 | OAMF_XFLIP
Data_006_607D::
KidBallSprite::
db $3E, $00
Kid71EntityHandler::
@ -52,9 +52,9 @@ Kid72EntityHandler::
add hl, bc ; $6082: $09
ld a, [hl] ; $6083: $7E
and a ; $6084: $A7
jr z, .jr_60A2 ; $6085: $28 $1B
jr z, .notBall ; $6085: $28 $1B
ld de, Data_006_607D ; $6087: $11 $7D $60
ld de, KidBallSprite ; $6087: $11 $7D $60
call RenderActiveEntitySprite ; $608A: $CD $77 $3C
call ReturnIfNonInteractive_06 ; $608D: $CD $C6 $64
call UpdateEntityPosWithSpeed_06 ; $6090: $CD $41 $65
@ -67,39 +67,33 @@ Kid72EntityHandler::
ret ; $60A1: $C9
.jr_60A2
.notBall
ld a, [wIsBowWowFollowingLink] ; $60A2: $FA $56 $DB
cp BOW_WOW_KIDNAPPED ; $60A5: $FE $80
jp nz, label_006_6170 ; $60A7: $C2 $70 $61
jp nz, KidPlayingWithBall ; $60A7: $C2 $70 $61
ld a, [wGameplayType] ; $60AA: $FA $95 $DB
cp BOW_WOW_FOLLOWING ; $60AD: $FE $01
jp z, label_006_6170 ; $60AF: $CA $70 $61
cp GAMEPLAY_CREDITS ; $60AD: $FE $01
jp z, KidPlayingWithBall ; $60AF: $CA $70 $61
; Beyond this point is the BOW WOW kidnapped event.
ld de, Kid71SpriteVariants ; $60B2: $11 $4D $60
ld hl, wEntitiesTypeTable ; $60B5: $21 $A0 $C3
add hl, bc ; $60B8: $09
ld a, [hl] ; $60B9: $7E
cp ENTITY_KID_72 ; $60BA: $FE $72
jr nz, .render ; $60BC: $20 $03
ld de, Kid72SpriteVariants ; $60BE: $11 $5D $60
.render:
call RenderActiveEntitySpritesPair ; $60C1: $CD $C0 $3B
.jr_60C4
call func_006_65A4 ; $60C4: $CD $A4 $65
ld a, e ; $60C7: $7B
dec a ; $60C8: $3D
and $02 ; $60C9: $E6 $02
xor $02 ; $60CB: $EE $02
ld e, a ; $60CD: $5F
.jr_60CE
ldh a, [hFrameCounter] ; $60CE: $F0 $E7
.jr_60D0
rra ; $60D0: $1F
rra ; $60D1: $1F
rra ; $60D2: $1F
@ -110,29 +104,26 @@ Kid72EntityHandler::
add hl, bc ; $60DC: $09
ld a, [hl] ; $60DD: $7E
JP_TABLE ; $60DE
._00 dw func_006_60E5 ; $60DF
._01 dw func_006_60FD ; $60E1
._02 dw func_006_6134 ; $60E3
._00 dw KidBowwowKidnapState0 ; $60DF
._01 dw KidBowwowKidnapState1 ; $60E1
._02 dw KidBowwowKidnapState2 ; $60E3
func_006_60E5::
KidBowwowKidnapState0::
call ReturnIfNonInteractive_06 ; $60E5: $CD $C6 $64
ld hl, wEntitiesPrivateState2Table ; $60E8: $21 $C0 $C2
add hl, bc ; $60EB: $09
ld [hl], $30 ; $60EC: $36 $30
ld a, MUSIC_BOWWOW_KIDNAPPED ; $60EE: $3E $0E
.jr_60F0
ld [wMusicTrackToPlay], a ; $60F0: $EA $68 $D3
ldh [hDefaultMusicTrack], a ; $60F3: $E0 $B0
ldh [hDefaultMusicTrackAlt], a ; $60F5: $E0 $BD
label_006_60F7:
IncreasePrivateState3:
ld hl, wEntitiesPrivateState3Table ; $60F7: $21 $D0 $C2
add hl, bc ; $60FA: $09
inc [hl] ; $60FB: $34
ret ; $60FC: $C9
func_006_60FD::
KidBowwowKidnapState1::
call ReturnIfNonInteractive_06 ; $60FD: $CD $C6 $64
call func_006_65A4 ; $6100: $CD $A4 $65
add $20 ; $6103: $C6 $20
@ -142,7 +133,7 @@ func_006_60FD::
ld hl, wEntitiesPrivateState2Table ; $6109: $21 $C0 $C2
add hl, bc ; $610C: $09
dec [hl] ; $610D: $35
jr nz, jr_006_6124 ; $610E: $20 $14
jr nz, .moveTowardsLink ; $610E: $20 $14
.jr_6110
ld a, [wTransitionSequenceCounter] ; $6110: $FA $6B $C1
@ -152,13 +143,12 @@ func_006_60FD::
ldh a, [hActiveEntityType] ; $6116: $F0 $EB
cp ENTITY_KID_71 ; $6118: $FE $71
jr nz, .kid71End ; $611A: $20 $05
call_open_dialog Dialog220 ; $611C
.kid71End
jp label_006_60F7 ; $6121: $C3 $F7 $60
jp IncreasePrivateState3 ; $6121: $C3 $F7 $60
jr_006_6124:
.moveTowardsLink:
ld a, $08 ; $6124: $3E $08
call ApplyVectorTowardsLink_trampoline ; $6126: $CD $AA $3B
call UpdateEntityPosWithSpeed_06 ; $6129: $CD $41 $65
@ -167,19 +157,17 @@ jr_006_6124:
ld [wC167], a ; $6130: $EA $67 $C1
ret ; $6133: $C9
func_006_6134::
KidBowwowKidnapState2::
xor a ; $6134: $AF
ld [wC167], a ; $6135: $EA $67 $C1
ldh a, [hActiveEntityPosY] ; $6138: $F0 $EF
ldh [hActiveEntityVisualPosY], a ; $613A: $E0 $EC
call func_006_641A ; $613C: $CD $1A $64
call PushLinkOutOfEntity_06 ; $613C: $CD $1A $64
call CopyEntityPositionToActivePosition ; $613F: $CD $8A $3D
call func_006_645D ; $6142: $CD $5D $64
jr nc, .jr_614C ; $6145: $30 $05
call CheckLinkInteractionWithEntity_06 ; $6142: $CD $5D $64
jr nc, .noTalking ; $6145: $30 $05
call_open_dialog Dialog220 ; $6147
.jr_614C
.noTalking
call AddEntityZSpeedToPos_06 ; $614C: $CD $7A $65
ld hl, wEntitiesSpeedZTable ; $614F: $21 $20 $C3
add hl, bc ; $6152: $09
@ -192,7 +180,7 @@ func_006_6134::
jr z, .jr_6161 ; $615B: $28 $04
and $80 ; $615D: $E6 $80
jr z, ret_006_616F ; $615F: $28 $0E
jr z, .ret ; $615F: $28 $0E
.jr_6161
ld [hl], b ; $6161: $70
@ -201,14 +189,13 @@ func_006_6134::
ld [hl], b ; $6166: $70
ldh a, [hFrameCounter] ; $6167: $F0 $E7
and $1F ; $6169: $E6 $1F
jr nz, ret_006_616F ; $616B: $20 $02
jr nz, .ret ; $616B: $20 $02
; Make the kid jump.
ld [hl], $10 ; $616D: $36 $10
ret_006_616F:
.ret:
ret ; $616F: $C9
label_006_6170:
KidPlayingWithBall:
ld hl, wEntitiesDirectionTable ; $6170: $21 $80 $C3
add hl, bc ; $6173: $09
ldh a, [hActiveEntitySpriteVariant] ; $6174: $F0 $F1
@ -238,12 +225,12 @@ label_006_6170:
.jr_619F
ldh a, [hActiveEntityState] ; $619F: $F0 $F0
JP_TABLE ; $61A1
._00 dw func_006_61A6 ; $61A2
._01 dw func_006_61EC ; $61A4
._00 dw KidWithBallState0 ; $61A2
._01 dw KidWithBallState1 ; $61A4
func_006_61A6::
KidWithBallState0::
call GetEntityTransitionCountdown ; $61A6: $CD $05 $0C
jr nz, ret_006_61EB ; $61A9: $20 $40
jr nz, .ret ; $61A9: $20 $40
ld [hl], $80 ; $61AB: $36 $80
call IncrementEntityState ; $61AD: $CD $12 $3B
@ -251,8 +238,9 @@ func_006_61A6::
call SetEntitySpriteVariant ; $61B2: $CD $0C $3B
ld a, ENTITY_KID_71 ; $61B5: $3E $71
call SpawnNewEntity_trampoline ; $61B7: $CD $86 $3B
jr c, ret_006_61EB ; $61BA: $38 $2F
jr c, .ret ; $61BA: $38 $2F
; Created the ball entity, set the right properties
; to make it take the throwing arc from one kid to the other.
ldh a, [hMultiPurpose0] ; $61BC: $F0 $D7
ld hl, wEntitiesPosXTable ; $61BE: $21 $00 $C2
add hl, de ; $61C1: $19
@ -270,11 +258,9 @@ func_006_61A6::
ldh a, [hActiveEntityType] ; $61D6: $F0 $EB
cp ENTITY_KID_71 ; $61D8: $FE $71
ld a, $14 ; $61DA: $3E $14
jr z, .jr_61E0 ; $61DC: $28 $02
ld a, $EC ; $61DE: $3E $EC
.jr_61E0
jr z, .throwRight ; $61DC: $28 $02
ld a, -$14 ; $61DE: $3E $EC
.throwRight
ld hl, wEntitiesSpeedXTable ; $61E0: $21 $40 $C2
add hl, de ; $61E3: $19
ld [hl], a ; $61E4: $77
@ -282,10 +268,10 @@ func_006_61A6::
add hl, de ; $61E8: $19
ld [hl], $24 ; $61E9: $36 $24
ret_006_61EB:
.ret:
ret ; $61EB: $C9
func_006_61EC::
KidWithBallState1::
call GetEntityTransitionCountdown ; $61EC: $CD $05 $0C
jr nz, .jr_61F8 ; $61EF: $20 $07
@ -299,16 +285,16 @@ func_006_61EC::
ret nc ; $61FA: $D0
cp $40 ; $61FB: $FE $40
jr nc, .jr_620A ; $61FD: $30 $0B
jr nc, .noJump ; $61FD: $30 $0B
ldh a, [hMultiPurposeG] ; $61FF: $F0 $E8
and a ; $6201: $A7
jr z, .jr_620A ; $6202: $28 $06
jr z, .noJump ; $6202: $28 $06
ld hl, wEntitiesSpeedZTable ; $6204: $21 $20 $C3
add hl, bc ; $6207: $09
ld [hl], $08 ; $6208: $36 $08
.jr_620A
.noJump
xor a ; $620A: $AF
jp SetEntitySpriteVariant ; $620B: $C3 $0C $3B

4
src/code/entities/06_madam_meow_meow.asm
View File

@ -81,9 +81,9 @@ jr_006_5BC4:
call ReturnIfNonInteractive_06 ; $5BC4: $CD $C6 $64
ldh a, [hActiveEntityPosY] ; $5BC7: $F0 $EF
ldh [hActiveEntityVisualPosY], a ; $5BC9: $E0 $EC
call func_006_641A ; $5BCB: $CD $1A $64
call PushLinkOutOfEntity_06 ; $5BCB: $CD $1A $64
call CopyEntityPositionToActivePosition ; $5BCE: $CD $8A $3D
call func_006_645D ; $5BD1: $CD $5D $64
call CheckLinkInteractionWithEntity_06 ; $5BD1: $CD $5D $64
ret nc ; $5BD4: $D0
ld_dialog_low e, Dialog130 ; "My BowWow is so proud" ; $5BD5: $1E $30

2
src/code/entities/06_owl_event.asm
View File

@ -259,7 +259,7 @@ OwlState1Handler::
OwlState2Handler::
call ReturnIfNonInteractive_06 ; $6972: $CD $C6 $64
call func_006_641A ; $6975: $CD $1A $64
call PushLinkOutOfEntity_06 ; $6975: $CD $1A $64
ld a, [wTransitionSequenceCounter] ; $6978: $FA $6B $C1
cp $04 ; $697B: $FE $04
ret nz ; $697D: $C0

6
src/code/entities/06_richard.asm
View File

@ -48,7 +48,7 @@ RichardEntityHandler::
and a ; $4043: $A7
jr nz, .jr_4049 ; $4044: $20 $03
call func_006_641A ; $4046: $CD $1A $64
call PushLinkOutOfEntity_06 ; $4046: $CD $1A $64
.jr_4049
ldh a, [hActiveEntityState] ; $4049: $F0 $F0
@ -72,7 +72,7 @@ RichardState0Handler::
ret ; $4067: $C9
RichardState1Handler::
call func_006_645D ; $4068: $CD $5D $64
call CheckLinkInteractionWithEntity_06 ; $4068: $CD $5D $64
ret nc ; $406B: $D0
ld a, [wIsBowWowFollowingLink] ; $406C: $FA $56 $DB
@ -157,7 +157,7 @@ RichardState3Handler::
jp AddEntitySpeedToPos_06 ; $40E6: $C3 $4E $65
RichardState4Handler::
call func_006_645D ; $40E9: $CD $5D $64
call CheckLinkInteractionWithEntity_06 ; $40E9: $CD $5D $64
jr nc, jr_006_40FC ; $40EC: $30 $0E
ld a, [wGoldenLeavesCount] ; $40EE: $FA $15 $DB

2
src/code/entities/06_telephone.asm
View File

@ -11,7 +11,7 @@ TelephoneEntityHandler::
ld de, TelephoneSpriteVariants ; $6A82: $11 $78 $6A
call RenderActiveEntitySpritesPair ; $6A85: $CD $C0 $3B
call ReturnIfNonInteractive_06 ; $6A88: $CD $C6 $64
call func_006_645D ; $6A8B: $CD $5D $64
call CheckLinkInteractionWithEntity_06 ; $6A8B: $CD $5D $64
ret nc ; $6A8E: $D0
ld_dialog_low e, Dialog1FD ; $6A8F: $1E $FD

2
src/code/entities/06_yip_yip.asm
View File

@ -141,7 +141,7 @@ YipYipEntityHandler::
cp $02 ; $5A69: $FE $02
jr nc, jr_006_5A98 ; $5A6B: $30 $2B
call func_006_645D ; $5A6D: $CD $5D $64
call CheckLinkInteractionWithEntity_06 ; $5A6D: $CD $5D $64
jr nc, jr_006_5A98 ; $5A70: $30 $26
ld_dialog_low e, Dialog023 ; $5A72: $1E $23

4
src/code/entities/bank6.asm
View File

@ -33,7 +33,7 @@ include "code/entities/06_goponga_flower.asm"
;
; ----------------------------------------------------------------------
func_006_641A::
PushLinkOutOfEntity_06::
call CheckLinkCollisionWithEnemy_trampoline ; $641A: $CD $5A $3B
jr nc, ret_006_643C ; $641D: $30 $1D
@ -89,7 +89,7 @@ SetEntitySpriteVariantForDirection::
jp SetEntitySpriteVariant ; $645A: $C3 $0C $3B
; Should Link talk to Entity
func_006_645D::
CheckLinkInteractionWithEntity_06::
ld e, b ; $645D: $58
ldh a, [hActiveEntityType] ; $645E: $F0 $EB
cp ENTITY_GRANDPA_ULRIRA ; $6460: $FE $77