diff --git a/asm/armos.s b/asm/armos.s index faa79196..0f55d73d 100644 --- a/asm/armos.s +++ b/asm/armos.s @@ -46,7 +46,7 @@ sub_080301D4: @ 0x080301D4 cmp r0, #1 bne _080301EE ldr r1, [r4, #0x4c] - ldr r0, _08030238 @ =gLinkEntity + ldr r0, _08030238 @ =gPlayerEntity cmp r1, r0 bne _080301EE adds r1, r4, #0 @@ -89,7 +89,7 @@ _08030228: bl sub_0804AA30 pop {r4, r5, r6, pc} .align 2, 0 -_08030238: .4byte gLinkEntity +_08030238: .4byte gPlayerEntity _0803023C: .4byte gUnk_080CE124 thumb_func_start sub_08030240 @@ -942,7 +942,7 @@ sub_0803086C: @ 0x0803086C bne _08030880 b _0803099C _08030880: - ldr r0, _08030928 @ =gLinkState + ldr r0, _08030928 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -1003,7 +1003,7 @@ _0803088E: bl CheckPlayerInRegion cmp r0, #0 beq _0803098A - ldr r2, _08030934 @ =gLinkEntity + ldr r2, _08030934 @ =gPlayerEntity adds r2, #0x29 ldrb r1, [r2] movs r0, #8 @@ -1023,10 +1023,10 @@ _0803088E: movs r0, #1 b _0803099E .align 2, 0 -_08030928: .4byte gLinkState +_08030928: .4byte gPlayerState _0803092C: .4byte gRoomControls _08030930: .4byte 0x00004049 -_08030934: .4byte gLinkEntity +_08030934: .4byte gPlayerEntity _08030938: .4byte gScreenTransition _0803093C: ldr r0, _0803094C @ =0x00004022 diff --git a/asm/bakerOven.s b/asm/bakerOven.s index afb026d5..48b0511a 100644 --- a/asm/bakerOven.s +++ b/asm/bakerOven.s @@ -142,7 +142,7 @@ _0809CD56: ldrb r0, [r4, #0xf] cmp r0, #0 bne _0809CDAC - ldr r5, _0809CDB0 @ =gLinkEntity + ldr r5, _0809CDB0 @ =gPlayerEntity adds r6, r5, #0 adds r6, #0x3d movs r0, #0 @@ -182,7 +182,7 @@ _0809CD56: _0809CDAC: pop {r4, r5, r6, pc} .align 2, 0 -_0809CDB0: .4byte gLinkEntity +_0809CDB0: .4byte gPlayerEntity thumb_func_start sub_0809CDB4 sub_0809CDB4: @ 0x0809CDB4 diff --git a/asm/beanstalk.s b/asm/beanstalk.s index d2317249..d702554a 100644 --- a/asm/beanstalk.s +++ b/asm/beanstalk.s @@ -552,11 +552,11 @@ _0808A0F6: ble _0808A0FC b _0808A202 _0808A0FC: - ldr r0, _0808A118 @ =gLinkState + ldr r0, _0808A118 @ =gPlayerState ldrb r0, [r0, #0x12] cmp r0, #0x1e bne _0808A1DA - ldr r1, _0808A11C @ =gLinkEntity + ldr r1, _0808A11C @ =gPlayerEntity adds r0, r5, #0 movs r2, #0 movs r3, #8 @@ -565,8 +565,8 @@ _0808A0FC: beq _0808A1DC b _0808A1B0 .align 2, 0 -_0808A118: .4byte gLinkState -_0808A11C: .4byte gLinkEntity +_0808A118: .4byte gPlayerState +_0808A11C: .4byte gPlayerEntity _0808A120: ldrb r0, [r5, #0xe] cmp r0, #0 @@ -826,7 +826,7 @@ sub_0808A2F0: @ 0x0808A2F0 adds r1, #0x72 strh r0, [r1] _0808A316: - ldr r3, _0808A38C @ =gLinkEntity + ldr r3, _0808A38C @ =gPlayerEntity ldrb r1, [r3, #0x1b] lsrs r1, r1, #6 lsls r1, r1, #6 @@ -844,7 +844,7 @@ _0808A316: ands r0, r2 orrs r0, r1 strb r0, [r5, #0x19] - ldr r0, _0808A390 @ =gLinkState + ldr r0, _0808A390 @ =gPlayerState ldrb r0, [r0, #0x12] cmp r0, #0x1e bne _0808A39C @@ -884,8 +884,8 @@ _0808A316: bl SetTile b _0808A3EC .align 2, 0 -_0808A38C: .4byte gLinkEntity -_0808A390: .4byte gLinkState +_0808A38C: .4byte gPlayerEntity +_0808A390: .4byte gPlayerState _0808A394: .4byte 0x00004014 _0808A398: .4byte gRoomControls _0808A39C: diff --git a/asm/beetle.s b/asm/beetle.s index a5215475..9bdbd6d4 100644 --- a/asm/beetle.s +++ b/asm/beetle.s @@ -41,7 +41,7 @@ sub_08021780: @ 0x08021780 beq _080217F4 b _080217FA _08021792: - ldr r0, _080217A4 @ =gLinkState + ldr r0, _080217A4 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] cmp r0, #0x18 @@ -50,7 +50,7 @@ _08021792: bl sub_08021768 b _080217FA .align 2, 0 -_080217A4: .4byte gLinkState +_080217A4: .4byte gPlayerState _080217A8: movs r1, #0 movs r0, #5 @@ -71,7 +71,7 @@ _080217A8: movs r1, #3 orrs r0, r1 strb r0, [r2] - ldr r0, _080217EC @ =gLinkEntity + ldr r0, _080217EC @ =gPlayerEntity adds r1, r4, #0 bl CopyPositionAndSpriteOffset ldr r0, _080217F0 @ =0x0000FFFF @@ -85,7 +85,7 @@ _080217A8: bl InitializeAnimation b _080217FA .align 2, 0 -_080217EC: .4byte gLinkEntity +_080217EC: .4byte gPlayerEntity _080217F0: .4byte 0x0000FFFF _080217F4: adds r0, r4, #0 @@ -376,7 +376,7 @@ sub_08021A10: @ 0x08021A10 push {r4, lr} adds r4, r0, #0 bl GetNextFrame - ldr r1, _08021A60 @ =gLinkEntity + ldr r1, _08021A60 @ =gPlayerEntity adds r0, r4, #0 movs r2, #0x78 movs r3, #0x50 @@ -409,7 +409,7 @@ sub_08021A10: @ 0x08021A10 _08021A5E: pop {r4, pc} .align 2, 0 -_08021A60: .4byte gLinkEntity +_08021A60: .4byte gPlayerEntity thumb_func_start sub_08021A64 sub_08021A64: @ 0x08021A64 @@ -542,7 +542,7 @@ _08021B60: sub_08021B64: @ 0x08021B64 push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r0, _08021B88 @ =gLinkState + ldr r0, _08021B88 @ =gPlayerState ldr r1, [r0, #0x30] movs r2, #4 ands r1, r2 @@ -558,7 +558,7 @@ sub_08021B64: @ 0x08021B64 bl InitializeAnimation b _08021C4E .align 2, 0 -_08021B88: .4byte gLinkState +_08021B88: .4byte gPlayerState _08021B8C: movs r5, #1 adds r0, r6, #0 @@ -603,7 +603,7 @@ _08021BC8: adds r0, r4, #0 adds r0, #0x87 strb r5, [r0] - ldr r2, _08021BEC @ =gLinkEntity + ldr r2, _08021BEC @ =gPlayerEntity ldrb r1, [r2, #0x15] adds r0, r1, #0 cmp r0, #0xff @@ -611,7 +611,7 @@ _08021BC8: movs r0, #0x10 b _08021BF6 .align 2, 0 -_08021BEC: .4byte gLinkEntity +_08021BEC: .4byte gPlayerEntity _08021BF0: ldrb r0, [r2, #0x14] lsls r0, r0, #2 @@ -637,7 +637,7 @@ _08021C04: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - ldr r0, _08021C50 @ =gLinkEntity + ldr r0, _08021C50 @ =gPlayerEntity adds r1, r4, #0 bl CopyPositionAndSpriteOffset ldr r2, _08021C54 @ =gUnk_080CB5E4 @@ -662,7 +662,7 @@ _08021C04: _08021C4E: pop {r4, r5, r6, pc} .align 2, 0 -_08021C50: .4byte gLinkEntity +_08021C50: .4byte gPlayerEntity _08021C54: .4byte gUnk_080CB5E4 thumb_func_start sub_08021C58 diff --git a/asm/bigGoron.s b/asm/bigGoron.s index 1b89658f..9cba6a4a 100644 --- a/asm/bigGoron.s +++ b/asm/bigGoron.s @@ -1058,7 +1058,7 @@ sub_0806D7C4: @ 0x0806D7C4 sub sp, #4 adds r4, r0, #0 adds r5, r1, #0 - ldr r1, _0806D800 @ =gLinkEntity + ldr r1, _0806D800 @ =gPlayerEntity ldrh r0, [r1, #0x2e] movs r2, #0 strh r0, [r4, #0x2e] @@ -1084,7 +1084,7 @@ _0806D7FC: add sp, #4 pop {r4, r5, pc} .align 2, 0 -_0806D800: .4byte gLinkEntity +_0806D800: .4byte gPlayerEntity thumb_func_start sub_0806D804 sub_0806D804: @ 0x0806D804 @@ -1115,7 +1115,7 @@ sub_0806D804: @ 0x0806D804 ands r0, r1 strb r0, [r2] _0806D83A: - ldr r0, _0806D854 @ =gLinkEntity + ldr r0, _0806D854 @ =gPlayerEntity movs r1, #0x2e ldrsh r2, [r0, r1] movs r1, #0x32 @@ -1127,7 +1127,7 @@ _0806D83A: add sp, #4 pop {r4, r5, pc} .align 2, 0 -_0806D854: .4byte gLinkEntity +_0806D854: .4byte gPlayerEntity thumb_func_start sub_0806D858 sub_0806D858: @ 0x0806D858 diff --git a/asm/bigPushableLever.s b/asm/bigPushableLever.s index 5a6f2d72..3edb8811 100644 --- a/asm/bigPushableLever.s +++ b/asm/bigPushableLever.s @@ -73,7 +73,7 @@ sub_08098F14: @ 0x08098F14 bl sub_08079F8C cmp r0, #0 beq _08098F84 - ldr r2, _08098F88 @ =gLinkState + ldr r2, _08098F88 @ =gPlayerState movs r0, #0x98 strb r0, [r2, #6] movs r0, #5 @@ -82,7 +82,7 @@ sub_08098F14: @ 0x08098F14 movs r1, #1 orrs r0, r1 str r0, [r2, #0x30] - ldr r1, _08098F8C @ =gLinkEntity + ldr r1, _08098F8C @ =gPlayerEntity strh r6, [r1, #0x2c] strh r6, [r1, #0x30] ldrb r0, [r1, #0x14] @@ -91,8 +91,8 @@ sub_08098F14: @ 0x08098F14 _08098F84: pop {r4, r5, r6, pc} .align 2, 0 -_08098F88: .4byte gLinkState -_08098F8C: .4byte gLinkEntity +_08098F88: .4byte gPlayerState +_08098F8C: .4byte gPlayerEntity thumb_func_start sub_08098F90 sub_08098F90: @ 0x08098F90 diff --git a/asm/bigVortex.s b/asm/bigVortex.s index 3d1d3a1b..a60b28ea 100644 --- a/asm/bigVortex.s +++ b/asm/bigVortex.s @@ -123,7 +123,7 @@ _08098DC2: sub_08098DC4: @ 0x08098DC4 push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r6, _08098E2C @ =gLinkEntity + ldr r6, _08098E2C @ =gPlayerEntity adds r1, r6, #0 movs r2, #8 movs r3, #8 @@ -144,7 +144,7 @@ sub_08098DC4: @ 0x08098DC4 adds r0, r5, #0 adds r1, r6, #0 bl ResolveEntityOnTop - ldr r1, _08098E30 @ =gLinkState + ldr r1, _08098E30 @ =gPlayerState movs r0, #0x1f strb r0, [r1, #0xc] adds r0, r1, #0 @@ -168,8 +168,8 @@ _08098E24: bl UpdateAnimationSingleFrame pop {r4, r5, r6, pc} .align 2, 0 -_08098E2C: .4byte gLinkEntity -_08098E30: .4byte gLinkState +_08098E2C: .4byte gPlayerEntity +_08098E30: .4byte gPlayerState thumb_func_start sub_08098E34 sub_08098E34: @ 0x08098E34 diff --git a/asm/bird.s b/asm/bird.s index 3e5549cb..dae30ccc 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -277,7 +277,7 @@ sub_0809D10C: @ 0x0809D10C sub_0809D130: @ 0x0809D130 push {lr} adds r2, r0, #0 - ldr r0, _0809D148 @ =gLinkState + ldr r0, _0809D148 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -287,7 +287,7 @@ sub_0809D130: @ 0x0809D130 bl sub_0800445C b _0809D170 .align 2, 0 -_0809D148: .4byte gLinkState +_0809D148: .4byte gPlayerState _0809D14C: adds r0, r2, #0 bl sub_08017850 @@ -384,7 +384,7 @@ sub_0809D1F0: @ 0x0809D1F0 cmp r0, #1 beq _0809D2B0 bl sub_08078B48 - ldr r2, _0809D220 @ =gLinkEntity + ldr r2, _0809D220 @ =gPlayerEntity ldrb r1, [r2, #0x18] movs r0, #4 rsbs r0, r0, #0 @@ -395,7 +395,7 @@ sub_0809D1F0: @ 0x0809D1F0 mov r8, r1 b _0809D3A8 .align 2, 0 -_0809D220: .4byte gLinkEntity +_0809D220: .4byte gPlayerEntity _0809D224: ldrb r1, [r5, #0xe] cmp r1, #0 @@ -440,7 +440,7 @@ _0809D234: ldr r0, _0809D2A4 @ =gRoomControls ldrh r0, [r0, #0xa] strh r0, [r5, #0x2e] - ldr r0, _0809D2A8 @ =gLinkEntity + ldr r0, _0809D2A8 @ =gPlayerEntity ldrh r0, [r0, #0x32] strh r0, [r5, #0x32] mov r3, sb @@ -460,10 +460,10 @@ _0809D234: .align 2, 0 _0809D2A0: .4byte 0xFFEC0000 _0809D2A4: .4byte gRoomControls -_0809D2A8: .4byte gLinkEntity +_0809D2A8: .4byte gPlayerEntity _0809D2AC: .4byte 0x00000123 _0809D2B0: - ldr r6, _0809D430 @ =gLinkEntity + ldr r6, _0809D430 @ =gPlayerEntity adds r0, r6, #0 adds r0, #0x38 ldrb r1, [r0] @@ -504,7 +504,7 @@ _0809D2D6: beq _0809D3A8 cmp r0, #9 beq _0809D3A8 - ldr r7, _0809D438 @ =gLinkState + ldr r7, _0809D438 @ =gPlayerState adds r0, r7, #0 adds r0, #0xa8 ldrb r0, [r0] @@ -594,7 +594,7 @@ _0809D3A8: ldr r4, [r5, #0x54] cmp r4, #0 beq _0809D454 - ldr r2, _0809D430 @ =gLinkEntity + ldr r2, _0809D430 @ =gPlayerEntity movs r3, #0x2e ldrsh r1, [r2, r3] movs r3, #0x2e @@ -647,9 +647,9 @@ _0809D3DA: strb r1, [r4, #0x1b] b _0809D454 .align 2, 0 -_0809D430: .4byte gLinkEntity +_0809D430: .4byte gPlayerEntity _0809D434: .4byte gTextBox -_0809D438: .4byte gLinkState +_0809D438: .4byte gPlayerState _0809D43C: .4byte gUnk_03003DC0 _0809D440: .4byte gUnk_02034490 _0809D444: .4byte 0xFFF80000 @@ -751,7 +751,7 @@ sub_0809D498: @ 0x0809D498 ldr r0, _0809D53C @ =gRoomControls ldrh r0, [r0, #0xa] strh r0, [r5, #0x2e] - ldr r0, _0809D540 @ =gLinkEntity + ldr r0, _0809D540 @ =gPlayerEntity ldrh r0, [r0, #0x32] strh r0, [r5, #0x32] ldr r0, _0809D544 @ =0x00000123 @@ -773,14 +773,14 @@ sub_0809D498: @ 0x0809D498 _0809D534: .4byte 0xFFFD8000 _0809D538: .4byte 0xFFB4C000 _0809D53C: .4byte gRoomControls -_0809D540: .4byte gLinkEntity +_0809D540: .4byte gPlayerEntity _0809D544: .4byte 0x00000123 _0809D548: adds r7, r5, #0 adds r7, #0x68 cmp r0, #1 bne _0809D62E - ldr r6, _0809D658 @ =gLinkEntity + ldr r6, _0809D658 @ =gPlayerEntity ldrb r1, [r6, #0x18] movs r0, #4 rsbs r0, r0, #0 @@ -904,7 +904,7 @@ _0809D652: mov r8, r3 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0809D658: .4byte gLinkEntity +_0809D658: .4byte gPlayerEntity _0809D65C: .4byte 0xFFF80000 _0809D660: .4byte gRoomControls _0809D664: .4byte gUnk_02034490 @@ -914,7 +914,7 @@ _0809D668: .4byte gUnk_0800B0AC sub_0809D66C: @ 0x0809D66C push {r4, lr} adds r4, r0, #0 - ldr r0, _0809D694 @ =gLinkEntity + ldr r0, _0809D694 @ =gPlayerEntity ldrb r1, [r0, #0x1a] lsls r1, r1, #0x1c lsrs r1, r1, #0x1c @@ -933,7 +933,7 @@ sub_0809D66C: @ 0x0809D66C beq _0809D6A2 b _0809D6FE .align 2, 0 -_0809D694: .4byte gLinkEntity +_0809D694: .4byte gPlayerEntity _0809D698: cmp r0, #2 beq _0809D6F4 diff --git a/asm/bobomb.s b/asm/bobomb.s index 91e41cd7..13cc7b13 100644 --- a/asm/bobomb.s +++ b/asm/bobomb.s @@ -86,13 +86,13 @@ _0802C70C: adds r1, #0x42 movs r0, #0 strb r0, [r1] - ldr r0, _0802C728 @ =gLinkEntity + ldr r0, _0802C728 @ =gPlayerEntity adds r0, #0x42 movs r1, #4 strb r1, [r0] b _0802C7A6 .align 2, 0 -_0802C728: .4byte gLinkEntity +_0802C728: .4byte gPlayerEntity _0802C72C: movs r1, #0 movs r0, #3 @@ -258,7 +258,7 @@ sub_0802C83C: @ 0x0802C83C bne _0802C884 movs r0, #3 strb r0, [r4, #0xc] - ldr r0, _0802C86C @ =gLinkEntity + ldr r0, _0802C86C @ =gPlayerEntity ldrb r0, [r0, #0x14] movs r1, #6 ands r1, r0 @@ -268,7 +268,7 @@ sub_0802C83C: @ 0x0802C83C beq _0802C876 b _0802C87C .align 2, 0 -_0802C86C: .4byte gLinkEntity +_0802C86C: .4byte gPlayerEntity _0802C870: ldrh r0, [r4, #0x2e] subs r0, #6 @@ -495,7 +495,7 @@ sub_0802C9D0: @ 0x0802C9D0 sub_0802CA10: @ 0x0802CA10 push {r4, lr} adds r4, r0, #0 - ldr r0, _0802CA30 @ =gLinkState + ldr r0, _0802CA30 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #5 beq _0802CA42 @@ -509,7 +509,7 @@ sub_0802CA10: @ 0x0802CA10 bl sub_0802CBC4 b _0802CA66 .align 2, 0 -_0802CA30: .4byte gLinkState +_0802CA30: .4byte gPlayerState _0802CA34: adds r0, r4, #0 bl sub_0802CC18 @@ -521,7 +521,7 @@ _0802CA42: adds r1, #0x83 movs r0, #2 strb r0, [r1] - ldr r0, _0802CA68 @ =gLinkEntity + ldr r0, _0802CA68 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsls r0, r0, #2 movs r1, #4 @@ -536,7 +536,7 @@ _0802CA42: _0802CA66: pop {r4, pc} .align 2, 0 -_0802CA68: .4byte gLinkEntity +_0802CA68: .4byte gPlayerEntity thumb_func_start sub_0802CA6C sub_0802CA6C: @ 0x0802CA6C @@ -594,7 +594,7 @@ sub_0802CA94: @ 0x0802CA94 strb r0, [r1] subs r1, #2 strb r0, [r1] - ldr r0, _0802CAF4 @ =gLinkEntity + ldr r0, _0802CAF4 @ =gPlayerEntity ldrb r1, [r0, #0x14] lsls r1, r1, #2 movs r0, #4 @@ -609,7 +609,7 @@ sub_0802CA94: @ 0x0802CA94 bl InitializeAnimation pop {pc} .align 2, 0 -_0802CAF4: .4byte gLinkEntity +_0802CAF4: .4byte gPlayerEntity thumb_func_start sub_0802CAF8 sub_0802CAF8: @ 0x0802CAF8 diff --git a/asm/bombPeahat.s b/asm/bombPeahat.s index 86b5a143..cb6928ae 100644 --- a/asm/bombPeahat.s +++ b/asm/bombPeahat.s @@ -1110,7 +1110,7 @@ _0802B10E: ldrb r0, [r4, #0xd] cmp r0, #1 bne _0802B12E - ldr r0, _0802B188 @ =gLinkState + ldr r0, _0802B188 @ =gPlayerState strb r1, [r0, #5] _0802B12E: adds r0, r4, #0 @@ -1157,7 +1157,7 @@ _0802B16C: strb r0, [r1] b _0802B19E .align 2, 0 -_0802B188: .4byte gLinkState +_0802B188: .4byte gPlayerState _0802B18C: .4byte gUnk_080CD17C _0802B190: adds r0, r4, #0 diff --git a/asm/book.s b/asm/book.s index 07893253..992ba2c0 100644 --- a/asm/book.s +++ b/asm/book.s @@ -174,7 +174,7 @@ _0809B4C0: strh r0, [r4, #0x24] movs r0, #0x10 strb r0, [r4, #0x15] - ldr r2, _0809B510 @ =gLinkState + ldr r2, _0809B510 @ =gPlayerState movs r0, #0x9e strb r0, [r2, #6] movs r0, #5 @@ -183,7 +183,7 @@ _0809B4C0: movs r1, #1 orrs r0, r1 str r0, [r2, #0x30] - ldr r1, _0809B514 @ =gLinkEntity + ldr r1, _0809B514 @ =gPlayerEntity strh r3, [r1, #0x2c] strh r3, [r1, #0x30] ldrb r0, [r1, #0x14] @@ -193,8 +193,8 @@ _0809B4C0: bl sub_08004488 b _0809B520 .align 2, 0 -_0809B510: .4byte gLinkState -_0809B514: .4byte gLinkEntity +_0809B510: .4byte gPlayerState +_0809B514: .4byte gPlayerEntity _0809B518: .4byte 0x0000010F _0809B51C: movs r0, #0x16 @@ -283,7 +283,7 @@ _0809B5B0: sub_0809B5B4: @ 0x0809B5B4 push {r4, lr} adds r4, r0, #0 - ldr r0, _0809B5CC @ =gLinkState + ldr r0, _0809B5CC @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -293,7 +293,7 @@ sub_0809B5B4: @ 0x0809B5B4 bl sub_0800445C b _0809B5EA .align 2, 0 -_0809B5CC: .4byte gLinkState +_0809B5CC: .4byte gPlayerState _0809B5D0: adds r0, r4, #0 bl sub_08017850 @@ -396,14 +396,14 @@ _0809B684: .4byte gTextBox thumb_func_start sub_0809B688 sub_0809B688: @ 0x0809B688 push {lr} - ldr r1, _0809B6A8 @ =gLinkEntity + ldr r1, _0809B6A8 @ =gPlayerEntity movs r2, #6 movs r3, #0xc bl sub_080041A0 adds r1, r0, #0 cmp r1, #1 bne _0809B6A4 - ldr r0, _0809B6AC @ =gLinkState + ldr r0, _0809B6AC @ =gPlayerState ldrb r0, [r0, #0xd] cmp r0, #0x10 beq _0809B6A4 @@ -412,8 +412,8 @@ _0809B6A4: adds r0, r1, #0 pop {pc} .align 2, 0 -_0809B6A8: .4byte gLinkEntity -_0809B6AC: .4byte gLinkState +_0809B6A8: .4byte gPlayerEntity +_0809B6AC: .4byte gPlayerState thumb_func_start sub_0809B6B0 sub_0809B6B0: @ 0x0809B6B0 diff --git a/asm/bossDoor.s b/asm/bossDoor.s index 11ecdf34..50bdfbad 100644 --- a/asm/bossDoor.s +++ b/asm/bossDoor.s @@ -235,7 +235,7 @@ sub_0808C384: @ 0x0808C384 movs r1, #0 movs r2, #1 bl sub_08078AC0 - ldr r1, _0808C3B8 @ =gLinkEntity + ldr r1, _0808C3B8 @ =gPlayerEntity ldrb r0, [r4, #0xa] lsls r0, r0, #3 strb r0, [r1, #0x15] @@ -244,7 +244,7 @@ _0808C3B0: _0808C3B4: pop {r4, pc} .align 2, 0 -_0808C3B8: .4byte gLinkEntity +_0808C3B8: .4byte gPlayerEntity thumb_func_start sub_0808C3BC sub_0808C3BC: @ 0x0808C3BC diff --git a/asm/bowUse.s b/asm/bowUse.s index 13219953..e6079a26 100644 --- a/asm/bowUse.s +++ b/asm/bowUse.s @@ -104,7 +104,7 @@ _0801921A: ands r1, r3 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _0801928C @ =gLinkEntity + ldr r1, _0801928C @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] movs r2, #0x80 @@ -141,7 +141,7 @@ _0801921A: b _080192A2 .align 2, 0 _08019288: .4byte gRoomControls -_0801928C: .4byte gLinkEntity +_0801928C: .4byte gPlayerEntity _08019290: .4byte gUnk_08003E44 _08019294: adds r0, r4, #0 @@ -238,7 +238,7 @@ _08019336: strb r0, [r4, #0x18] b _08019402 _0801934A: - ldr r1, _0801938C @ =gLinkState + ldr r1, _0801938C @ =gPlayerState ldr r0, [r1, #0x2c] cmp r0, r4 bne _0801935E @@ -259,7 +259,7 @@ _08019368: ldrb r0, [r0] cmp r0, #0xa bne _08019398 - ldr r0, _0801938C @ =gLinkState + ldr r0, _0801938C @ =gPlayerState adds r2, r0, #0 adds r2, #0x21 ldrb r0, [r2] @@ -272,7 +272,7 @@ _08019368: strb r0, [r2] b _08019398 .align 2, 0 -_0801938C: .4byte gLinkState +_0801938C: .4byte gPlayerState _08019390: adds r1, r4, #0 adds r1, #0x40 @@ -285,7 +285,7 @@ _08019398: ldrb r1, [r4, #0x1e] ldr r2, [r4, #0x78] subs r1, r1, r2 - ldr r0, _08019408 @ =gLinkEntity + ldr r0, _08019408 @ =gPlayerEntity ldrb r0, [r0, #0x1e] cmp r1, r0 beq _080193C2 @@ -301,7 +301,7 @@ _080193B8: adds r0, r4, #0 bl sub_080042D0 _080193C2: - ldr r0, _08019408 @ =gLinkEntity + ldr r0, _08019408 @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] movs r0, #1 @@ -319,7 +319,7 @@ _080193C2: bl CreatePlayerItem cmp r0, #0 beq _080193FA - ldr r2, _0801940C @ =gLinkState + ldr r2, _0801940C @ =gPlayerState ldrb r1, [r2, #4] movs r0, #0x80 orrs r0, r1 @@ -328,12 +328,12 @@ _080193C2: rsbs r0, r0, #0 bl ModArrows _080193FA: - ldr r1, _08019408 @ =gLinkEntity + ldr r1, _08019408 @ =gPlayerEntity adds r0, r4, #0 bl sub_08078E84 _08019402: pop {r4, r5, r6, r7, pc} .align 2, 0 _08019404: .4byte gUnk_02002A40 -_08019408: .4byte gLinkEntity -_0801940C: .4byte gLinkState \ No newline at end of file +_08019408: .4byte gPlayerEntity +_0801940C: .4byte gPlayerState \ No newline at end of file diff --git a/asm/brocco.s b/asm/brocco.s index 34dc7917..4473f3c9 100644 --- a/asm/brocco.s +++ b/asm/brocco.s @@ -192,7 +192,7 @@ _08063662: adds r1, r4, #0 adds r1, #0x69 strb r0, [r1] - ldr r1, _080636A0 @ =gLinkEntity + ldr r1, _080636A0 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -204,7 +204,7 @@ _08063662: bl sub_0806F118 b _080636D4 .align 2, 0 -_080636A0: .4byte gLinkEntity +_080636A0: .4byte gPlayerEntity _080636A4: adds r0, r4, #0 movs r1, #0 diff --git a/asm/businessScrub.s b/asm/businessScrub.s index 1a681b03..130660f9 100644 --- a/asm/businessScrub.s +++ b/asm/businessScrub.s @@ -631,7 +631,7 @@ _08028DE4: .4byte 0x00002903 sub_08028DE8: @ 0x08028DE8 push {r4, lr} adds r4, r0, #0 - ldr r0, _08028E08 @ =gLinkEntity + ldr r0, _08028E08 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #8 bne _08028E0C @@ -645,7 +645,7 @@ sub_08028DE8: @ 0x08028DE8 strb r0, [r4] b _08028E3A .align 2, 0 -_08028E08: .4byte gLinkEntity +_08028E08: .4byte gPlayerEntity _08028E0C: ldr r0, _08028E3C @ =0x00002902 bl TextboxNoOverlapFollow diff --git a/asm/businessScrubPrologue.s b/asm/businessScrubPrologue.s index 4cfb8803..b307d3c5 100644 --- a/asm/businessScrubPrologue.s +++ b/asm/businessScrubPrologue.s @@ -80,7 +80,7 @@ sub_08045BC8: @ 0x08045BC8 subs r0, #8 strh r0, [r1, #0x36] _08045C16: - ldr r0, _08045C30 @ =gLinkState + ldr r0, _08045C30 @ =gPlayerState adds r0, #0x27 movs r1, #0xff strb r1, [r0] @@ -92,7 +92,7 @@ _08045C16: _08045C2C: pop {r4, pc} .align 2, 0 -_08045C30: .4byte gLinkState +_08045C30: .4byte gPlayerState _08045C34: .4byte 0x000001BB thumb_func_start nullsub_174 @@ -341,7 +341,7 @@ _08045E12: sub_08045E14: @ 0x08045E14 push {r4, lr} adds r4, r0, #0 - ldr r0, _08045E2C @ =gLinkState + ldr r0, _08045E2C @ =gPlayerState adds r0, #0x27 movs r1, #0xff strb r1, [r0] @@ -352,7 +352,7 @@ sub_08045E14: @ 0x08045E14 beq _08045E70 b _08045EBA .align 2, 0 -_08045E2C: .4byte gLinkState +_08045E2C: .4byte gPlayerState _08045E30: ldrb r0, [r4, #0xe] cmp r0, #0 @@ -667,7 +667,7 @@ _08046074: .4byte gUnk_080D1A3E sub_08046078: @ 0x08046078 push {r4, r5, r6, r7, lr} adds r7, r0, #0 - ldr r0, _08046114 @ =gLinkState + ldr r0, _08046114 @ =gPlayerState adds r0, #0x27 movs r1, #0 strb r1, [r0] @@ -737,7 +737,7 @@ _0804610C: bl sub_0804AA1C pop {r4, r5, r6, r7, pc} .align 2, 0 -_08046114: .4byte gLinkState +_08046114: .4byte gPlayerState _08046118: .4byte gUnk_080D1A4E _0804611C: .4byte gRoomControls _08046120: .4byte 0x000007A2 diff --git a/asm/button.s b/asm/button.s index 7271ac7c..044a9d1a 100644 --- a/asm/button.s +++ b/asm/button.s @@ -172,7 +172,7 @@ sub_08081BE0: @ 0x08081BE0 strb r0, [r4, #0xc] movs r0, #1 strb r0, [r4, #0xf] - ldr r1, _08081C1C @ =gLinkState + ldr r1, _08081C1C @ =gPlayerState ldrb r0, [r1, #5] cmp r0, #2 beq _08081C16 @@ -188,7 +188,7 @@ _08081C16: strb r0, [r4, #0xe] b _08081C2C .align 2, 0 -_08081C1C: .4byte gLinkState +_08081C1C: .4byte gPlayerState _08081C20: movs r0, #8 strb r0, [r4, #0xe] @@ -389,19 +389,19 @@ _08081D8E: bl sub_08081E0C cmp r0, #0 beq _08081DB4 - ldr r0, _08081DAC @ =gLinkState + ldr r0, _08081DAC @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x90 ands r0, r1 cmp r0, #0 bne _08081E06 - ldr r6, _08081DB0 @ =gLinkEntity + ldr r6, _08081DB0 @ =gPlayerEntity b _08081E06 .align 2, 0 -_08081DAC: .4byte gLinkState -_08081DB0: .4byte gLinkEntity +_08081DAC: .4byte gPlayerState +_08081DB0: .4byte gPlayerEntity _08081DB4: - ldr r0, _08081DD8 @ =gLinkState + ldr r0, _08081DD8 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #0xf @@ -419,7 +419,7 @@ _08081DB4: ldr r6, [r5] b _08081E06 .align 2, 0 -_08081DD8: .4byte gLinkState +_08081DD8: .4byte gPlayerState _08081DDC: .4byte gUnk_03004040 _08081DE0: ldr r1, [r5, #4] @@ -450,7 +450,7 @@ _08081E0A: sub_08081E0C: @ 0x08081E0C push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08081E28 @ =gLinkEntity + ldr r5, _08081E28 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r5, r1] cmp r0, #0 @@ -462,7 +462,7 @@ _08081E22: movs r0, #0 b _08081E38 .align 2, 0 -_08081E28: .4byte gLinkEntity +_08081E28: .4byte gPlayerEntity _08081E2C: adds r0, r4, #0 adds r1, r5, #0 @@ -711,7 +711,7 @@ sub_08081FF8: @ 0x08081FF8 push {r4, r5, r6, lr} adds r4, r0, #0 ldr r1, [r4, #0x54] - ldr r0, _08082038 @ =gLinkEntity + ldr r0, _08082038 @ =gPlayerEntity cmp r1, r0 bne _08082036 adds r0, r1, #0 @@ -741,5 +741,5 @@ _0808202E: _08082036: pop {r4, r5, r6, pc} .align 2, 0 -_08082038: .4byte gLinkEntity +_08082038: .4byte gPlayerEntity _0808203C: .4byte gUnk_03004040 diff --git a/asm/castleMaid.s b/asm/castleMaid.s index 20c03bd5..4eaebcec 100644 --- a/asm/castleMaid.s +++ b/asm/castleMaid.s @@ -142,7 +142,7 @@ _080645EA: movs r1, #0 strb r0, [r4, #0xc] strb r1, [r2] - ldr r1, _08064628 @ =gLinkEntity + ldr r1, _08064628 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -155,7 +155,7 @@ _080645EA: bl _call_via_r0 b _0806463C .align 2, 0 -_08064628: .4byte gLinkEntity +_08064628: .4byte gPlayerEntity _0806462C: ldr r0, _08064640 @ =gTextBox ldrb r1, [r0] diff --git a/asm/cat.s b/asm/cat.s index 6d94d261..2b3282f7 100644 --- a/asm/cat.s +++ b/asm/cat.s @@ -37,7 +37,7 @@ sub_080677EC: @ 0x080677EC adds r1, #0x2e movs r0, #0xff strb r0, [r1] - ldr r0, _0806783C @ =gLinkEntity + ldr r0, _0806783C @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r4, r2] movs r2, #0x2e @@ -49,7 +49,7 @@ sub_080677EC: @ 0x080677EC orrs r0, r1 b _08067848 .align 2, 0 -_0806783C: .4byte gLinkEntity +_0806783C: .4byte gPlayerEntity _08067840: ldrb r1, [r4, #0x18] movs r0, #0x41 @@ -500,7 +500,7 @@ sub_08067B80: @ 0x08067B80 bl InitAnimationForceUpdate adds r0, r5, #0 bl sub_08067DDC - ldr r0, _08067BC4 @ =gLinkEntity + ldr r0, _08067BC4 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r5, r2] movs r2, #0x2e @@ -512,7 +512,7 @@ sub_08067B80: @ 0x08067B80 orrs r0, r1 b _08067BD0 .align 2, 0 -_08067BC4: .4byte gLinkEntity +_08067BC4: .4byte gPlayerEntity _08067BC8: ldrb r1, [r5, #0x18] movs r0, #0x41 @@ -533,7 +533,7 @@ sub_08067BD4: @ 0x08067BD4 movs r1, #0x2e ldrsh r0, [r2, r1] subs r0, #4 - ldr r1, _08067BF8 @ =gLinkEntity + ldr r1, _08067BF8 @ =gPlayerEntity movs r4, #0x2e ldrsh r1, [r1, r4] cmp r0, r1 @@ -543,12 +543,12 @@ sub_08067BD4: @ 0x08067BD4 ands r0, r3 b _08067C10 .align 2, 0 -_08067BF8: .4byte gLinkEntity +_08067BF8: .4byte gPlayerEntity _08067BFC: movs r1, #0x2e ldrsh r0, [r2, r1] adds r0, #4 - ldr r1, _08067C14 @ =gLinkEntity + ldr r1, _08067C14 @ =gPlayerEntity movs r4, #0x2e ldrsh r1, [r1, r4] cmp r0, r1 @@ -560,7 +560,7 @@ _08067C10: _08067C12: pop {r4, pc} .align 2, 0 -_08067C14: .4byte gLinkEntity +_08067C14: .4byte gPlayerEntity thumb_func_start sub_08067C18 sub_08067C18: @ 0x08067C18 @@ -591,7 +591,7 @@ sub_08067C24: @ 0x08067C24 sub_08067C44: @ 0x08067C44 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08067C6C @ =gLinkState + ldr r0, _08067C6C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -608,7 +608,7 @@ sub_08067C44: @ 0x08067C44 bl sub_08078778 b _08067C7C .align 2, 0 -_08067C6C: .4byte gLinkState +_08067C6C: .4byte gPlayerState _08067C70: adds r0, r4, #0 adds r0, #0x68 @@ -625,7 +625,7 @@ _08067C7C: adds r5, r0, #0 cmp r1, #0 beq _08067D1C - ldr r1, _08067CB4 @ =gLinkEntity + ldr r1, _08067CB4 @ =gPlayerEntity adds r0, r4, #0 bl sub_0806FCA0 adds r2, r0, #0 @@ -644,7 +644,7 @@ _08067CA6: bl InitAnimationForceUpdate b _08067CEC .align 2, 0 -_08067CB4: .4byte gLinkEntity +_08067CB4: .4byte gPlayerEntity _08067CB8: cmp r2, #1 bne _08067CC4 diff --git a/asm/cellOverwriteSet.s b/asm/cellOverwriteSet.s index 9910455d..58b0c171 100644 --- a/asm/cellOverwriteSet.s +++ b/asm/cellOverwriteSet.s @@ -14,7 +14,7 @@ CellOverwriteSet: @ 0x0801BEF8 mov r5, r8 push {r5, r6, r7} mov r8, r0 - ldr r7, _0801BFF0 @ =gLinkEntity + ldr r7, _0801BFF0 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0 bne _0801BF62 @@ -61,7 +61,7 @@ CellOverwriteSet: @ 0x0801BEF8 adds r0, #1 strb r0, [r1, #0xc] _0801BF62: - ldr r2, _0801BFFC @ =gLinkState + ldr r2, _0801BFFC @ =gPlayerState mov sb, r2 ldrb r1, [r2, #0x1a] movs r0, #0x80 @@ -133,10 +133,10 @@ _0801BFDA: strb r0, [r1] b _0801C0D4 .align 2, 0 -_0801BFF0: .4byte gLinkEntity +_0801BFF0: .4byte gPlayerEntity _0801BFF4: .4byte gUnk_080B7B6C _0801BFF8: .4byte gRoomControls -_0801BFFC: .4byte gLinkState +_0801BFFC: .4byte gPlayerState _0801C000: .4byte gUnk_03000FF0 _0801C004: ldrh r2, [r6, #2] diff --git a/asm/chestSpawner.s b/asm/chestSpawner.s index bed7ffa9..2d5c6661 100644 --- a/asm/chestSpawner.s +++ b/asm/chestSpawner.s @@ -158,7 +158,7 @@ sub_08083F14: @ 0x08083F14 .align 2, 0 _08083F74: .4byte gScreen _08083F78: - ldr r5, _08083FA0 @ =gLinkEntity + ldr r5, _08083FA0 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 movs r2, #0x10 @@ -177,12 +177,12 @@ _08083F98: strb r0, [r4, #0xd] b _08083FE6 .align 2, 0 -_08083FA0: .4byte gLinkEntity +_08083FA0: .4byte gPlayerEntity _08083FA4: ldrb r0, [r4, #0xa] cmp r0, #5 beq _08083FB2 - ldr r0, _08083FC8 @ =gLinkEntity + ldr r0, _08083FC8 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #1 bne _08083FE6 @@ -198,7 +198,7 @@ _08083FB2: bl PlaySFX b _08083FE6 .align 2, 0 -_08083FC8: .4byte gLinkEntity +_08083FC8: .4byte gPlayerEntity _08083FCC: ldr r1, _08083FE8 @ =gUnk_02034490 movs r0, #0 diff --git a/asm/chuchuBoss.s b/asm/chuchuBoss.s index 8544335a..0ad8aaca 100644 --- a/asm/chuchuBoss.s +++ b/asm/chuchuBoss.s @@ -584,14 +584,14 @@ _080260EA: cmp r0, #0xff bne _08026106 ldr r1, _08026108 @ =gRoomControls - ldr r0, _0802610C @ =gLinkEntity + ldr r0, _0802610C @ =gPlayerEntity str r0, [r1, #0x30] bl DeleteThisEntity _08026106: pop {r4, pc} .align 2, 0 _08026108: .4byte gRoomControls -_0802610C: .4byte gLinkEntity +_0802610C: .4byte gPlayerEntity thumb_func_start sub_08026110 sub_08026110: @ 0x08026110 @@ -791,7 +791,7 @@ sub_0802626C: @ 0x0802626C adds r1, r1, r2 ldr r1, [r1] bl _call_via_r1 - ldr r0, _080262A4 @ =gLinkEntity + ldr r0, _080262A4 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0x17 beq _08026298 @@ -803,7 +803,7 @@ _08026298: .align 2, 0 _0802629C: .4byte gUnk_02034490 _080262A0: .4byte gUnk_080CC20C -_080262A4: .4byte gLinkEntity +_080262A4: .4byte gPlayerEntity thumb_func_start sub_080262A8 sub_080262A8: @ 0x080262A8 @@ -829,7 +829,7 @@ sub_080262A8: @ 0x080262A8 ldrb r0, [r4, #0xb] cmp r0, #0 bne _080262EC - ldr r1, _080262E8 @ =gLinkState + ldr r1, _080262E8 @ =gPlayerState movs r0, #0x82 lsls r0, r0, #1 strh r0, [r1, #8] @@ -839,7 +839,7 @@ sub_080262A8: @ 0x080262A8 strb r5, [r0, #3] b _0802631A .align 2, 0 -_080262E8: .4byte gLinkState +_080262E8: .4byte gPlayerState _080262EC: adds r0, r4, #0 adds r0, #0x7c @@ -853,7 +853,7 @@ _080262EC: ldr r1, [r0] movs r0, #3 strb r0, [r1, #3] - ldr r0, _0802631C @ =gLinkEntity + ldr r0, _0802631C @ =gPlayerEntity strb r6, [r0, #0x14] ldr r0, _08026320 @ =gRoomControls str r4, [r0, #0x30] @@ -866,7 +866,7 @@ _080262EC: _0802631A: pop {r4, r5, r6, pc} .align 2, 0 -_0802631C: .4byte gLinkEntity +_0802631C: .4byte gPlayerEntity _08026320: .4byte gRoomControls _08026324: .4byte 0x00004022 @@ -874,7 +874,7 @@ _08026324: .4byte 0x00004022 sub_08026328: @ 0x08026328 push {lr} adds r2, r0, #0 - ldr r0, _08026354 @ =gLinkEntity + ldr r0, _08026354 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0x17 beq _08026352 @@ -895,13 +895,13 @@ sub_08026328: @ 0x08026328 _08026352: pop {pc} .align 2, 0 -_08026354: .4byte gLinkEntity +_08026354: .4byte gPlayerEntity thumb_func_start sub_08026358 sub_08026358: @ 0x08026358 push {r4, lr} adds r3, r0, #0 - ldr r4, _08026398 @ =gLinkEntity + ldr r4, _08026398 @ =gPlayerEntity ldrb r0, [r4, #0xc] cmp r0, #0xf beq _080263B0 @@ -932,7 +932,7 @@ sub_08026358: @ 0x08026358 strb r0, [r1, #0xe] b _080263B0 .align 2, 0 -_08026398: .4byte gLinkEntity +_08026398: .4byte gPlayerEntity _0802639C: .4byte gRoomControls _080263A0: cmp r2, #0x60 @@ -1145,7 +1145,7 @@ sub_0802650C: @ 0x0802650C adds r0, #1 strb r0, [r1, #3] ldr r1, _08026534 @ =gRoomControls - ldr r0, _08026538 @ =gLinkEntity + ldr r0, _08026538 @ =gPlayerEntity str r0, [r1, #0x30] _0802652C: adds r0, r2, #0 @@ -1153,7 +1153,7 @@ _0802652C: pop {pc} .align 2, 0 _08026534: .4byte gRoomControls -_08026538: .4byte gLinkEntity +_08026538: .4byte gPlayerEntity thumb_func_start sub_0802653C sub_0802653C: @ 0x0802653C @@ -1221,7 +1221,7 @@ _0802659C: adds r4, #0x7c movs r0, #0x3c strb r0, [r4] - ldr r1, _080265E4 @ =gLinkEntity + ldr r1, _080265E4 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection strb r0, [r5, #0x15] @@ -1239,7 +1239,7 @@ _0802659C: adds r0, #0x10 b _080265EE .align 2, 0 -_080265E4: .4byte gLinkEntity +_080265E4: .4byte gPlayerEntity _080265E8: adds r1, r5, #0 adds r1, #0x80 @@ -1372,7 +1372,7 @@ _080266D6: ands r0, r1 cmp r0, #0 bne _080266EC - ldr r1, _08026704 @ =gLinkEntity + ldr r1, _08026704 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -1388,7 +1388,7 @@ _080266EC: b _0802670A .align 2, 0 _08026700: .4byte gScreenTransition -_08026704: .4byte gLinkEntity +_08026704: .4byte gPlayerEntity _08026708: movs r0, #0xc0 _0802670A: @@ -1549,7 +1549,7 @@ _08026820: strh r0, [r5] b _08026860 _08026830: - ldr r1, _08026868 @ =gLinkEntity + ldr r1, _08026868 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -1575,7 +1575,7 @@ _08026860: bl sub_080277F8 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08026868: .4byte gLinkEntity +_08026868: .4byte gPlayerEntity thumb_func_start sub_0802686C sub_0802686C: @ 0x0802686C @@ -2659,7 +2659,7 @@ _08027098: adds r7, r0, #0 cmp r1, #0 beq _080270E0 - ldr r0, _080270CC @ =gLinkEntity + ldr r0, _080270CC @ =gPlayerEntity movs r2, #0x32 ldrsh r4, [r5, r2] movs r1, #0x32 @@ -2678,7 +2678,7 @@ _08027098: b _080270D4 .align 2, 0 _080270C8: .4byte gScreenTransition -_080270CC: .4byte gLinkEntity +_080270CC: .4byte gPlayerEntity _080270D0: movs r0, #0x10 strb r0, [r3, #0xc] @@ -2789,7 +2789,7 @@ _08027152: ldrb r0, [r0, #3] cmp r0, #1 bls _080271B2 - ldr r0, _080271DC @ =gLinkEntity + ldr r0, _080271DC @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r5, r2] movs r2, #0x2e @@ -2821,7 +2821,7 @@ _080271C0: movs r0, #0xf b _080271FC .align 2, 0 -_080271DC: .4byte gLinkEntity +_080271DC: .4byte gPlayerEntity _080271E0: adds r0, r1, #1 strb r0, [r2, #3] @@ -4186,7 +4186,7 @@ _08027C22: ldrb r0, [r6, #0x15] lsrs r0, r0, #2 strb r0, [r6, #0x14] - ldr r0, _08027C44 @ =gLinkEntity + ldr r0, _08027C44 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r6, r2] movs r2, #0x32 @@ -4201,7 +4201,7 @@ _08027C22: movs r0, #0 b _08027C50 .align 2, 0 -_08027C44: .4byte gLinkEntity +_08027C44: .4byte gPlayerEntity _08027C48: adds r0, r6, #0 adds r0, #0x84 diff --git a/asm/code_080011C4.s b/asm/code_080011C4.s index 6296d255..5a8f8ec1 100644 --- a/asm/code_080011C4.s +++ b/asm/code_080011C4.s @@ -1404,7 +1404,7 @@ _0800293A: CheckPlayerInRegion: @ 0x0800293E push {r4, r5, r6, r7, lr} ldr r4, _080029AC @ =gRoomControls - ldr r7, _080029B0 @ =gLinkEntity + ldr r7, _080029B0 @ =gPlayerEntity ldrh r6, [r4, #6] ldrh r5, [r7, #0x2e] subs r5, r5, r6 @@ -1444,4 +1444,4 @@ _080029A0: .4byte 0x0000E040 _080029A4: .4byte 0x00000E20 _080029A8: .4byte gRoomControls _080029AC: .4byte gRoomControls -_080029B0: .4byte gLinkEntity +_080029B0: .4byte gPlayerEntity diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s index b6284815..0a6fd073 100644 --- a/asm/code_080043E8.s +++ b/asm/code_080043E8.s @@ -64,7 +64,7 @@ sub_0800445C: @ 0x0800445C bl sub_08079F8C cmp r0, #0 beq _08004482 - ldr r5, _080044D8 @ =gLinkEntity + ldr r5, _080044D8 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 bl sub_08004484 @@ -113,7 +113,7 @@ _080044AC: non_word_aligned_thumb_func_start sub_080044AE sub_080044AE: @ 0x080044AE push {lr} - ldr r3, _080044E8 @ =gLinkEntity + ldr r3, _080044E8 @ =gPlayerEntity cmp r0, r3 beq _080044CC push {r0, r1, r2} @@ -132,11 +132,11 @@ _080044CC: bl sub_08079E58 b _080044C8 .align 2, 0 -_080044D8: .4byte gLinkEntity +_080044D8: .4byte gPlayerEntity _080044DC: .4byte gUnk_03005FF0 _080044E0: .4byte gUnk_02024048 _080044E4: .4byte gUnk_02021F20 -_080044E8: .4byte gLinkEntity +_080044E8: .4byte gPlayerEntity thumb_func_start sub_080044EC sub_080044EC: @ 0x080044EC diff --git a/asm/code_0800857C.s b/asm/code_0800857C.s index 5d66e4b3..2cd3657b 100644 --- a/asm/code_0800857C.s +++ b/asm/code_0800857C.s @@ -16,7 +16,7 @@ sub_0800857C: @ 0x0800857C ldrb r1, [r0, #0xb] lsrs r1, r1, #8 bhs _0800859C - ldr r1, _08008888 @ =gLinkState + ldr r1, _08008888 @ =gPlayerState ldrb r1, [r1, #2] movs r2, #0x80 ands r1, r2 @@ -52,7 +52,7 @@ sub_080085B0: @ 0x080085B0 thumb_func_start sub_080085CC sub_080085CC: @ 0x080085CC push {lr} - ldr r2, _0800888C @ =gLinkState + ldr r2, _0800888C @ =gPlayerState ldr r1, _08008890 @ =gUnk_080083FC movs r3, #0x26 ldrb r3, [r2, r3] @@ -78,7 +78,7 @@ _080085E6: ands r2, r3 bne _0800861A ldr r1, _080088A4 @ =gUnk_080084BC - ldr r3, _080088A8 @ =gLinkState + ldr r3, _080088A8 @ =gPlayerState ldrb r2, [r3, #0x1c] orrs r2, r2 bne _0800861A @@ -179,7 +179,7 @@ sub_080086B4: @ 0x080086B4 mov r7, fp push {r4, r5, r6, r7} mov fp, r2 - ldr r2, _080088BC @ =gLinkEntity + ldr r2, _080088BC @ =gPlayerEntity mov r8, r2 bl sub_080086D8 pop {r4, r5, r6, r7} @@ -208,7 +208,7 @@ sub_080086D8: @ 0x080086D8 ldrb r2, [r0, r1] push {r2} mov r0, r8 - ldr r1, _080088C8 @ =gLinkState + ldr r1, _080088C8 @ =gPlayerState movs r2, #0x26 ldrb r2, [r1, r2] cmp r2, #0 @@ -428,23 +428,23 @@ _0800887E: adds r0, r5, #0 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08008888: .4byte gLinkState -_0800888C: .4byte gLinkState +_08008888: .4byte gPlayerState +_0800888C: .4byte gPlayerState _08008890: .4byte gUnk_080083FC _08008894: .4byte gUnk_0800839C _08008898: .4byte gUnk_0800845C _0800889C: .4byte 0x01000000 _080088A0: .4byte gUnk_0800833C _080088A4: .4byte gUnk_080084BC -_080088A8: .4byte gLinkState +_080088A8: .4byte gPlayerState _080088AC: .4byte gUnk_0800851C _080088B0: .4byte gUnk_080082DC _080088B4: .4byte gUnk_03000BF6 _080088B8: .4byte gUnk_03000BF8 -_080088BC: .4byte gLinkEntity +_080088BC: .4byte gPlayerEntity _080088C0: .4byte 0x000003F0 _080088C4: .4byte gUnk_08000248 -_080088C8: .4byte gLinkState +_080088C8: .4byte gPlayerState _080088CC: .4byte gUnk_0800823C _080088D0: .4byte gUnk_08007DF4 _080088D4: .4byte gRoomControls @@ -487,13 +487,13 @@ sub_08008936: @ 0x08008936 ldrb r2, [r0, #0x14] lsrs r2, r2, #1 lsls r2, r2, #3 - ldr r1, _08008A68 @ =gLinkState + ldr r1, _08008A68 @ =gPlayerState b _08008960 non_word_aligned_thumb_func_start sub_08008942 sub_08008942: @ 0x08008942 push {lr} - ldr r1, _08008A6C @ =gLinkState + ldr r1, _08008A6C @ =gPlayerState ldrb r2, [r1, #7] ldrb r3, [r1, #0xa] orrs r2, r3 @@ -502,7 +502,7 @@ sub_08008942: @ 0x08008942 b _08008956 _08008952: push {lr} - ldr r1, _08008A70 @ =gLinkState + ldr r1, _08008A70 @ =gPlayerState _08008956: movs r3, #0x15 strb r2, [r0, r3] @@ -559,7 +559,7 @@ _080089A8: ldrsb r3, [r4, r3] bl sub_08008A46 _080089C0: - ldr r1, _08008A80 @ =gLinkState + ldr r1, _08008A80 @ =gPlayerState movs r4, #0x8c movs r2, #8 ldrsh r3, [r1, r4] @@ -636,7 +636,7 @@ _08008A3E: non_word_aligned_thumb_func_start sub_08008A46 sub_08008A46: @ 0x08008A46 push {lr} - ldr r1, _08008A84 @ =gLinkState + ldr r1, _08008A84 @ =gPlayerState movs r4, #0x8c ldrsh r5, [r1, r4] adds r5, r5, r2 @@ -651,14 +651,14 @@ _08008A60: strh r3, [r1] pop {pc} .align 2, 0 -_08008A68: .4byte gLinkState -_08008A6C: .4byte gLinkState -_08008A70: .4byte gLinkState +_08008A68: .4byte gPlayerState +_08008A6C: .4byte gPlayerState +_08008A70: .4byte gPlayerState _08008A74: .4byte _080088FC _08008A78: .4byte _080088EC _08008A7C: .4byte _0800890C -_08008A80: .4byte gLinkState -_08008A84: .4byte gLinkState +_08008A80: .4byte gPlayerState +_08008A84: .4byte gPlayerState thumb_func_start sub_08008A88 sub_08008A88: @ 0x08008A88 @@ -681,7 +681,7 @@ _08008A9C: thumb_func_start sub_08008AA0 sub_08008AA0: @ 0x08008AA0 push {r4, r5, lr} - ldr r1, _08008B40 @ =gLinkState + ldr r1, _08008B40 @ =gPlayerState ldrb r2, [r1, #0x12] cmp r2, #1 beq _08008AC4 @@ -704,7 +704,7 @@ _08008AC4: non_word_aligned_thumb_func_start sub_08008AC6 sub_08008AC6: @ 0x08008AC6 push {r0, lr} - ldr r1, _08008B48 @ =gLinkState + ldr r1, _08008B48 @ =gPlayerState movs r3, #0x26 ldrb r2, [r1, r3] movs r3, #0xf @@ -760,7 +760,7 @@ _08008B20: non_word_aligned_thumb_func_start sub_08008B22 sub_08008B22: @ 0x08008B22 push {lr} - ldr r0, _08008B58 @ =gLinkEntity + ldr r0, _08008B58 @ =gPlayerEntity bl sub_08008B02 adds r0, r2, #0 pop {pc} @@ -774,13 +774,13 @@ sub_08008B2E: @ 0x08008B2E .align 2, 0 _08008B38: .4byte 0x00000180 _08008B3C: .4byte 0xFFFFFE80 -_08008B40: .4byte gLinkState +_08008B40: .4byte gPlayerState _08008B44: .4byte gSineTable -_08008B48: .4byte gLinkState +_08008B48: .4byte gPlayerState _08008B4C: .4byte gUnk_02000020 _08008B50: .4byte 0x00004000 _08008B54: .4byte gUnk_08007CAC -_08008B58: .4byte gLinkEntity +_08008B58: .4byte gPlayerEntity gUnk_08008B5C:: @ 08008B5C .incbin "baserom.gba", 0x008B5C, 0x0000034 diff --git a/asm/code_08016DF8.s b/asm/code_08016DF8.s index ed16796d..69973edf 100644 --- a/asm/code_08016DF8.s +++ b/asm/code_08016DF8.s @@ -166,7 +166,7 @@ sub_08016F28: @ 0x08016F28 ldrb r0, [r0] cmp r0, #0 beq _08016F4C - ldr r0, _08016F48 @ =gLinkState + ldr r0, _08016F48 @ =gPlayerState ldr r1, [r0, #0x30] movs r2, #0x80 lsls r2, r2, #7 @@ -174,9 +174,9 @@ sub_08016F28: @ 0x08016F28 b _08016F54 .align 2, 0 _08016F44: .4byte gUnk_02002A40 -_08016F48: .4byte gLinkState +_08016F48: .4byte gPlayerState _08016F4C: - ldr r0, _08016F98 @ =gLinkState + ldr r0, _08016F98 @ =gPlayerState ldr r1, [r0, #0x30] ldr r2, _08016F9C @ =0xFFFFBFFF ands r1, r2 @@ -186,7 +186,7 @@ _08016F54: bl sub_0805E3B0 cmp r0, #0 bne _08016FDC - ldr r5, _08016F98 @ =gLinkState + ldr r5, _08016F98 @ =gPlayerState ldr r0, [r5, #0x30] movs r1, #0x80 lsls r1, r1, #0xc @@ -213,7 +213,7 @@ _08016F54: strb r0, [r4, #0x10] b _08016FB4 .align 2, 0 -_08016F98: .4byte gLinkState +_08016F98: .4byte gPlayerState _08016F9C: .4byte 0xFFFFBFFF _08016FA0: .4byte 0xFFF7FFFF _08016FA4: @@ -268,7 +268,7 @@ sub_08016FF4: @ 0x08016FF4 strb r1, [r2] adds r0, #0x2e strb r1, [r0] - ldr r2, _080170A4 @ =gLinkEntity + ldr r2, _080170A4 @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x41 ldrb r1, [r0] @@ -286,7 +286,7 @@ sub_08016FF4: @ 0x08016FF4 movs r0, #0x86 bl PlaySFX _0801702E: - ldr r4, _080170A8 @ =gLinkState + ldr r4, _080170A8 @ =gPlayerState ldr r0, [r4, #0x30] ldr r1, _080170AC @ =0xFDFFFDFF ands r0, r1 @@ -296,7 +296,7 @@ _0801702E: ands r0, r1 cmp r0, #0 beq _08017046 - bl ResetLink + bl ResetPlayer _08017046: ldr r0, [r4, #0x30] movs r1, #0x80 @@ -320,7 +320,7 @@ _0801706E: ldr r0, _080170B0 @ =gUnk_03003DF0 movs r4, #0 strb r4, [r0] - ldr r2, _080170A8 @ =gLinkState + ldr r2, _080170A8 @ =gPlayerState adds r1, r2, #0 adds r1, #0x27 ldrb r0, [r1] @@ -345,8 +345,8 @@ _08017084: b _080171EA .align 2, 0 _080170A0: .4byte gUnk_0200AF00 -_080170A4: .4byte gLinkEntity -_080170A8: .4byte gLinkState +_080170A4: .4byte gPlayerEntity +_080170A8: .4byte gPlayerState _080170AC: .4byte 0xFDFFFDFF _080170B0: .4byte gUnk_03003DF0 _080170B4: @@ -517,11 +517,11 @@ sub_080171F0: @ 0x080171F0 push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - ldr r4, _080172DC @ =gLinkState + ldr r4, _080172DC @ =gPlayerState ldrb r0, [r4, #0x1a] cmp r0, #0 beq _08017202 - bl ResetLink + bl ResetPlayer _08017202: ldrb r0, [r4, #0x14] cmp r0, #0 @@ -529,7 +529,7 @@ _08017202: subs r0, #1 strb r0, [r4, #0x14] _0801720C: - ldr r6, _080172E0 @ =gLinkEntity + ldr r6, _080172E0 @ =gPlayerEntity adds r1, r6, #0 adds r1, #0x7a ldrh r0, [r1] @@ -634,8 +634,8 @@ _080172CC: orrs r0, r1 b _080172FA .align 2, 0 -_080172DC: .4byte gLinkState -_080172E0: .4byte gLinkEntity +_080172DC: .4byte gPlayerState +_080172E0: .4byte gPlayerEntity _080172E4: .4byte 0xFFFEFFFF _080172E8: .4byte gUnk_0200AF00 _080172EC: .4byte gUnk_03003BE0 @@ -646,10 +646,10 @@ _080172F4: ands r0, r1 _080172FA: str r0, [r4, #0x30] - ldr r4, _08017330 @ =gLinkEntity + ldr r4, _08017330 @ =gPlayerEntity adds r0, r4, #0 bl sub_0807A8D8 - ldr r0, _08017334 @ =gLinkState + ldr r0, _08017334 @ =gPlayerState ldrb r1, [r0, #2] movs r0, #0xc0 ands r0, r1 @@ -672,8 +672,8 @@ _08017322: bx r0 .align 2, 0 _0801732C: .4byte 0xDFFFFFFF -_08017330: .4byte gLinkEntity -_08017334: .4byte gLinkState +_08017330: .4byte gPlayerEntity +_08017334: .4byte gPlayerState thumb_func_start sub_08017338 sub_08017338: @ 0x08017338 @@ -779,7 +779,7 @@ _080173CE: ldrh r1, [r3, #6] cmp r1, #0 bne _0801741C - ldr r2, _08017418 @ =gLinkEntity + ldr r2, _08017418 @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x60 ldrh r1, [r0] @@ -791,14 +791,14 @@ _080173CE: .align 2, 0 _08017410: .4byte gUnk_08126DA8 _08017414: .4byte gUnk_08126ED8 -_08017418: .4byte gLinkEntity +_08017418: .4byte gPlayerEntity _0801741C: ldr r0, _0801749C @ =0x000003FF ands r0, r1 mov r1, ip adds r1, #0x60 strh r0, [r1] - ldr r5, _080174A0 @ =gLinkEntity + ldr r5, _080174A0 @ =gPlayerEntity _08017428: mov r3, ip ldrb r0, [r3, #0x14] @@ -860,7 +860,7 @@ _08017438: bx r0 .align 2, 0 _0801749C: .4byte 0x000003FF -_080174A0: .4byte gLinkEntity +_080174A0: .4byte gPlayerEntity thumb_func_start sub_080174A4 sub_080174A4: @ 0x080174A4 @@ -1047,12 +1047,12 @@ _08017602: cmp r0, #0 bne _08017638 ldr r1, _08017628 @ =gUnk_030059F0 - ldr r0, _0801762C @ =gLinkState + ldr r0, _0801762C @ =gPlayerState adds r0, #0x8b ldrb r0, [r0] cmp r0, #0 beq _08017634 - ldr r4, _08017630 @ =gLinkEntity + ldr r4, _08017630 @ =gPlayerEntity ldrb r5, [r4, #0x10] movs r0, #0x7f ands r0, r5 @@ -1063,8 +1063,8 @@ _08017602: .align 2, 0 _08017624: .4byte gUnk_03003DC0 _08017628: .4byte gUnk_030059F0 -_0801762C: .4byte gLinkState -_08017630: .4byte gLinkEntity +_0801762C: .4byte gPlayerState +_08017630: .4byte gPlayerEntity _08017634: bl _call_via_r1 _08017638: @@ -1085,7 +1085,7 @@ sub_08017640: @ 0x08017640 str r4, [r0] str r4, [r4] str r4, [r4, #4] - ldr r0, _08017668 @ =gLinkEntity + ldr r0, _08017668 @ =gPlayerEntity str r0, [r4, #8] pop {r4} pop {r0} @@ -1093,7 +1093,7 @@ sub_08017640: @ 0x08017640 .align 2, 0 _08017660: .4byte gUnk_03003C70 _08017664: .4byte gUnk_02018EA0 -_08017668: .4byte gLinkEntity +_08017668: .4byte gPlayerEntity thumb_func_start sub_0801766C sub_0801766C: @ 0x0801766C @@ -1376,7 +1376,7 @@ sub_08017850: @ 0x08017850 movs r0, #0 b _08017868 _08017860: - ldr r1, _08017870 @ =gLinkEntity + ldr r1, _08017870 @ =gPlayerEntity adds r0, r4, #0 bl sub_080177A0 _08017868: @@ -1384,7 +1384,7 @@ _08017868: pop {r1} bx r1 .align 2, 0 -_08017870: .4byte gLinkEntity +_08017870: .4byte gPlayerEntity thumb_func_start sub_08017874 sub_08017874: @ 0x08017874 @@ -1570,7 +1570,7 @@ sub_08017940: @ 0x08017940 bl UpdateSpriteForCollisionLayer _080179CC: movs r1, #0 - ldr r0, _080179E8 @ =gLinkEntity + ldr r0, _080179E8 @ =gPlayerEntity cmp r5, r0 beq _080179DA cmp r4, r0 @@ -1585,7 +1585,7 @@ _080179E0: pop {r0} bx r0 .align 2, 0 -_080179E8: .4byte gLinkEntity +_080179E8: .4byte gPlayerEntity thumb_func_start sub_080179EC sub_080179EC: @ 0x080179EC @@ -1754,7 +1754,7 @@ sub_08017B1C: @ 0x08017B1C push {lr} adds r2, r0, #0 adds r3, r1, #0 - ldr r0, _08017B38 @ =gLinkState + ldr r0, _08017B38 @ =gPlayerState ldrb r1, [r0, #0x1e] movs r0, #0x60 ands r0, r1 @@ -1766,7 +1766,7 @@ sub_08017B1C: @ 0x08017B1C strb r0, [r3, #0x10] b _08017B52 .align 2, 0 -_08017B38: .4byte gLinkState +_08017B38: .4byte gPlayerState _08017B3C: adds r1, r2, #0 adds r1, #0x42 @@ -1800,7 +1800,7 @@ sub_08017B58: @ 0x08017B58 ldrb r1, [r2, #0x1d] cmp r1, #0 beq _08017BA2 - ldr r0, _08017B94 @ =gLinkState + ldr r0, _08017B94 @ =gPlayerState ldrb r0, [r0, #0x1d] subs r0, r1, r0 movs r1, #0 @@ -1816,7 +1816,7 @@ sub_08017B58: @ 0x08017B58 strh r1, [r0] b _08017BA2 .align 2, 0 -_08017B94: .4byte gLinkState +_08017B94: .4byte gPlayerState _08017B98: strb r0, [r2, #0xd] ldrb r0, [r3] @@ -1845,7 +1845,7 @@ sub_08017BBC: @ 0x08017BBC adds r4, r0, #0 adds r6, r1, #0 adds r7, r2, #0 - ldr r5, _08017C38 @ =gLinkState + ldr r5, _08017C38 @ =gPlayerState ldr r0, [r5, #0x30] ldr r1, _08017C3C @ =0x00001481 ands r0, r1 @@ -1903,7 +1903,7 @@ _08017C2E: pop {r1} bx r1 .align 2, 0 -_08017C38: .4byte gLinkState +_08017C38: .4byte gPlayerState _08017C3C: .4byte 0x00001481 thumb_func_start sub_08017C40 @@ -1911,7 +1911,7 @@ sub_08017C40: @ 0x08017C40 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r6, _08017CB4 @ =gLinkState + ldr r6, _08017CB4 @ =gPlayerState ldr r0, [r6, #0x30] ldr r1, _08017CB8 @ =0x00001881 ands r0, r1 @@ -1968,7 +1968,7 @@ _08017CAA: pop {r1} bx r1 .align 2, 0 -_08017CB4: .4byte gLinkState +_08017CB4: .4byte gPlayerState _08017CB8: .4byte 0x00001881 thumb_func_start sub_08017CBC @@ -2033,7 +2033,7 @@ _08017D1E: sub_08017D28: @ 0x08017D28 push {lr} adds r3, r0, #0 - ldr r2, _08017D68 @ =gLinkState + ldr r2, _08017D68 @ =gPlayerState movs r0, #1 strb r0, [r2, #0x1a] adds r2, r3, #0 @@ -2064,7 +2064,7 @@ _08017D60: pop {r1} bx r1 .align 2, 0 -_08017D68: .4byte gLinkState +_08017D68: .4byte gPlayerState thumb_func_start sub_08017D6C sub_08017D6C: @ 0x08017D6C @@ -2147,7 +2147,7 @@ _08017DFC: movs r0, #4 _08017DFE: strb r0, [r1] - ldr r4, _08017E34 @ =gLinkEntity + ldr r4, _08017E34 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 bl sub_08017874 @@ -2158,7 +2158,7 @@ _08017DFE: adds r2, #0x3d movs r0, #0xf4 strb r0, [r2] - ldr r0, _08017E38 @ =gLinkState + ldr r0, _08017E38 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -2172,8 +2172,8 @@ _08017DFE: strb r0, [r1] b _08017E6E .align 2, 0 -_08017E34: .4byte gLinkEntity -_08017E38: .4byte gLinkState +_08017E34: .4byte gPlayerEntity +_08017E38: .4byte gPlayerState _08017E3C: adds r0, r5, #0 adds r0, #0x40 @@ -2253,7 +2253,7 @@ sub_08017EB0: @ 0x08017EB0 movs r0, #0 b _08017F36 _08017EC4: - ldr r6, _08017EF8 @ =gLinkEntity + ldr r6, _08017EF8 @ =gPlayerEntity cmp r2, r6 bne _08017EFC ldrb r4, [r5] @@ -2278,7 +2278,7 @@ _08017EC4: strh r0, [r1] b _08017F22 .align 2, 0 -_08017EF8: .4byte gLinkEntity +_08017EF8: .4byte gPlayerEntity _08017EFC: ldrh r1, [r2, #8] movs r0, #0xa1 @@ -2331,13 +2331,13 @@ sub_08017F40: @ 0x08017F40 ldrb r6, [r0] cmp r6, #0 bne _0801800A - ldr r0, _08017FAC @ =gLinkEntity + ldr r0, _08017FAC @ =gPlayerEntity cmp r4, r0 bne _08018002 bl sub_08079F8C cmp r0, #0 beq _0801801E - ldr r2, _08017FB0 @ =gLinkState + ldr r2, _08017FB0 @ =gPlayerState ldr r3, [r2, #0x30] movs r0, #0x80 ands r0, r3 @@ -2377,8 +2377,8 @@ _08017F9A: bl PositionRelative b _08017FC2 .align 2, 0 -_08017FAC: .4byte gLinkEntity -_08017FB0: .4byte gLinkState +_08017FAC: .4byte gPlayerEntity +_08017FB0: .4byte gPlayerState _08017FB4: movs r3, #0x80 lsls r3, r3, #9 @@ -2415,7 +2415,7 @@ _08017FC2: adds r1, #0x3d movs r0, #0xf8 strb r0, [r1] - bl ResetLink + bl ResetPlayer movs r0, #1 b _08018020 _08018002: @@ -2427,7 +2427,7 @@ _0801800A: ldrb r0, [r5, #8] cmp r0, #3 bne _0801801E - ldr r0, _08018028 @ =gLinkEntity + ldr r0, _08018028 @ =gPlayerEntity cmp r4, r0 bne _0801801E adds r0, r5, #0 @@ -2440,7 +2440,7 @@ _08018020: pop {r1} bx r1 .align 2, 0 -_08018028: .4byte gLinkEntity +_08018028: .4byte gPlayerEntity thumb_func_start sub_0801802C sub_0801802C: @ 0x0801802C @@ -2620,13 +2620,13 @@ sub_08018168: @ 0x08018168 ldrb r5, [r0] cmp r5, #0 bne _08018208 - ldr r0, _080181F4 @ =gLinkEntity + ldr r0, _080181F4 @ =gPlayerEntity cmp r4, r0 bne _08018200 bl sub_08079F8C cmp r0, #0 beq _0801821C - ldr r2, _080181F8 @ =gLinkState + ldr r2, _080181F8 @ =gPlayerState ldr r3, [r2, #0x30] ldr r0, _080181FC @ =0x00040080 ands r0, r3 @@ -2681,8 +2681,8 @@ sub_08018168: @ 0x08018168 movs r0, #1 b _0801821E .align 2, 0 -_080181F4: .4byte gLinkEntity -_080181F8: .4byte gLinkState +_080181F4: .4byte gPlayerEntity +_080181F8: .4byte gPlayerState _080181FC: .4byte 0x00040080 _08018200: adds r0, r4, #0 @@ -2693,7 +2693,7 @@ _08018208: ldrb r0, [r6, #8] cmp r0, #3 bne _0801821C - ldr r0, _08018224 @ =gLinkEntity + ldr r0, _08018224 @ =gPlayerEntity cmp r4, r0 bne _0801821C adds r0, r6, #0 @@ -2706,14 +2706,14 @@ _0801821E: pop {r1} bx r1 .align 2, 0 -_08018224: .4byte gLinkEntity +_08018224: .4byte gPlayerEntity thumb_func_start sub_08018228 sub_08018228: @ 0x08018228 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r0, _0801824C @ =gLinkEntity + ldr r0, _0801824C @ =gPlayerEntity cmp r4, r0 bne _08018244 bl sub_08079F8C @@ -2728,7 +2728,7 @@ _08018244: pop {r1} bx r1 .align 2, 0 -_0801824C: .4byte gLinkEntity +_0801824C: .4byte gPlayerEntity thumb_func_start sub_08018250 sub_08018250: @ 0x08018250 @@ -2766,13 +2766,13 @@ _08018280: sub_08018288: @ 0x08018288 push {lr} adds r1, r0, #0 - ldr r0, _08018298 @ =gLinkEntity + ldr r0, _08018298 @ =gPlayerEntity cmp r1, r0 bne _0801829C bl sub_0807AFE8 b _080182A2 .align 2, 0 -_08018298: .4byte gLinkEntity +_08018298: .4byte gPlayerEntity _0801829C: adds r1, #0x45 movs r0, #0 @@ -2852,7 +2852,7 @@ sub_08018308: @ 0x08018308 ldrb r0, [r4, #8] cmp r0, #3 bne _08018338 - ldr r0, _0801835C @ =gLinkEntity + ldr r0, _0801835C @ =gPlayerEntity cmp r6, r0 bne _08018338 adds r0, r4, #0 @@ -2865,7 +2865,7 @@ _08018338: lsls r0, r0, #3 cmp r1, r0 bne _08018360 - ldr r0, _0801835C @ =gLinkEntity + ldr r0, _0801835C @ =gPlayerEntity ldrb r2, [r0, #0x14] mov r0, r8 adds r0, #4 @@ -2879,7 +2879,7 @@ _08018338: movs r0, #0 b _080184F0 .align 2, 0 -_0801835C: .4byte gLinkEntity +_0801835C: .4byte gPlayerEntity _08018360: cmp r3, #0 bne _08018408 @@ -3074,7 +3074,7 @@ _080184BA: _080184CE: cmp r0, #5 bne _080184DA - ldr r0, _080184FC @ =gLinkEntity + ldr r0, _080184FC @ =gPlayerEntity adds r0, #0x3d movs r1, #0x80 strb r1, [r0] @@ -3085,7 +3085,7 @@ _080184DA: ldrb r0, [r6, #9] cmp r0, #5 bne _080184EE - ldr r0, _080184FC @ =gLinkEntity + ldr r0, _080184FC @ =gPlayerEntity adds r0, #0x3d movs r1, #0x80 strb r1, [r0] @@ -3098,4 +3098,4 @@ _080184F0: pop {r1} bx r1 .align 2, 0 -_080184FC: .4byte gLinkEntity \ No newline at end of file +_080184FC: .4byte gPlayerEntity \ No newline at end of file diff --git a/asm/code_08018500.s b/asm/code_08018500.s index c7bd93ff..663f9662 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -163,7 +163,7 @@ _08018628: .4byte gUnk_080B3D20 thumb_func_start sub_0801862C sub_0801862C: @ 0x0801862C push {r4, r5, lr} - ldr r1, _0801864C @ =gLinkState + ldr r1, _0801864C @ =gPlayerState movs r2, #0 movs r0, #0x16 strb r0, [r1, #0xc] @@ -179,7 +179,7 @@ sub_0801862C: @ 0x0801862C strh r0, [r5, #0x36] b _0801868C .align 2, 0 -_0801864C: .4byte gLinkState +_0801864C: .4byte gPlayerState _08018650: .4byte gScreenTransition _08018654: .4byte gUnk_02033AB8 _08018658: diff --git a/asm/code_08019444.s b/asm/code_08019444.s index 16eb23b0..21215e60 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -56,7 +56,7 @@ _08019494: .4byte gUnk_080B43F4 sub_08019498: @ 0x08019498 push {r4, r5, lr} adds r5, r0, #0 - ldr r4, _08019504 @ =gLinkEntity + ldr r4, _08019504 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 bl CopyPosition @@ -108,7 +108,7 @@ _080194E6: beq _08019516 b _0801954E .align 2, 0 -_08019504: .4byte gLinkEntity +_08019504: .4byte gPlayerEntity _08019508: .4byte gUnk_080B4408 _0801950C: cmp r0, #4 @@ -209,7 +209,7 @@ _080195B0: ands r1, r3 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _08019630 @ =gLinkEntity + ldr r1, _08019630 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] movs r2, #0x80 @@ -251,7 +251,7 @@ _0801961A: b _0801963C .align 2, 0 _0801962C: .4byte gRoomControls -_08019630: .4byte gLinkEntity +_08019630: .4byte gPlayerEntity _08019634: .4byte gUnk_08003E44 _08019638: bl DeleteThisEntity @@ -518,7 +518,7 @@ sub_08019840: @ 0x08019840 mov r7, sb mov r6, r8 push {r6, r7} - ldr r0, _0801985C @ =gLinkState + ldr r0, _0801985C @ =gPlayerState adds r2, r0, #0 adds r2, #0xa8 ldrb r1, [r2] @@ -529,7 +529,7 @@ sub_08019840: @ 0x08019840 ldrb r0, [r0] b _08019862 .align 2, 0 -_0801985C: .4byte gLinkState +_0801985C: .4byte gPlayerState _08019860: ldrb r0, [r2] _08019862: @@ -550,7 +550,7 @@ _08019878: bl _0801A2A4 _08019880: ldrb r0, [r7, #0x1e] - ldr r1, _08019898 @ =gLinkEntity + ldr r1, _08019898 @ =gPlayerEntity mov sb, r1 cmp r0, #0 bne _08019890 @@ -562,7 +562,7 @@ _08019890: ldrb r4, [r2, #0x15] b _0801989E .align 2, 0 -_08019898: .4byte gLinkEntity +_08019898: .4byte gPlayerEntity _0801989C: ldrb r4, [r7, #0xd] _0801989E: @@ -664,15 +664,15 @@ _08019960: .4byte gRoomControls _08019964: .4byte gUnk_080B4490 _08019968: .4byte 0x00010002 _0801996C: - ldr r1, _08019978 @ =gLinkEntity + ldr r1, _08019978 @ =gPlayerEntity lsls r0, r4, #3 strb r0, [r1, #0x15] movs r0, #0xf bl _0801A2A6 .align 2, 0 -_08019978: .4byte gLinkEntity +_08019978: .4byte gPlayerEntity _0801997C: - ldr r4, _080199DC @ =gLinkEntity + ldr r4, _080199DC @ =gPlayerEntity adds r5, r4, #0 adds r5, #0x38 ldrb r0, [r5] @@ -718,14 +718,14 @@ _0801997C: adds r4, r0, #0 b _080199EE .align 2, 0 -_080199DC: .4byte gLinkEntity +_080199DC: .4byte gPlayerEntity _080199E0: .4byte gUnk_080B4468 _080199E4: .4byte gRoomControls _080199E8: .4byte 0x00003FFF _080199EC: adds r4, r6, #0 _080199EE: - ldr r5, _08019A28 @ =gLinkEntity + ldr r5, _08019A28 @ =gPlayerEntity ldrb r1, [r5, #0x14] adds r3, r1, #0 ldr r0, _08019A2C @ =0x00004036 @@ -758,7 +758,7 @@ _08019A1C: _08019A22: bl _0801A2A4 .align 2, 0 -_08019A28: .4byte gLinkEntity +_08019A28: .4byte gPlayerEntity _08019A2C: .4byte 0x00004036 _08019A30: cmp r4, #0x5b @@ -838,7 +838,7 @@ _08019AA4: adds r1, r3, #0 adds r0, r0, r1 strh r0, [r2] - ldr r2, _08019ADC @ =gLinkState + ldr r2, _08019ADC @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #0x80 ands r1, r0 @@ -852,7 +852,7 @@ _08019AD0: .align 2, 0 _08019AD4: .4byte 0x0000401B _08019AD8: .4byte 0x00004030 -_08019ADC: .4byte gLinkState +_08019ADC: .4byte gPlayerState _08019AE0: ldr r0, _08019B04 @ =0x00004053 cmp r4, r0 @@ -963,7 +963,7 @@ _08019B88: ldr r4, _08019BB0 @ =0x00004001 adds r0, r0, r4 strh r0, [r1] - ldr r2, _08019BB4 @ =gLinkState + ldr r2, _08019BB4 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -976,9 +976,9 @@ _08019BAA: b _0801A0FA .align 2, 0 _08019BB0: .4byte 0x00004001 -_08019BB4: .4byte gLinkState +_08019BB4: .4byte gPlayerState _08019BB8: - ldr r1, _08019C50 @ =gLinkState + ldr r1, _08019C50 @ =gPlayerState ldr r0, [r1, #0x30] movs r2, #0x80 ands r0, r2 @@ -1058,7 +1058,7 @@ _08019C38: strh r0, [r5, #0x32] b _08019C64 .align 2, 0 -_08019C50: .4byte gLinkState +_08019C50: .4byte gPlayerState _08019C54: .4byte gUnk_080B4478 _08019C58: .4byte gRoomControls _08019C5C: @@ -1091,7 +1091,7 @@ _08019C80: adds r0, r0, r4 movs r3, #0 strh r0, [r1] - ldr r1, _08019CBC @ =gLinkState + ldr r1, _08019CBC @ =gPlayerState movs r0, #0xa0 strb r0, [r1, #6] movs r0, #5 @@ -1110,9 +1110,9 @@ _08019C80: b _0801A2A6 .align 2, 0 _08019CB8: .4byte 0x0000401C -_08019CBC: .4byte gLinkState +_08019CBC: .4byte gPlayerState _08019CC0: - ldr r0, _08019CF8 @ =gLinkState + ldr r0, _08019CF8 @ =gPlayerState adds r2, r0, #0 adds r2, #0x35 ldrb r1, [r2] @@ -1143,9 +1143,9 @@ _08019CF4: movs r0, #1 b _0801A2A6 .align 2, 0 -_08019CF8: .4byte gLinkState +_08019CF8: .4byte gPlayerState _08019CFC: - ldr r2, _08019D40 @ =gLinkState + ldr r2, _08019D40 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -1182,14 +1182,14 @@ _08019D2C: movs r0, #1 b _0801A2A6 .align 2, 0 -_08019D40: .4byte gLinkState +_08019D40: .4byte gPlayerState _08019D44: .4byte gUnk_0200AF00 _08019D48: cmp r3, #0 beq _08019D4E b _0801A2A4 _08019D4E: - ldr r2, _08019D8C @ =gLinkState + ldr r2, _08019D8C @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x81 lsls r1, r1, #7 @@ -1221,7 +1221,7 @@ _08019D76: movs r0, #2 b _0801A2A6 .align 2, 0 -_08019D8C: .4byte gLinkState +_08019D8C: .4byte gPlayerState _08019D90: .4byte gUnk_0200AF00 _08019D94: bl sub_08052734 @@ -1233,7 +1233,7 @@ _08019D9E: adds r0, #0x2d movs r1, #6 strb r1, [r0] - ldr r2, _08019DD0 @ =gLinkState + ldr r2, _08019DD0 @ =gPlayerState adds r0, r2, #0 adds r0, #0x92 ldrh r1, [r0] @@ -1254,9 +1254,9 @@ _08019DB8: b _0801A2A6 .align 2, 0 _08019DCC: .4byte gUnk_0200AF00 -_08019DD0: .4byte gLinkState +_08019DD0: .4byte gPlayerState _08019DD4: - ldr r4, _08019E3C @ =gLinkState + ldr r4, _08019E3C @ =gPlayerState ldr r0, [r4, #0x30] movs r1, #0x80 lsls r1, r1, #7 @@ -1275,7 +1275,7 @@ _08019DEE: beq _08019DF6 b _0801A2A4 _08019DF6: - ldr r2, _08019E40 @ =gLinkEntity + ldr r2, _08019E40 @ =gPlayerEntity ldrb r0, [r2, #0x14] lsls r0, r0, #2 ldrb r3, [r4, #0xd] @@ -1313,8 +1313,8 @@ _08019E18: movs r0, #1 b _0801A2A6 .align 2, 0 -_08019E3C: .4byte gLinkState -_08019E40: .4byte gLinkEntity +_08019E3C: .4byte gPlayerState +_08019E40: .4byte gPlayerEntity _08019E44: mov r0, r8 adds r1, r7, #0 @@ -1350,7 +1350,7 @@ _08019E84: mov r0, r8 adds r0, #4 adds r0, r0, r1 - ldr r2, _08019EBC @ =gLinkEntity + ldr r2, _08019EBC @ =gPlayerEntity ldrb r1, [r2, #0x14] lsrs r1, r1, #1 ldr r3, _08019EC0 @ =0x0000400C @@ -1358,7 +1358,7 @@ _08019E84: strh r1, [r0] mov sb, r2 _08019E98: - ldr r2, _08019EC4 @ =gLinkState + ldr r2, _08019EC4 @ =gPlayerState movs r3, #0 movs r0, #0xa0 strb r0, [r2, #6] @@ -1377,9 +1377,9 @@ _08019E98: movs r0, #1 b _0801A2A6 .align 2, 0 -_08019EBC: .4byte gLinkEntity +_08019EBC: .4byte gPlayerEntity _08019EC0: .4byte 0x0000400C -_08019EC4: .4byte gLinkState +_08019EC4: .4byte gPlayerState _08019EC8: mov r0, r8 adds r1, r7, #0 @@ -1399,7 +1399,7 @@ _08019ED8: adds r0, r0, r2 movs r3, #0 strh r0, [r1] - ldr r2, _08019F08 @ =gLinkState + ldr r2, _08019F08 @ =gPlayerState movs r0, #0x98 strb r0, [r2, #6] movs r0, #5 @@ -1413,7 +1413,7 @@ _08019ED8: b _0801A228 .align 2, 0 _08019F04: .4byte 0x0000405B -_08019F08: .4byte gLinkState +_08019F08: .4byte gPlayerState _08019F0C: mov r0, r8 adds r1, r7, #0 @@ -1433,7 +1433,7 @@ _08019F1C: adds r0, r0, r3 movs r3, #0 strh r0, [r1] - ldr r2, _08019F4C @ =gLinkState + ldr r2, _08019F4C @ =gPlayerState movs r0, #0xa0 strb r0, [r2, #6] movs r0, #5 @@ -1447,13 +1447,13 @@ _08019F1C: b _0801A228 .align 2, 0 _08019F48: .4byte 0x00004037 -_08019F4C: .4byte gLinkState +_08019F4C: .4byte gPlayerState _08019F50: cmp r3, #0 beq _08019F56 b _0801A2A4 _08019F56: - ldr r2, _08019FA0 @ =gLinkState + ldr r2, _08019FA0 @ =gPlayerState adds r0, r2, #0 adds r0, #0x35 ldrb r0, [r0] @@ -1492,10 +1492,10 @@ _08019F7C: strh r3, [r5, #0x30] b _0801A228 .align 2, 0 -_08019FA0: .4byte gLinkState +_08019FA0: .4byte gPlayerState _08019FA4: .4byte 0x0000403F _08019FA8: - ldr r0, _0801A07C @ =gLinkState + ldr r0, _0801A07C @ =gPlayerState adds r0, #0x35 ldrb r1, [r0] movs r0, #0x80 @@ -1564,7 +1564,7 @@ _0801A018: bne _0801A02A b _0801A2A4 _0801A02A: - ldr r3, _0801A08C @ =gLinkEntity + ldr r3, _0801A08C @ =gPlayerEntity ldrb r0, [r3, #0x14] lsls r0, r0, #2 movs r4, #0 @@ -1592,7 +1592,7 @@ _0801A02A: adds r0, r5, #0 adds r0, #0x38 strb r1, [r0] - ldr r2, _0801A07C @ =gLinkState + ldr r2, _0801A07C @ =gPlayerState movs r0, #0xa0 strb r0, [r2, #6] movs r0, #5 @@ -1606,11 +1606,11 @@ _0801A02A: ldrb r0, [r5, #0x15] b _0801A0B6 .align 2, 0 -_0801A07C: .4byte gLinkState +_0801A07C: .4byte gPlayerState _0801A080: .4byte 0x0000FFFF _0801A084: .4byte 0x00000FFF _0801A088: .4byte gUnk_03004040 -_0801A08C: .4byte gLinkEntity +_0801A08C: .4byte gPlayerEntity _0801A090: .4byte gRoomControls _0801A094: movs r0, #0xa0 @@ -1654,7 +1654,7 @@ _0801A0CC: ldr r4, _0801A0F0 @ =0x0000404B adds r0, r0, r4 strh r0, [r1] - ldr r2, _0801A0F4 @ =gLinkState + ldr r2, _0801A0F4 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -1665,7 +1665,7 @@ _0801A0CC: b _0801A0FA .align 2, 0 _0801A0F0: .4byte 0x0000404B -_0801A0F4: .4byte gLinkState +_0801A0F4: .4byte gPlayerState _0801A0F8: movs r0, #0xa0 _0801A0FA: @@ -1677,7 +1677,7 @@ _0801A0FA: movs r1, #1 orrs r0, r1 str r0, [r7, #0x30] - ldr r1, _0801A11C @ =gLinkEntity + ldr r1, _0801A11C @ =gPlayerEntity strh r2, [r1, #0x2c] strh r2, [r1, #0x30] ldrb r0, [r1, #0x14] @@ -1686,9 +1686,9 @@ _0801A0FA: movs r0, #1 b _0801A2A6 .align 2, 0 -_0801A11C: .4byte gLinkEntity +_0801A11C: .4byte gPlayerEntity _0801A120: - ldr r0, _0801A134 @ =gLinkState + ldr r0, _0801A134 @ =gPlayerState adds r0, #0x35 ldrb r0, [r0] cmp r0, #0 @@ -1699,10 +1699,10 @@ _0801A12C: adds r1, r5, #0 b _0801A28C .align 2, 0 -_0801A134: .4byte gLinkState +_0801A134: .4byte gPlayerState _0801A138: .4byte 0x00004054 _0801A13C: - ldr r0, _0801A150 @ =gLinkState + ldr r0, _0801A150 @ =gPlayerState adds r0, #0x35 ldrb r0, [r0] cmp r0, #6 @@ -1713,12 +1713,12 @@ _0801A148: adds r1, r5, #0 b _0801A28C .align 2, 0 -_0801A150: .4byte gLinkState +_0801A150: .4byte gPlayerState _0801A154: .4byte 0x00004054 _0801A158: subs r7, #1 _0801A15A: - ldr r0, _0801A190 @ =gLinkState + ldr r0, _0801A190 @ =gPlayerState adds r0, #0x35 ldrb r0, [r0] cmp r0, #0 @@ -1749,12 +1749,12 @@ _0801A186: bls _0801A178 b _0801A2A4 .align 2, 0 -_0801A190: .4byte gLinkState +_0801A190: .4byte gPlayerState _0801A194: .4byte gUnk_03004040 _0801A198: subs r7, #0x40 _0801A19A: - ldr r0, _0801A1CC @ =gLinkState + ldr r0, _0801A1CC @ =gPlayerState adds r0, #0x35 ldrb r0, [r0] cmp r0, #6 @@ -1781,14 +1781,14 @@ _0801A1B6: bls _0801A1B6 b _0801A2A4 .align 2, 0 -_0801A1CC: .4byte gLinkState +_0801A1CC: .4byte gPlayerState _0801A1D0: .4byte gUnk_03004040 _0801A1D4: movs r0, #2 ands r0, r1 cmp r0, #0 beq _0801A2A4 - ldr r6, _0801A234 @ =gLinkState + ldr r6, _0801A234 @ =gPlayerState adds r0, r6, #0 adds r0, #0x35 ldrb r0, [r0] @@ -1832,12 +1832,12 @@ _0801A228: movs r0, #1 b _0801A2A6 .align 2, 0 -_0801A234: .4byte gLinkState +_0801A234: .4byte gPlayerState _0801A238: .4byte 0x00004074 _0801A23C: cmp r3, #4 bne _0801A2A4 - ldr r1, _0801A280 @ =gLinkState + ldr r1, _0801A280 @ =gPlayerState adds r0, r1, #0 adds r0, #0x35 ldrb r0, [r0] @@ -1867,11 +1867,11 @@ _0801A23C: movs r0, #1 b _0801A2A6 .align 2, 0 -_0801A280: .4byte gLinkState +_0801A280: .4byte gPlayerState _0801A284: .4byte 0x00004074 _0801A288: ldr r0, _0801A29C @ =0x00004059 - ldr r1, _0801A2A0 @ =gLinkEntity + ldr r1, _0801A2A0 @ =gPlayerEntity _0801A28C: adds r1, #0x38 ldrb r2, [r1] @@ -1881,7 +1881,7 @@ _0801A28C: b _0801A2A6 .align 2, 0 _0801A29C: .4byte 0x00004059 -_0801A2A0: .4byte gLinkEntity +_0801A2A0: .4byte gPlayerEntity _0801A2A4: movs r0, #0 _0801A2A6: @@ -1898,13 +1898,13 @@ sub_0801A2B0: @ 0x0801A2B0 adds r4, r1, #0 adds r6, r2, #0 ldr r1, _0801A31C @ =gUnk_080B4488 - ldr r2, _0801A320 @ =gLinkEntity + ldr r2, _0801A320 @ =gPlayerEntity ldrb r0, [r2, #0x14] lsrs r0, r0, #1 lsls r0, r0, #1 adds r0, r0, r1 ldrh r3, [r0] - ldr r1, _0801A324 @ =gLinkState + ldr r1, _0801A324 @ =gPlayerState adds r0, r1, #0 adds r0, #0x35 ldrb r0, [r0] @@ -1946,8 +1946,8 @@ sub_0801A2B0: @ 0x0801A2B0 b _0801A32C .align 2, 0 _0801A31C: .4byte gUnk_080B4488 -_0801A320: .4byte gLinkEntity -_0801A324: .4byte gLinkState +_0801A320: .4byte gPlayerEntity +_0801A324: .4byte gPlayerState _0801A328: cmp r1, #0x74 beq _0801A36C @@ -1994,7 +1994,7 @@ sub_0801A370: @ 0x0801A370 push {r7} mov r8, r0 adds r4, r1, #0 - ldr r5, _0801A3C8 @ =gLinkEntity + ldr r5, _0801A3C8 @ =gPlayerEntity ldrb r1, [r5, #0x14] movs r0, #2 ands r0, r1 @@ -2032,7 +2032,7 @@ _0801A3C4: movs r0, #1 b _0801A450 .align 2, 0 -_0801A3C8: .4byte gLinkEntity +_0801A3C8: .4byte gPlayerEntity _0801A3CC: .4byte gUnk_080B4488 _0801A3D0: .4byte 0x0000402B _0801A3D4: @@ -2044,7 +2044,7 @@ _0801A3D6: ldrb r0, [r0] cmp r0, #0x46 beq _0801A44E - ldr r0, _0801A410 @ =gLinkEntity + ldr r0, _0801A410 @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] adds r0, r4, #0 @@ -2065,7 +2065,7 @@ _0801A3D6: b _0801A418 .align 2, 0 _0801A40C: .4byte 0x00001F84 -_0801A410: .4byte gLinkEntity +_0801A410: .4byte gPlayerEntity _0801A414: cmp r0, #0x74 beq _0801A44E @@ -2117,7 +2117,7 @@ sub_0801A458: @ 0x0801A458 adds r5, r1, #0 mov r8, r2 ldr r0, _0801A4A4 @ =gUnk_080B4488 - ldr r6, _0801A4A8 @ =gLinkEntity + ldr r6, _0801A4A8 @ =gPlayerEntity ldrb r1, [r6, #0x14] lsrs r1, r1, #1 lsls r1, r1, #1 @@ -2147,7 +2147,7 @@ sub_0801A458: @ 0x0801A458 b _0801A4B0 .align 2, 0 _0801A4A4: .4byte gUnk_080B4488 -_0801A4A8: .4byte gLinkEntity +_0801A4A8: .4byte gPlayerEntity _0801A4AC: cmp r0, #0x74 beq _0801A4F0 @@ -2192,7 +2192,7 @@ _0801A4F2: thumb_func_start sub_0801A4F8 sub_0801A4F8: @ 0x0801A4F8 push {r4, r5, lr} - ldr r4, _0801A538 @ =gLinkState + ldr r4, _0801A538 @ =gPlayerState ldr r0, [r4, #0x30] movs r5, #0x80 ands r0, r5 @@ -2207,7 +2207,7 @@ sub_0801A4F8: @ 0x0801A4F8 ands r0, r1 cmp r0, #0 bne _0801A564 - ldr r2, _0801A53C @ =gLinkEntity + ldr r2, _0801A53C @ =gPlayerEntity ldrb r0, [r2, #0x15] cmp r1, r0 bne _0801A564 @@ -2222,8 +2222,8 @@ sub_0801A4F8: @ 0x0801A4F8 ldrh r0, [r2, #0x2a] b _0801A55E .align 2, 0 -_0801A538: .4byte gLinkState -_0801A53C: .4byte gLinkEntity +_0801A538: .4byte gPlayerState +_0801A53C: .4byte gPlayerEntity _0801A540: .4byte gUnk_080B44A0 _0801A544: adds r0, r4, #0 @@ -2235,7 +2235,7 @@ _0801A544: ands r0, r1 cmp r0, #0 bne _0801A564 - ldr r0, _0801A568 @ =gLinkEntity + ldr r0, _0801A568 @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] movs r0, #1 @@ -2247,7 +2247,7 @@ _0801A564: movs r0, #0 b _0801A56E .align 2, 0 -_0801A568: .4byte gLinkEntity +_0801A568: .4byte gPlayerEntity _0801A56C: movs r0, #1 _0801A56E: @@ -2804,7 +2804,7 @@ _0801A97C: .4byte 0x0000FFFF thumb_func_start sub_0801A980 sub_0801A980: @ 0x0801A980 push {r4, r5, r6, r7, lr} - ldr r4, _0801A9E0 @ =gLinkEntity + ldr r4, _0801A9E0 @ =gPlayerEntity adds r6, r4, #0 adds r6, #0x38 ldrb r0, [r6] @@ -2850,7 +2850,7 @@ _0801A9DC: movs r0, #0 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0801A9E0: .4byte gLinkEntity +_0801A9E0: .4byte gPlayerEntity _0801A9E4: .4byte gUnk_080B44A8 _0801A9E8: .4byte gRoomControls _0801A9EC: .4byte 0x00003FFF @@ -2899,13 +2899,13 @@ _0801AA40: cmp r2, #0 beq _0801AA54 _0801AA44: - ldr r0, _0801AA50 @ =gLinkEntity + ldr r0, _0801AA50 @ =gPlayerEntity adds r1, r4, #0 adds r2, r3, #0 bl sub_0801AA58 b _0801AA56 .align 2, 0 -_0801AA50: .4byte gLinkEntity +_0801AA50: .4byte gPlayerEntity _0801AA54: movs r0, #0 _0801AA56: @@ -2974,7 +2974,7 @@ _0801AA94: adds r0, r4, #0 adds r0, #0x38 strb r1, [r0] - ldr r2, _0801AAFC @ =gLinkState + ldr r2, _0801AAFC @ =gPlayerState movs r0, #0xa0 strb r0, [r2, #6] movs r0, #5 @@ -2992,7 +2992,7 @@ _0801AA94: _0801AAF0: .4byte gUnk_080B4488 _0801AAF4: .4byte 0x00002004 _0801AAF8: .4byte gRoomControls -_0801AAFC: .4byte gLinkState +_0801AAFC: .4byte gPlayerState _0801AB00: movs r0, #0 _0801AB02: @@ -3936,7 +3936,7 @@ _0801B1E4: ldrb r0, [r4, #0xd] cmp r0, #1 bne _0801B204 - ldr r0, _0801B244 @ =gLinkState + ldr r0, _0801B244 @ =gPlayerState strb r1, [r0, #5] _0801B204: movs r0, #3 @@ -3968,7 +3968,7 @@ _0801B204: bl sub_0801B418 b _0801B24E .align 2, 0 -_0801B244: .4byte gLinkState +_0801B244: .4byte gPlayerState _0801B248: adds r0, r4, #0 bl sub_0801B3A4 @@ -4071,7 +4071,7 @@ _0801B2F6: _0801B2FA: movs r5, #0 _0801B2FC: - ldr r0, _0801B314 @ =gLinkState + ldr r0, _0801B314 @ =gPlayerState adds r0, #0x92 ldrh r0, [r0] ands r5, r0 @@ -4084,7 +4084,7 @@ _0801B2FC: _0801B310: pop {r4, r5, pc} .align 2, 0 -_0801B314: .4byte gLinkState +_0801B314: .4byte gPlayerState thumb_func_start sub_0801B318 sub_0801B318: @ 0x0801B318 @@ -4338,7 +4338,7 @@ _0801B4C4: .4byte 0xFFFFE000 sub_0801B4C8: @ 0x0801B4C8 push {r4, r5, lr} adds r4, r0, #0 - ldr r3, _0801B52C @ =gLinkState + ldr r3, _0801B52C @ =gPlayerState str r4, [r3, #0x2c] movs r2, #0 movs r0, #1 @@ -4354,7 +4354,7 @@ sub_0801B4C8: @ 0x0801B4C8 adds r1, #0x58 movs r0, #0xb strb r0, [r1] - ldr r5, _0801B534 @ =gLinkEntity + ldr r5, _0801B534 @ =gPlayerEntity str r5, [r4, #0x50] adds r0, r4, #0 adds r0, #0x86 @@ -4388,9 +4388,9 @@ _0801B518: movs r0, #0x3c b _0801B540 .align 2, 0 -_0801B52C: .4byte gLinkState +_0801B52C: .4byte gPlayerState _0801B530: .4byte gUnk_081271CC -_0801B534: .4byte gLinkEntity +_0801B534: .4byte gPlayerEntity _0801B538: movs r0, #0x80 lsls r0, r0, #2 @@ -4437,7 +4437,7 @@ sub_0801B584: @ 0x0801B584 push {r4, r5, r6, r7, lr} adds r6, r0, #0 bl sub_0801B804 - ldr r1, _0801B5F8 @ =gLinkState + ldr r1, _0801B5F8 @ =gPlayerState ldrb r0, [r1, #4] cmp r0, #0 beq _0801B5A8 @@ -4447,12 +4447,12 @@ sub_0801B584: @ 0x0801B584 ldr r0, [r1, #0x2c] cmp r0, r6 bne _0801B5B4 - ldr r0, _0801B5FC @ =gLinkEntity + ldr r0, _0801B5FC @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #1 beq _0801B5B8 _0801B5A8: - ldr r1, _0801B5F8 @ =gLinkState + ldr r1, _0801B5F8 @ =gPlayerState ldr r0, [r1, #0x2c] cmp r0, r6 bne _0801B5B4 @@ -4461,7 +4461,7 @@ _0801B5A8: _0801B5B4: bl DeleteThisEntity _0801B5B8: - ldr r7, _0801B5FC @ =gLinkEntity + ldr r7, _0801B5FC @ =gPlayerEntity adds r0, r7, #0 adds r0, #0x5a ldrb r1, [r0] @@ -4494,8 +4494,8 @@ _0801B5EE: bl sub_08078E84 b _0801B674 .align 2, 0 -_0801B5F8: .4byte gLinkState -_0801B5FC: .4byte gLinkEntity +_0801B5F8: .4byte gPlayerState +_0801B5FC: .4byte gPlayerEntity _0801B600: movs r5, #0 movs r0, #2 @@ -4549,7 +4549,7 @@ _0801B600: adds r0, r6, #0 movs r1, #0 bl InitializeAnimation - ldr r0, _0801B67C @ =gLinkState + ldr r0, _0801B67C @ =gPlayerState str r5, [r0, #0x2c] ldrb r1, [r0, #4] orrs r4, r1 @@ -4558,7 +4558,7 @@ _0801B674: pop {r4, r5, r6, r7, pc} .align 2, 0 _0801B678: .4byte gUnk_080B7826 -_0801B67C: .4byte gLinkState +_0801B67C: .4byte gPlayerState thumb_func_start sub_0801B680 sub_0801B680: @ 0x0801B680 @@ -4575,7 +4575,7 @@ sub_0801B680: @ 0x0801B680 ldrb r0, [r0] cmp r0, #0 bne _0801B6DC - ldr r3, _0801B6C4 @ =gLinkState + ldr r3, _0801B6C4 @ =gPlayerState ldrb r1, [r3, #0xd] movs r0, #0x80 ands r0, r1 @@ -4596,7 +4596,7 @@ sub_0801B680: @ 0x0801B680 adds r0, #0x40 b _0801B6D0 .align 2, 0 -_0801B6C4: .4byte gLinkState +_0801B6C4: .4byte gPlayerState _0801B6C8: adds r1, r4, #0 adds r1, #0x82 @@ -4642,7 +4642,7 @@ _0801B6FE: ands r1, r3 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _0801B784 @ =gLinkEntity + ldr r1, _0801B784 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] movs r2, #0x80 @@ -4694,7 +4694,7 @@ _0801B76C: b _0801B792 .align 2, 0 _0801B780: .4byte gRoomControls -_0801B784: .4byte gLinkEntity +_0801B784: .4byte gPlayerEntity _0801B788: .4byte gUnk_08003E44 _0801B78C: movs r0, #0xc @@ -4739,7 +4739,7 @@ _0801B7BC: adds r0, #8 strh r0, [r5, #0x24] _0801B7D4: - ldr r4, _0801B800 @ =gLinkEntity + ldr r4, _0801B800 @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 bl GetFacingDirection @@ -4758,7 +4758,7 @@ _0801B7FA: pop {r4, r5, pc} .align 2, 0 _0801B7FC: .4byte 0x0000027F -_0801B800: .4byte gLinkEntity +_0801B800: .4byte gPlayerEntity thumb_func_start sub_0801B804 sub_0801B804: @ 0x0801B804 @@ -4782,7 +4782,7 @@ _0801B820: _0801B824: movs r4, #0 _0801B826: - ldr r3, _0801B850 @ =gLinkState + ldr r3, _0801B850 @ =gPlayerState adds r0, r3, #0 adds r0, #0x90 ldrh r0, [r0] @@ -4803,7 +4803,7 @@ _0801B826: strb r1, [r3, #0xb] b _0801B862 .align 2, 0 -_0801B850: .4byte gLinkState +_0801B850: .4byte gPlayerState _0801B854: ldrb r1, [r3, #0xa] movs r0, #0x80 @@ -4860,7 +4860,7 @@ _0801B8AC: .4byte gUnk_080B7840 sub_0801B8B0: @ 0x0801B8B0 push {r4, lr} adds r4, r0, #0 - ldr r1, _0801B8F0 @ =gLinkState + ldr r1, _0801B8F0 @ =gPlayerState ldrb r0, [r1, #0x1e] cmp r0, #0 beq _0801B8F4 @@ -4887,7 +4887,7 @@ sub_0801B8B0: @ 0x0801B8B0 bl sub_0801B8FC b _0801B8F8 .align 2, 0 -_0801B8F0: .4byte gLinkState +_0801B8F0: .4byte gPlayerState _0801B8F4: bl DeleteThisEntity _0801B8F8: @@ -4897,14 +4897,14 @@ _0801B8F8: thumb_func_start sub_0801B8FC sub_0801B8FC: @ 0x0801B8FC push {lr} - ldr r1, _0801B90C @ =gLinkState + ldr r1, _0801B90C @ =gPlayerState ldr r2, [r1, #0x2c] cmp r2, r0 beq _0801B910 bl DeleteThisEntity b _0801B934 .align 2, 0 -_0801B90C: .4byte gLinkState +_0801B90C: .4byte gPlayerState _0801B910: ldrb r0, [r1, #0x1e] cmp r0, #0 @@ -4936,7 +4936,7 @@ sub_0801B938: @ 0x0801B938 ands r0, r1 cmp r0, #0 beq _0801B960 - ldr r3, _0801B95C @ =gLinkEntity + ldr r3, _0801B95C @ =gPlayerEntity ldrb r1, [r3, #0x18] lsls r1, r1, #0x19 lsrs r1, r1, #0x1f @@ -4947,9 +4947,9 @@ sub_0801B938: @ 0x0801B938 subs r0, #0x42 b _0801B96E .align 2, 0 -_0801B95C: .4byte gLinkEntity +_0801B95C: .4byte gPlayerEntity _0801B960: - ldr r3, _0801B998 @ =gLinkEntity + ldr r3, _0801B998 @ =gPlayerEntity ldrb r0, [r3, #0x18] movs r1, #0x40 ands r1, r0 @@ -4977,7 +4977,7 @@ _0801B96E: bl sub_080042D0 b _0801B9A0 .align 2, 0 -_0801B998: .4byte gLinkEntity +_0801B998: .4byte gPlayerEntity _0801B99C: movs r0, #0xff strb r0, [r4, #0x1e] @@ -4991,7 +4991,7 @@ _0801B9A0: lsls r3, r3, #1 ldr r0, _0801B9E4 @ =gUnk_080B7848 adds r3, r3, r0 - ldr r0, _0801B9E8 @ =gLinkState + ldr r0, _0801B9E8 @ =gPlayerState adds r0, #0xac ldrh r0, [r0] movs r1, #8 @@ -5007,15 +5007,15 @@ _0801B9A0: asrs r3, r3, #0x18 adds r0, r4, #0 bl sub_08008782 - ldr r1, _0801B9EC @ =gLinkEntity + ldr r1, _0801B9EC @ =gPlayerEntity adds r0, r4, #0 bl sub_08078E84 pop {r4, pc} .align 2, 0 _0801B9E0: .4byte gUnk_080B7850 _0801B9E4: .4byte gUnk_080B7848 -_0801B9E8: .4byte gLinkState -_0801B9EC: .4byte gLinkEntity +_0801B9E8: .4byte gPlayerState +_0801B9EC: .4byte gPlayerEntity thumb_func_start sub_0801B9F0 sub_0801B9F0: @ 0x0801B9F0 @@ -5100,7 +5100,7 @@ _0801BA9C: movs r0, #0x80 orrs r0, r1 strb r0, [r4, #0x10] - ldr r1, _0801BAF4 @ =gLinkEntity + ldr r1, _0801BAF4 @ =gPlayerEntity adds r0, r1, #0 adds r0, #0x3c ldrb r0, [r0] @@ -5133,7 +5133,7 @@ _0801BA9C: bl PlaySFX b _0801BB0A .align 2, 0 -_0801BAF4: .4byte gLinkEntity +_0801BAF4: .4byte gPlayerEntity _0801BAF8: movs r0, #0xd5 strb r0, [r4, #0xe] @@ -5150,7 +5150,7 @@ _0801BB0A: strb r0, [r4, #0xc] movs r0, #0xff strb r0, [r4, #0x1e] - ldr r0, _0801BB28 @ =gLinkState + ldr r0, _0801BB28 @ =gPlayerState str r4, [r0, #0x2c] adds r0, r4, #0 movs r1, #1 @@ -5161,13 +5161,13 @@ _0801BB0A: _0801BB26: pop {r4, pc} .align 2, 0 -_0801BB28: .4byte gLinkState +_0801BB28: .4byte gPlayerState thumb_func_start sub_0801BB2C sub_0801BB2C: @ 0x0801BB2C push {r4, r5, lr} adds r5, r0, #0 - ldr r0, _0801BB88 @ =gLinkState + ldr r0, _0801BB88 @ =gPlayerState ldr r0, [r0, #0x2c] cmp r0, r5 beq _0801BB68 @@ -5193,7 +5193,7 @@ sub_0801BB2C: @ 0x0801BB2C _0801BB64: bl DeleteThisEntity _0801BB68: - ldr r1, _0801BB90 @ =gLinkEntity + ldr r1, _0801BB90 @ =gPlayerEntity adds r0, r5, #0 bl sub_0801BDE8 adds r0, r5, #0 @@ -5208,9 +5208,9 @@ _0801BB68: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801BB88: .4byte gLinkState +_0801BB88: .4byte gPlayerState _0801BB8C: .4byte 0x00000109 -_0801BB90: .4byte gLinkEntity +_0801BB90: .4byte gPlayerEntity _0801BB94: .4byte _0801BB98 _0801BB98: @ jump table .4byte _0801BBE0 @ case 0 @@ -5236,7 +5236,7 @@ _0801BBE0: bl sub_0801BC0C b _0801BC0A _0801BBE8: - ldr r0, _0801BC00 @ =gLinkEntity + ldr r0, _0801BC00 @ =gPlayerEntity adds r1, r0, #0 adds r1, #0x5a ldrb r0, [r1] @@ -5248,7 +5248,7 @@ _0801BBE8: bl sub_0801BC14 b _0801BC0A .align 2, 0 -_0801BC00: .4byte gLinkEntity +_0801BC00: .4byte gPlayerEntity _0801BC04: adds r0, r5, #0 bl sub_0801BCB4 @@ -5337,7 +5337,7 @@ _0801BCB0: .4byte gUnk_02002A40 sub_0801BCB4: @ 0x0801BCB4 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _0801BCEC @ =gLinkEntity + ldr r0, _0801BCEC @ =gPlayerEntity adds r0, #0x5a ldrb r0, [r0] cmp r0, #1 @@ -5364,7 +5364,7 @@ _0801BCDA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801BCEC: .4byte gLinkEntity +_0801BCEC: .4byte gPlayerEntity _0801BCF0: .4byte _0801BCF4 _0801BCF4: @ jump table .4byte _0801BD24 @ case 0 @@ -5415,7 +5415,7 @@ _0801BD54: ldr r0, _0801BD8C @ =0x000001CF bl PlaySFX _0801BD6C: - ldr r0, _0801BD90 @ =gLinkEntity + ldr r0, _0801BD90 @ =gPlayerEntity adds r0, #0x5a ldrb r0, [r0] cmp r0, #2 @@ -5431,7 +5431,7 @@ _0801BD6C: .align 2, 0 _0801BD88: .4byte gUnk_02002A40 _0801BD8C: .4byte 0x000001CF -_0801BD90: .4byte gLinkEntity +_0801BD90: .4byte gPlayerEntity _0801BD94: adds r0, r4, #0 movs r1, #0x68 @@ -5446,7 +5446,7 @@ _0801BDA2: movs r3, #1 bl CreateObjectWithParent _0801BDAE: - ldr r0, _0801BDC8 @ =gLinkEntity + ldr r0, _0801BDC8 @ =gPlayerEntity adds r0, #0x5a ldrb r0, [r0] cmp r0, #3 @@ -5460,7 +5460,7 @@ _0801BDAE: beq _0801BDDA b _0801BDE6 .align 2, 0 -_0801BDC8: .4byte gLinkEntity +_0801BDC8: .4byte gPlayerEntity _0801BDCC: adds r0, r4, #0 movs r1, #0x68 @@ -5511,12 +5511,12 @@ _0801BE0A: ands r0, r2 orrs r0, r1 strb r0, [r4, #0x18] - ldr r1, _0801BE34 @ =gLinkEntity + ldr r1, _0801BE34 @ =gPlayerEntity adds r0, r4, #0 bl sub_08078E84 pop {r4, r5, pc} .align 2, 0 -_0801BE34: .4byte gLinkEntity +_0801BE34: .4byte gPlayerEntity thumb_func_start sub_0801BE38 sub_0801BE38: @ 0x0801BE38 @@ -5575,7 +5575,7 @@ _0801BE8C: ldr r1, [r4, #0x48] ldrb r0, [r2, #3] strb r0, [r1, #7] - ldr r0, _0801BEF0 @ =gLinkEntity + ldr r0, _0801BEF0 @ =gPlayerEntity adds r0, #0x5a ldrb r0, [r0] movs r1, #0xf @@ -5611,7 +5611,7 @@ _0801BEDE: cmp r0, #0x20 beq _0801BEEE _0801BEE4: - ldr r2, _0801BEF0 @ =gLinkEntity + ldr r2, _0801BEF0 @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x7f ands r0, r1 @@ -5619,5 +5619,5 @@ _0801BEE4: _0801BEEE: pop {r4, pc} .align 2, 0 -_0801BEF0: .4byte gLinkEntity +_0801BEF0: .4byte gPlayerEntity _0801BEF4: .4byte gUnk_080B7878 \ No newline at end of file diff --git a/asm/code_0801C85C.s b/asm/code_0801C85C.s index 61848c56..bd6022ca 100644 --- a/asm/code_0801C85C.s +++ b/asm/code_0801C85C.s @@ -16,7 +16,7 @@ sub_0801C85C: @ 0x0801C85C ands r0, r1 cmp r0, #0 bne _0801C878 - ldr r0, _0801C888 @ =gLinkState + ldr r0, _0801C888 @ =gPlayerState adds r0, #0xa0 ldrb r1, [r0] rsbs r0, r1, #0 @@ -29,7 +29,7 @@ _0801C878: b _0801C984 .align 2, 0 _0801C884: .4byte gUnk_0200AF00 -_0801C888: .4byte gLinkState +_0801C888: .4byte gPlayerState _0801C88C: ldrb r0, [r5, #4] ldr r4, _0801C92C @ =gUnk_02034D30 @@ -37,7 +37,7 @@ _0801C88C: bls _0801C896 adds r4, #0x40 _0801C896: - ldr r0, _0801C930 @ =gLinkState + ldr r0, _0801C930 @ =gPlayerState adds r0, #0xa4 movs r1, #0 ldrsh r0, [r0, r1] @@ -100,7 +100,7 @@ _0801C90C: ldr r0, _0801C94C @ =gScreen strh r6, [r0, #0xe] _0801C910: - ldr r0, _0801C930 @ =gLinkState + ldr r0, _0801C930 @ =gPlayerState adds r0, #0xa0 ldrb r0, [r0] cmp r0, #5 @@ -116,7 +116,7 @@ _0801C910: b _0801C956 .align 2, 0 _0801C92C: .4byte gUnk_02034D30 -_0801C930: .4byte gLinkState +_0801C930: .4byte gPlayerState _0801C934: .4byte 0x0000F016 _0801C938: .4byte 0x0000F416 _0801C93C: .4byte 0x040000D4 diff --git a/asm/code_08049CD4.s b/asm/code_08049CD4.s index 18f22491..3d3a0085 100644 --- a/asm/code_08049CD4.s +++ b/asm/code_08049CD4.s @@ -183,7 +183,7 @@ _08049E14: .4byte gUnk_080D3BE8 thumb_func_start sub_08049E18 sub_08049E18: @ 0x08049E18 push {lr} - ldr r1, _08049E38 @ =gLinkState + ldr r1, _08049E38 @ =gPlayerState adds r0, r1, #0 adds r0, #0x3c ldrb r0, [r0] @@ -195,14 +195,14 @@ sub_08049E18: @ 0x08049E18 cmp r0, #0 bne _08049E48 ldr r1, _08049E40 @ =gUnk_020000B0 - ldr r0, _08049E44 @ =gLinkEntity + ldr r0, _08049E44 @ =gPlayerEntity str r0, [r1] b _08049E4A .align 2, 0 -_08049E38: .4byte gLinkState +_08049E38: .4byte gPlayerState _08049E3C: .4byte 0x22189B75 _08049E40: .4byte gUnk_020000B0 -_08049E44: .4byte gLinkEntity +_08049E44: .4byte gPlayerEntity _08049E48: movs r0, #0 _08049E4A: @@ -211,7 +211,7 @@ _08049E4A: thumb_func_start sub_08049E4C sub_08049E4C: @ 0x08049E4C push {lr} - ldr r1, _08049E6C @ =gLinkState + ldr r1, _08049E6C @ =gPlayerState adds r0, r1, #0 adds r0, #0x3c ldrb r0, [r0] @@ -223,14 +223,14 @@ sub_08049E4C: @ 0x08049E4C cmp r0, #0 bne _08049E7C ldr r1, _08049E74 @ =gUnk_020000B0 - ldr r0, _08049E78 @ =gLinkEntity + ldr r0, _08049E78 @ =gPlayerEntity str r0, [r1] b _08049E7E .align 2, 0 -_08049E6C: .4byte gLinkState +_08049E6C: .4byte gPlayerState _08049E70: .4byte 0x22189BF5 _08049E74: .4byte gUnk_020000B0 -_08049E78: .4byte gLinkEntity +_08049E78: .4byte gPlayerEntity _08049E7C: movs r0, #0 _08049E7E: @@ -239,7 +239,7 @@ _08049E7E: thumb_func_start sub_08049E80 sub_08049E80: @ 0x08049E80 push {lr} - ldr r1, _08049E9C @ =gLinkState + ldr r1, _08049E9C @ =gPlayerState adds r0, r1, #0 adds r0, #0x3c ldrb r0, [r0] @@ -254,21 +254,21 @@ _08049E98: movs r0, #0 b _08049EA6 .align 2, 0 -_08049E9C: .4byte gLinkState +_08049E9C: .4byte gPlayerState _08049EA0: ldr r1, _08049EA8 @ =gUnk_020000B0 - ldr r0, _08049EAC @ =gLinkEntity + ldr r0, _08049EAC @ =gPlayerEntity str r0, [r1] _08049EA6: pop {pc} .align 2, 0 _08049EA8: .4byte gUnk_020000B0 -_08049EAC: .4byte gLinkEntity +_08049EAC: .4byte gPlayerEntity thumb_func_start sub_08049EB0 sub_08049EB0: @ 0x08049EB0 push {lr} - ldr r1, _08049ED0 @ =gLinkState + ldr r1, _08049ED0 @ =gPlayerState adds r0, r1, #0 adds r0, #0x3c ldrb r0, [r0] @@ -280,14 +280,14 @@ sub_08049EB0: @ 0x08049EB0 cmp r0, #0 bne _08049EE0 ldr r1, _08049ED8 @ =gUnk_020000B0 - ldr r0, _08049EDC @ =gLinkEntity + ldr r0, _08049EDC @ =gPlayerEntity str r0, [r1] b _08049EE2 .align 2, 0 -_08049ED0: .4byte gLinkState +_08049ED0: .4byte gPlayerState _08049ED4: .4byte 0x00080190 _08049ED8: .4byte gUnk_020000B0 -_08049EDC: .4byte gLinkEntity +_08049EDC: .4byte gPlayerEntity _08049EE0: movs r0, #0 _08049EE2: diff --git a/asm/code_08050038.s b/asm/code_08050038.s index 6a621a70..23d50993 100644 --- a/asm/code_08050038.s +++ b/asm/code_08050038.s @@ -3399,7 +3399,7 @@ _08051C60: .4byte gTextBox _08051C64: .4byte gUnk_03003DC0 _08051C68: .4byte gRoomControls _08051C6C: - ldr r0, _08051C80 @ =gLinkState + ldr r0, _08051C80 @ =gPlayerState movs r1, #0x17 strb r1, [r0, #0xc] ldr r0, _08051C84 @ =gUnk_03001000 @@ -3408,10 +3408,10 @@ _08051C6C: bl sub_08051D98 b _08051C9C .align 2, 0 -_08051C80: .4byte gLinkState +_08051C80: .4byte gPlayerState _08051C84: .4byte gUnk_03001000 _08051C88: - ldr r1, _08051CA0 @ =gLinkState + ldr r1, _08051CA0 @ =gPlayerState movs r0, #0x17 strb r0, [r1, #0xc] ldr r1, _08051CA4 @ =gUnk_03001000 @@ -3422,7 +3422,7 @@ _08051C88: _08051C9C: pop {pc} .align 2, 0 -_08051CA0: .4byte gLinkState +_08051CA0: .4byte gPlayerState _08051CA4: .4byte gUnk_03001000 thumb_func_start sub_08051CA8 @@ -3496,7 +3496,7 @@ InitializeEntities: @ 0x08051D40 bl sub_08052EA0 bl sub_0804AF90 bl sub_0804AFDC - bl InitializeLink + bl InitializePlayer ldr r1, _08051D90 @ =gUnk_03004030 movs r0, #0 str r0, [r1] @@ -3571,7 +3571,7 @@ sub_08051E04: @ 0x08051E04 bl sub_08052620 cmp r0, #0 beq _08051E60 - ldr r1, _08051E2C @ =gLinkEntity + ldr r1, _08051E2C @ =gPlayerEntity movs r2, #0x2e ldrsh r0, [r1, r2] cmp r0, #0 @@ -3589,7 +3589,7 @@ _08051E26: ldr r3, _08051E30 @ =gUnk_08127F94 b _08051E36 .align 2, 0 -_08051E2C: .4byte gLinkEntity +_08051E2C: .4byte gPlayerEntity _08051E30: .4byte gUnk_08127F94 _08051E34: adds r3, #8 diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 81b19e6a..cc33cc77 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -298,7 +298,7 @@ sub_0805291C: @ 0x0805291C ldrb r0, [r0] cmp r0, #0 beq _080529F4 - ldr r0, _08052950 @ =gLinkState + ldr r0, _08052950 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] cmp r0, #0x12 @@ -312,7 +312,7 @@ sub_0805291C: @ 0x0805291C .align 2, 0 _08052948: .4byte gScreenTransition _0805294C: .4byte gUnk_02002A40 -_08052950: .4byte gLinkState +_08052950: .4byte gPlayerState _08052954: ldrb r0, [r4, #9] subs r0, #1 @@ -400,7 +400,7 @@ sub_080529F8: @ 0x080529F8 ldrh r0, [r2] cmp r0, #0 beq _08052A48 - ldr r3, _08052A3C @ =gLinkState + ldr r3, _08052A3C @ =gPlayerState movs r6, #0 movs r0, #0x39 adds r0, r0, r3 @@ -428,7 +428,7 @@ _08052A30: .align 2, 0 _08052A34: .4byte gScreenTransition _08052A38: .4byte gUnk_080FCAD6 -_08052A3C: .4byte gLinkState +_08052A3C: .4byte gPlayerState _08052A40: adds r2, #4 ldrh r0, [r2] @@ -445,7 +445,7 @@ sub_08052A4C: @ 0x08052A4C ldr r2, _08052A88 @ =gScreenTransition movs r0, #1 strb r0, [r2, #8] - ldr r5, _08052A8C @ =gLinkEntity + ldr r5, _08052A8C @ =gPlayerEntity ldr r3, _08052A90 @ =gRoomControls ldrh r0, [r5, #0x2e] ldrh r1, [r3, #6] @@ -472,7 +472,7 @@ sub_08052A4C: @ 0x08052A4C pop {r4, r5, pc} .align 2, 0 _08052A88: .4byte gScreenTransition -_08052A8C: .4byte gLinkEntity +_08052A8C: .4byte gPlayerEntity _08052A90: .4byte gRoomControls thumb_func_start sub_08052A94 @@ -552,7 +552,7 @@ sub_08052B24: @ 0x08052B24 ands r0, r1 cmp r0, #0 beq _08052B8A - ldr r2, _08052B94 @ =gLinkState + ldr r2, _08052B94 @ =gPlayerState adds r0, r2, #0 adds r0, #0x8b ldrb r0, [r0] @@ -580,7 +580,7 @@ sub_08052B24: @ 0x08052B24 ldr r0, [r2, #0x2c] cmp r0, #0 bne _08052B8A - ldr r1, _08052BA0 @ =gLinkEntity + ldr r1, _08052BA0 @ =gPlayerEntity adds r0, r1, #0 adds r0, #0x7a ldrh r0, [r0] @@ -601,10 +601,10 @@ _08052B8A: b _08052BB4 .align 2, 0 _08052B90: .4byte gUnk_03000FF0 -_08052B94: .4byte gLinkState +_08052B94: .4byte gPlayerState _08052B98: .4byte gUnk_02034490 _08052B9C: .4byte gUnk_0200AF00 -_08052BA0: .4byte gLinkEntity +_08052BA0: .4byte gPlayerEntity _08052BA4: bl sub_0801862C movs r0, #0x13 @@ -625,7 +625,7 @@ sub_08052BB8: @ 0x08052BB8 adds r3, r0, #0 cmp r1, #0 bne _08052BEC - ldr r0, _08052BE4 @ =gLinkEntity + ldr r0, _08052BE4 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r0, r2] ldr r0, _08052BE8 @ =gRoomControls @@ -639,7 +639,7 @@ sub_08052BB8: @ 0x08052BB8 b _08052BEE .align 2, 0 _08052BE0: .4byte gScreenTransition -_08052BE4: .4byte gLinkEntity +_08052BE4: .4byte gPlayerEntity _08052BE8: .4byte gRoomControls _08052BEC: ldrb r2, [r2] @@ -714,7 +714,7 @@ sub_08052C5C: @ 0x08052C5C cmp r0, #0 beq _08052C84 ldr r2, _08052C7C @ =gScreenTransition - ldr r1, _08052C80 @ =gLinkEntity + ldr r1, _08052C80 @ =gPlayerEntity ldrh r0, [r1, #0x2e] strh r0, [r2, #0x20] ldrh r0, [r1, #0x32] @@ -722,13 +722,13 @@ sub_08052C5C: @ 0x08052C5C b _08052C98 .align 2, 0 _08052C7C: .4byte gScreenTransition -_08052C80: .4byte gLinkEntity +_08052C80: .4byte gPlayerEntity _08052C84: bl CheckIsDungeon cmp r0, #0 beq _08052C98 ldr r2, _08052C9C @ =gScreenTransition - ldr r1, _08052CA0 @ =gLinkEntity + ldr r1, _08052CA0 @ =gPlayerEntity ldrh r0, [r1, #0x2e] strh r0, [r2, #0x1c] ldrh r0, [r1, #0x32] @@ -737,7 +737,7 @@ _08052C98: pop {pc} .align 2, 0 _08052C9C: .4byte gScreenTransition -_08052CA0: .4byte gLinkEntity +_08052CA0: .4byte gPlayerEntity thumb_func_start sub_08052CA4 sub_08052CA4: @ 0x08052CA4 @@ -1418,8 +1418,8 @@ _080531F4: .4byte gUnk_02002AA0 thumb_func_start sub_080531F8 sub_080531F8: @ 0x080531F8 push {r4, r5, lr} - ldr r1, _0805323C @ =gLinkState - ldr r4, _08053240 @ =gLinkEntity + ldr r1, _0805323C @ =gPlayerState + ldr r4, _08053240 @ =gPlayerEntity ldrh r0, [r4, #0x2e] strh r0, [r1, #0x16] ldrh r0, [r4, #0x32] @@ -1449,8 +1449,8 @@ sub_080531F8: @ 0x080531F8 _08053238: pop {r4, r5, pc} .align 2, 0 -_0805323C: .4byte gLinkState -_08053240: .4byte gLinkEntity +_0805323C: .4byte gPlayerState +_08053240: .4byte gPlayerEntity _08053244: .4byte gUnk_030010AC _08053248: .4byte gUnk_02002AC8 _0805324C: .4byte gRoomControls @@ -1461,7 +1461,7 @@ sub_08053250: @ 0x08053250 ldr r0, _0805328C @ =gScreenTransition movs r1, #0 strb r1, [r0, #0xf] - ldr r3, _08053290 @ =gLinkEntity + ldr r3, _08053290 @ =gPlayerEntity ldr r4, _08053294 @ =gRoomControls ldrh r1, [r3, #0x2e] ldrh r2, [r4, #6] @@ -1487,7 +1487,7 @@ sub_08053250: @ 0x08053250 pop {r4, pc} .align 2, 0 _0805328C: .4byte gScreenTransition -_08053290: .4byte gLinkEntity +_08053290: .4byte gPlayerEntity _08053294: .4byte gRoomControls _08053298: .4byte gUnk_02002AC8 diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s index 960c0bf3..0272467d 100644 --- a/asm/code_0805436C.s +++ b/asm/code_0805436C.s @@ -252,7 +252,7 @@ sub_08054A60: @ 0x08054A60 subs r1, #1 movs r0, #0x80 strb r0, [r1] - ldr r0, _08054AC4 @ =gLinkEntity + ldr r0, _08054AC4 @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r0, #0xe ands r0, r1 @@ -273,13 +273,13 @@ _08054AAC: bl sub_08054AC8 pop {r4, pc} .align 2, 0 -_08054AC4: .4byte gLinkEntity +_08054AC4: .4byte gPlayerEntity thumb_func_start sub_08054AC8 sub_08054AC8: @ 0x08054AC8 push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r5, _08054B14 @ =gLinkEntity + ldr r5, _08054B14 @ =gPlayerEntity ldrb r1, [r5, #0x14] movs r0, #0xe ands r0, r1 @@ -317,7 +317,7 @@ _08054B06: strb r0, [r4, #0x10] b _08054B68 .align 2, 0 -_08054B14: .4byte gLinkEntity +_08054B14: .4byte gPlayerEntity _08054B18: .4byte gUnk_080FEEB0 _08054B1C: ldrb r0, [r4, #0x10] @@ -366,7 +366,7 @@ _08054B68: ldrb r0, [r4, #0x1e] cmp r0, #0xff beq _08054BE8 - ldr r0, _08054BF4 @ =gLinkEntity + ldr r0, _08054BF4 @ =gPlayerEntity ldrb r0, [r0, #0x18] lsls r0, r0, #0x1e cmp r0, #0 @@ -421,12 +421,12 @@ _08054B68: adds r0, #0x63 strb r1, [r0] _08054BE8: - ldr r1, _08054BF4 @ =gLinkEntity + ldr r1, _08054BF4 @ =gPlayerEntity adds r0, r4, #0 bl sub_08078E84 b _08054C00 .align 2, 0 -_08054BF4: .4byte gLinkEntity +_08054BF4: .4byte gPlayerEntity _08054BF8: .4byte gUnk_080FEEB0 _08054BFC: bl DeleteThisEntity diff --git a/asm/code_0805E3B0.s b/asm/code_0805E3B0.s index f7c384c4..9b1b8201 100644 --- a/asm/code_0805E3B0.s +++ b/asm/code_0805E3B0.s @@ -252,7 +252,7 @@ sub_0805E544: @ 0x0805E544 movs r3, #6 movs r0, #6 strb r0, [r1] - ldr r2, _0805E560 @ =gLinkEntity + ldr r2, _0805E560 @ =gPlayerEntity ldrb r1, [r2, #0x11] subs r0, #0x16 ands r0, r1 @@ -261,14 +261,14 @@ sub_0805E544: @ 0x0805E544 bx lr .align 2, 0 _0805E55C: .4byte gUnk_03003DC0 -_0805E560: .4byte gLinkEntity +_0805E560: .4byte gPlayerEntity thumb_func_start UnfreezeTime UnfreezeTime: @ 0x0805E564 ldr r1, _0805E57C @ =gUnk_03003DC0 movs r0, #0 strb r0, [r1] - ldr r2, _0805E580 @ =gLinkEntity + ldr r2, _0805E580 @ =gPlayerEntity ldrb r1, [r2, #0x11] subs r0, #0x10 ands r0, r1 @@ -278,7 +278,7 @@ UnfreezeTime: @ 0x0805E564 bx lr .align 2, 0 _0805E57C: .4byte gUnk_03003DC0 -_0805E580: .4byte gLinkEntity +_0805E580: .4byte gPlayerEntity thumb_func_start sub_0805E584 sub_0805E584: @ 0x0805E584 @@ -361,7 +361,7 @@ EraseAllEntities: @ 0x0805E60C ldr r0, _0805E654 @ =gUnk_03003DC0 movs r1, #0xc bl _DmaZero - ldr r0, _0805E658 @ =gLinkEntity + ldr r0, _0805E658 @ =gPlayerEntity movs r1, #0xaa lsls r1, r1, #6 bl _DmaZero @@ -389,7 +389,7 @@ EraseAllEntities: @ 0x0805E60C pop {pc} .align 2, 0 _0805E654: .4byte gUnk_03003DC0 -_0805E658: .4byte gLinkEntity +_0805E658: .4byte gPlayerEntity _0805E65C: .4byte gUnk_02033290 _0805E660: .4byte gUnk_03003DBC _0805E664: .4byte gUnk_020354B4 diff --git a/asm/code_0805EC04.s b/asm/code_0805EC04.s index 2dc3e2e7..1df1ae7b 100644 --- a/asm/code_0805EC04.s +++ b/asm/code_0805EC04.s @@ -152,7 +152,7 @@ _0805ED10: .4byte 0x00000427 thumb_func_start sub_0805ED14 sub_0805ED14: @ 0x0805ED14 - ldr r2, _0805ED2C @ =gLinkState + ldr r2, _0805ED2C @ =gPlayerState adds r1, r2, #0 adds r1, #0x9c str r0, [r1] @@ -164,12 +164,12 @@ sub_0805ED14: @ 0x0805ED14 strh r1, [r0] bx lr .align 2, 0 -_0805ED2C: .4byte gLinkState +_0805ED2C: .4byte gPlayerState thumb_func_start sub_0805ED30 sub_0805ED30: @ 0x0805ED30 push {r4, lr} - ldr r2, _0805ED50 @ =gLinkState + ldr r2, _0805ED50 @ =gPlayerState adds r0, r2, #0 adds r0, #0x9c ldr r0, [r0] @@ -185,7 +185,7 @@ sub_0805ED30: @ 0x0805ED30 movs r4, #0 b _0805ED62 .align 2, 0 -_0805ED50: .4byte gLinkState +_0805ED50: .4byte gPlayerState _0805ED54: cmp r0, #2 beq _0805ED5E @@ -258,7 +258,7 @@ _0805EDC6: _0805EDCA: adds r0, r1, #0 bl sub_0805EE04 - ldr r3, _0805EDFC @ =gLinkState + ldr r3, _0805EDFC @ =gPlayerState adds r1, r3, #0 adds r1, #0x90 ldrh r2, [r1] @@ -279,7 +279,7 @@ _0805EDCA: pop {r4, pc} .align 2, 0 _0805EDF8: .4byte gUnk_03000FF0 -_0805EDFC: .4byte gLinkState +_0805EDFC: .4byte gPlayerState _0805EE00: .4byte gUnk_08109202 thumb_func_start sub_0805EE04 @@ -2110,7 +2110,7 @@ _0805FBE4: .4byte gUnk_08109AC8 sub_0805FBE8: @ 0x0805FBE8 push {r4, r5, lr} adds r5, r0, #0 - ldr r4, _0805FC68 @ =gLinkEntity + ldr r4, _0805FC68 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 bl CopyPosition @@ -2167,7 +2167,7 @@ _0805FC36: bl PlaySFX pop {r4, r5, pc} .align 2, 0 -_0805FC68: .4byte gLinkEntity +_0805FC68: .4byte gPlayerEntity _0805FC6C: .4byte gUnk_08109AD0 _0805FC70: .4byte 0x0000013F @@ -2211,7 +2211,7 @@ _0805FCA4: ands r1, r3 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _0805FD14 @ =gLinkEntity + ldr r1, _0805FD14 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] movs r2, #0x80 @@ -2246,7 +2246,7 @@ _0805FCF6: b _0805FD20 .align 2, 0 _0805FD10: .4byte gRoomControls -_0805FD14: .4byte gLinkEntity +_0805FD14: .4byte gPlayerEntity _0805FD18: .4byte gUnk_08003E44 _0805FD1C: bl DeleteThisEntity diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index 6efd6e68..c5e24be4 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -13,7 +13,7 @@ sub_0806ED78: @ 0x0806ED78 adds r4, r0, #0 cmp r4, #0 beq _0806ED94 - ldr r0, _0806ED98 @ =gLinkState + ldr r0, _0806ED98 @ =gPlayerState ldrb r1, [r0, #0x1e] movs r0, #0x40 ands r0, r1 @@ -24,7 +24,7 @@ _0806ED94: adds r0, r4, #0 pop {r4, pc} .align 2, 0 -_0806ED98: .4byte gLinkState +_0806ED98: .4byte gPlayerState thumb_func_start sub_0806ED9C sub_0806ED9C: @ 0x0806ED9C @@ -34,7 +34,7 @@ sub_0806ED9C: @ 0x0806ED9C adds r3, r2, #0 movs r6, #1 rsbs r6, r6, #0 - ldr r1, _0806EDC0 @ =gLinkEntity + ldr r1, _0806EDC0 @ =gPlayerEntity adds r2, r4, #0 bl sub_080041A0 cmp r0, #0 @@ -46,17 +46,17 @@ _0806EDBC: adds r0, r6, #0 pop {r4, r5, r6, pc} .align 2, 0 -_0806EDC0: .4byte gLinkEntity +_0806EDC0: .4byte gPlayerEntity thumb_func_start GetAnimationState GetAnimationState: @ 0x0806EDC4 push {lr} - ldr r1, _0806EDD4 @ =gLinkEntity + ldr r1, _0806EDD4 @ =gPlayerEntity bl GetFacingDirection bl sub_0806F5A4 pop {pc} .align 2, 0 -_0806EDD4: .4byte gLinkEntity +_0806EDD4: .4byte gPlayerEntity thumb_func_start sub_0806EDD8 sub_0806EDD8: @ 0x0806EDD8 @@ -66,7 +66,7 @@ sub_0806EDD8: @ 0x0806EDD8 adds r3, r2, #0 movs r7, #1 rsbs r7, r7, #0 - ldr r6, _0806EE00 @ =gLinkEntity + ldr r6, _0806EE00 @ =gPlayerEntity adds r1, r6, #0 adds r2, r4, #0 bl sub_080041A0 @@ -80,7 +80,7 @@ _0806EDFC: adds r0, r7, #0 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0806EE00: .4byte gLinkEntity +_0806EE00: .4byte gPlayerEntity thumb_func_start sub_0806EE04 sub_0806EE04: @ 0x0806EE04 @@ -127,7 +127,7 @@ _0806EE4C: adds r1, #0x46 movs r0, #8 strh r0, [r1] - ldr r1, _0806EE6C @ =gLinkEntity + ldr r1, _0806EE6C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -139,7 +139,7 @@ _0806EE66: _0806EE68: pop {r4, pc} .align 2, 0 -_0806EE6C: .4byte gLinkEntity +_0806EE6C: .4byte gPlayerEntity thumb_func_start sub_0806EE70 sub_0806EE70: @ 0x0806EE70 @@ -548,14 +548,14 @@ sub_0806F118: @ 0x0806F118 ldrh r3, [r0, #4] adds r0, r4, #0 bl sub_0801DFB4 - ldr r0, _0806F144 @ =gLinkState + ldr r0, _0806F144 @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] pop {r4, pc} .align 2, 0 _0806F140: .4byte gUnk_08001A7C -_0806F144: .4byte gLinkState +_0806F144: .4byte gPlayerState thumb_func_start UpdateFuseInteraction UpdateFuseInteraction: @ 0x0806F148 @@ -574,14 +574,14 @@ UpdateFuseInteraction: @ 0x0806F148 .align 2, 0 _0806F164: .4byte gUnk_02022740 _0806F168: - ldr r0, _0806F184 @ =gLinkState + ldr r0, _0806F184 @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] movs r4, #1 _0806F172: bl sub_0807919C - ldr r0, _0806F184 @ =gLinkState + ldr r0, _0806F184 @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] @@ -589,7 +589,7 @@ _0806F17E: adds r0, r4, #0 pop {r4, pc} .align 2, 0 -_0806F184: .4byte gLinkState +_0806F184: .4byte gPlayerState thumb_func_start sub_0806F188 sub_0806F188: @ 0x0806F188 @@ -801,7 +801,7 @@ _0806F332: movs r0, #0 b _0806F34E _0806F336: - ldr r0, _0806F348 @ =gLinkState + ldr r0, _0806F348 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -811,7 +811,7 @@ _0806F342: ldrh r0, [r6, #6] b _0806F34E .align 2, 0 -_0806F348: .4byte gLinkState +_0806F348: .4byte gPlayerState _0806F34C: ldrh r0, [r6, #4] _0806F34E: @@ -863,7 +863,7 @@ _0806F398: .4byte gArea sub_0806F39C: @ 0x0806F39C push {r4, lr} adds r3, r0, #0 - ldr r2, _0806F3B8 @ =gLinkEntity + ldr r2, _0806F3B8 @ =gPlayerEntity ldrb r1, [r2, #0x14] movs r0, #2 ands r0, r1 @@ -876,7 +876,7 @@ sub_0806F39C: @ 0x0806F39C ldrsh r0, [r4, r2] b _0806F3C4 .align 2, 0 -_0806F3B8: .4byte gLinkEntity +_0806F3B8: .4byte gPlayerEntity _0806F3BC: movs r0, #0x32 ldrsh r1, [r3, r0] @@ -907,7 +907,7 @@ sub_0806F3E4: @ 0x0806F3E4 push {r4, r5, r6, lr} sub sp, #0x88 adds r5, r0, #0 - ldr r2, _0806F408 @ =gLinkState + ldr r2, _0806F408 @ =gPlayerState ldrb r1, [r2, #0x1c] movs r0, #0x7f ands r0, r1 @@ -922,7 +922,7 @@ sub_0806F3E4: @ 0x0806F3E4 beq _0806F416 b _0806F410 .align 2, 0 -_0806F408: .4byte gLinkState +_0806F408: .4byte gPlayerState _0806F40C: cmp r0, #3 beq _0806F42A @@ -959,7 +959,7 @@ _0806F436: bls _0806F444 strh r1, [r2] _0806F444: - ldr r6, _0806F4BC @ =gLinkEntity + ldr r6, _0806F4BC @ =gPlayerEntity ldrb r0, [r6, #0x14] movs r1, #0xe ands r1, r0 @@ -999,7 +999,7 @@ _0806F444: movs r0, #3 strb r0, [r5, #0xd] str r5, [r6, #0x70] - ldr r1, _0806F4C4 @ =gLinkState + ldr r1, _0806F4C4 @ =gPlayerState movs r0, #7 strb r0, [r1, #0x1c] movs r0, #0x11 @@ -1016,13 +1016,13 @@ _0806F4B4: bl PlaySFX b _0806F4D8 .align 2, 0 -_0806F4BC: .4byte gLinkEntity +_0806F4BC: .4byte gPlayerEntity _0806F4C0: .4byte gUnk_08126EE4 -_0806F4C4: .4byte gLinkState +_0806F4C4: .4byte gPlayerState _0806F4C8: cmp r1, #1 bne _0806F4D8 - ldr r0, _0806F4DC @ =gLinkState + ldr r0, _0806F4DC @ =gPlayerState ldr r0, [r0, #0x2c] strb r1, [r0, #0xa] movs r0, #0xef @@ -1031,7 +1031,7 @@ _0806F4D8: movs r0, #1 b _0806F4E2 .align 2, 0 -_0806F4DC: .4byte gLinkState +_0806F4DC: .4byte gPlayerState _0806F4E0: movs r0, #0 _0806F4E2: @@ -1657,7 +1657,7 @@ _0806F944: sub_0806F948: @ 0x0806F948 push {r4, lr} adds r4, r0, #0 - ldr r1, _0806F974 @ =gLinkState + ldr r1, _0806F974 @ =gPlayerState ldrb r0, [r1, #0xd] cmp r0, #0xff beq _0806F994 @@ -1677,7 +1677,7 @@ sub_0806F948: @ 0x0806F948 adds r0, r2, #0 b _0806F996 .align 2, 0 -_0806F974: .4byte gLinkState +_0806F974: .4byte gPlayerState _0806F978: movs r2, #0 cmp r3, #4 diff --git a/asm/code_0806FA6C.s b/asm/code_0806FA6C.s index 1f153b44..d948543c 100644 --- a/asm/code_0806FA6C.s +++ b/asm/code_0806FA6C.s @@ -110,7 +110,7 @@ sub_0806FBB4: @ 0x0806FBB4 ldrb r0, [r0, #5] cmp r0, #0 bne _0806FBC8 - ldr r0, _0806FBD4 @ =gLinkState + ldr r0, _0806FBD4 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _0806FBCC @@ -121,7 +121,7 @@ _0806FBCC: pop {pc} .align 2, 0 _0806FBD0: .4byte gScreenTransition -_0806FBD4: .4byte gLinkState +_0806FBD4: .4byte gPlayerState thumb_func_start sub_0806FBD8 sub_0806FBD8: @ 0x0806FBD8 @@ -148,7 +148,7 @@ sub_0806FBEC: @ 0x0806FBEC sub_0806FBFC: @ 0x0806FBFC push {r4, r5, r6, lr} adds r5, r3, #0 - ldr r4, _0806FC20 @ =gLinkEntity + ldr r4, _0806FC20 @ =gPlayerEntity movs r6, #0x2e ldrsh r3, [r4, r6] subs r3, r3, r0 @@ -165,7 +165,7 @@ _0806FC1A: adds r0, r1, #0 pop {r4, r5, r6, pc} .align 2, 0 -_0806FC20: .4byte gLinkEntity +_0806FC20: .4byte gPlayerEntity thumb_func_start sub_0806FC24 sub_0806FC24: @ 0x0806FC24 @@ -353,7 +353,7 @@ sub_0806FD3C: @ 0x0806FD3C sub_0806FD54: @ 0x0806FD54 push {r4, lr} adds r3, r0, #0 - ldr r0, _0806FD6C @ =gLinkState + ldr r0, _0806FD6C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #0x10 @@ -363,9 +363,9 @@ sub_0806FD54: @ 0x0806FD54 movs r0, #0 b _0806FD84 .align 2, 0 -_0806FD6C: .4byte gLinkState +_0806FD6C: .4byte gPlayerState _0806FD70: - ldr r0, _0806FD88 @ =gLinkEntity + ldr r0, _0806FD88 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r4, #0x32 @@ -377,7 +377,7 @@ _0806FD70: _0806FD84: pop {r4, pc} .align 2, 0 -_0806FD88: .4byte gLinkEntity +_0806FD88: .4byte gPlayerEntity thumb_func_start sub_0806FD8C sub_0806FD8C: @ 0x0806FD8C @@ -885,7 +885,7 @@ sub_08070100: @ 0x08070100 movs r0, #0xf0 lsls r0, r0, #1 str r0, [r5, #0x78] - ldr r2, _0807017C @ =gLinkEntity + ldr r2, _0807017C @ =gPlayerEntity ldr r1, _08070180 @ =gUnk_0811B9A0 ldrb r0, [r5, #0x14] adds r0, r0, r1 @@ -921,7 +921,7 @@ sub_08070100: @ 0x08070100 strb r3, [r5, #0xa] b _0807018C .align 2, 0 -_0807017C: .4byte gLinkEntity +_0807017C: .4byte gPlayerEntity _08070180: .4byte gUnk_0811B9A0 _08070184: .4byte gUnk_0811B9D0 _08070188: @@ -1062,7 +1062,7 @@ _08070280: ands r1, r6 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _08070358 @ =gLinkEntity + ldr r1, _08070358 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] movs r2, #0x80 @@ -1148,7 +1148,7 @@ _08070280: b _0807037A .align 2, 0 _08070354: .4byte gRoomControls -_08070358: .4byte gLinkEntity +_08070358: .4byte gPlayerEntity _0807035C: .4byte gUnk_08003E44 _08070360: .4byte 0x00004020 _08070364: @@ -1368,13 +1368,13 @@ sub_080704D4: @ 0x080704D4 sub_080704FC: @ 0x080704FC push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _0807052C @ =gLinkEntity + ldr r5, _0807052C @ =gPlayerEntity adds r0, r5, #0 adds r0, #0x5a ldrb r2, [r0] movs r0, #0x80 ands r0, r2 - ldr r1, _08070530 @ =gLinkState + ldr r1, _08070530 @ =gPlayerState cmp r0, #0 bne _08070518 ldr r0, [r1, #0x2c] @@ -1391,8 +1391,8 @@ _08070522: bl DeleteEntity b _08070566 .align 2, 0 -_0807052C: .4byte gLinkEntity -_08070530: .4byte gLinkState +_0807052C: .4byte gPlayerEntity +_08070530: .4byte gPlayerState _08070534: movs r0, #0xf ands r0, r2 @@ -1420,7 +1420,7 @@ _08070562: movs r0, #0xff strb r0, [r4, #0x1e] _08070566: - ldr r2, _08070580 @ =gLinkEntity + ldr r2, _08070580 @ =gPlayerEntity ldrb r1, [r2, #0x14] movs r0, #2 ands r0, r1 @@ -1433,7 +1433,7 @@ _08070566: eors r2, r0 b _0807058A .align 2, 0 -_08070580: .4byte gLinkEntity +_08070580: .4byte gPlayerEntity _08070584: ldrb r0, [r2, #0x18] lsls r0, r0, #0x19 @@ -1493,7 +1493,7 @@ sub_080705AC: @ 0x080705AC ldrb r0, [r0] cmp r0, #0 beq _08070674 - ldr r1, _08070628 @ =gLinkState + ldr r1, _08070628 @ =gPlayerState adds r0, r1, #0 adds r0, #0x8b ldrb r0, [r0] @@ -1518,7 +1518,7 @@ _08070618: .4byte gUnk_03000FD0 _0807061C: .4byte gUnk_02034490 _08070620: .4byte gTextBox _08070624: .4byte gUnk_02002A40 -_08070628: .4byte gLinkState +_08070628: .4byte gPlayerState _0807062C: .4byte gUnk_03003DC0 _08070630: ldrb r0, [r2] diff --git a/asm/code_08070698.s b/asm/code_08070698.s index b6e53ed6..762cec47 100644 --- a/asm/code_08070698.s +++ b/asm/code_08070698.s @@ -11,10 +11,10 @@ sub_08070698: @ 0x08070698 push {r4, r5, r6, lr} sub sp, #4 adds r4, r0, #0 - ldr r6, _08070788 @ =gLinkState + ldr r6, _08070788 @ =gPlayerState movs r0, #0xff strb r0, [r6] - ldr r1, _0807078C @ =gLinkEntity + ldr r1, _0807078C @ =gPlayerEntity ldrh r0, [r1, #0x2e] strh r0, [r6, #0x16] ldrh r0, [r1, #0x32] @@ -117,15 +117,15 @@ _08070784: add sp, #4 pop {r4, r5, r6, pc} .align 2, 0 -_08070788: .4byte gLinkState -_0807078C: .4byte gLinkEntity +_08070788: .4byte gPlayerState +_0807078C: .4byte gPlayerEntity _08070790: .4byte gUnk_08114F88 thumb_func_start sub_08070794 sub_08070794: @ 0x08070794 push {r4, r5, r6, r7, lr} adds r5, r0, #0 - ldr r6, _080707F0 @ =gLinkState + ldr r6, _080707F0 @ =gPlayerState adds r3, r6, #0 adds r3, #0xa8 movs r4, #0 @@ -164,26 +164,26 @@ sub_08070794: @ 0x08070794 ldrh r0, [r5, #0x12] cmp r0, #2 bne _080707F8 - ldr r0, _080707F4 @ =gLinkEntity + ldr r0, _080707F4 @ =gPlayerEntity bl UpdateAnimationSingleFrame b _08070800 .align 2, 0 -_080707F0: .4byte gLinkState -_080707F4: .4byte gLinkEntity +_080707F0: .4byte gPlayerState +_080707F4: .4byte gPlayerEntity _080707F8: movs r0, #0x97 lsls r0, r0, #2 mov r1, ip strh r0, [r1, #8] _08070800: - ldr r0, _08070814 @ =gLinkEntity + ldr r0, _08070814 @ =gPlayerEntity bl sub_0806F948 - bl ResetLink + bl ResetPlayer adds r0, r5, #0 bl sub_08077698 b _08070BE4 .align 2, 0 -_08070814: .4byte gLinkEntity +_08070814: .4byte gPlayerEntity _08070818: movs r0, #0x80 lsls r0, r0, #5 @@ -265,7 +265,7 @@ _080708A6: _080708AA: strh r0, [r5, #0x24] _080708AC: - ldr r4, _08070918 @ =gLinkState + ldr r4, _08070918 @ =gPlayerState ldrb r0, [r4, #6] movs r1, #0x80 orrs r1, r0 @@ -307,7 +307,7 @@ _080708E4: ldrb r0, [r0, #6] cmp r0, #0 bne _08070902 - bl ResetLink + bl ResetPlayer _08070902: ldr r0, [r4, #0x30] ands r0, r6 @@ -319,11 +319,11 @@ _0807090C: bl sub_08078EFC b _08070BE4 .align 2, 0 -_08070918: .4byte gLinkState +_08070918: .4byte gPlayerState _0807091C: .4byte 0x10000002 _08070920: .4byte gRoomVars _08070924: - ldr r0, _0807094C @ =gLinkState + ldr r0, _0807094C @ =gPlayerState ldr r1, [r0, #0x30] ldr r2, _08070950 @ =0x00041635 ands r1, r2 @@ -343,7 +343,7 @@ _08070940: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807094C: .4byte gLinkState +_0807094C: .4byte gPlayerState _08070950: .4byte 0x00041635 _08070954: .4byte _08070958 _08070958: @ jump table @@ -364,21 +364,21 @@ _08070958: @ jump table .4byte _08070BE4 @ case 14 .4byte _080709B4 @ case 15 _08070998: - ldr r0, _080709A4 @ =gLinkState + ldr r0, _080709A4 @ =gPlayerState ldrb r1, [r0, #6] movs r2, #0x80 eors r1, r2 strb r1, [r0, #6] b _080709D8 .align 2, 0 -_080709A4: .4byte gLinkState +_080709A4: .4byte gPlayerState _080709A8: - ldr r1, _080709B0 @ =gLinkState + ldr r1, _080709B0 @ =gPlayerState movs r0, #0x80 strb r0, [r1, #6] b _080709D8 .align 2, 0 -_080709B0: .4byte gLinkState +_080709B0: .4byte gPlayerState _080709B4: ldrb r1, [r5, #0x10] movs r0, #0x7f @@ -387,7 +387,7 @@ _080709B4: bl sub_080797EC b _08070BE4 _080709C2: - ldr r0, _080709D4 @ =gLinkState + ldr r0, _080709D4 @ =gPlayerState ldrb r1, [r0, #6] movs r2, #0x80 eors r1, r2 @@ -395,7 +395,7 @@ _080709C2: bl sub_080797EC b _08070BE4 .align 2, 0 -_080709D4: .4byte gLinkState +_080709D4: .4byte gPlayerState _080709D8: adds r1, r5, #0 adds r1, #0x3c @@ -423,7 +423,7 @@ _080709FC: b _08070BE4 _08070A0C: bl sub_080792D8 - ldr r4, _08070A78 @ =gLinkState + ldr r4, _08070A78 @ =gPlayerState ldrb r1, [r4, #2] ldrb r0, [r4, #0xa] orrs r0, r1 @@ -473,7 +473,7 @@ _08070A42: bl sub_08008926 b _08070A80 .align 2, 0 -_08070A78: .4byte gLinkState +_08070A78: .4byte gPlayerState _08070A7C: movs r0, #0xff strb r0, [r5, #0x15] @@ -488,7 +488,7 @@ _08070A80: beq _08070A94 b _08070BE4 _08070A94: - ldr r0, _08070AA8 @ =gLinkState + ldr r0, _08070AA8 @ =gPlayerState ldrb r0, [r0, #4] cmp r0, #0 beq _08070A9E @@ -498,7 +498,7 @@ _08070A9E: bl UpdateAnimationSingleFrame b _08070BE4 .align 2, 0 -_08070AA8: .4byte gLinkState +_08070AA8: .4byte gPlayerState _08070AAC: adds r0, r5, #0 adds r0, #0x42 @@ -559,7 +559,7 @@ _08070B18: adds r0, r5, #0 bl sub_08008AA0 _08070B1E: - ldr r2, _08070BB8 @ =gLinkState + ldr r2, _08070BB8 @ =gPlayerState ldrb r1, [r2, #0x1b] movs r0, #0x10 ands r0, r1 @@ -589,7 +589,7 @@ _08070B52: bl sub_0807A108 _08070B56: movs r4, #0 - ldr r3, _08070BB8 @ =gLinkState + ldr r3, _08070BB8 @ =gPlayerState ldrb r2, [r3, #7] ldrb r0, [r5, #0x15] orrs r0, r2 @@ -626,7 +626,7 @@ _08070B8E: ldrb r0, [r7] cmp r0, #0 bne _08070BE4 - ldr r1, _08070BB8 @ =gLinkState + ldr r1, _08070BB8 @ =gPlayerState ldrb r0, [r1, #0xb] cmp r0, #0 bne _08070BE4 @@ -637,7 +637,7 @@ _08070B8E: bl sub_0806F948 b _08070BE4 .align 2, 0 -_08070BB8: .4byte gLinkState +_08070BB8: .4byte gPlayerState _08070BBC: ldr r0, [r4, #0x2c] cmp r0, #0 @@ -687,7 +687,7 @@ _08070C0E: thumb_func_start sub_08070C10 sub_08070C10: @ 0x08070C10 push {lr} - ldr r2, _08070C34 @ =gLinkState + ldr r2, _08070C34 @ =gPlayerState movs r1, #0xff strb r1, [r2, #0xd] movs r1, #0x80 @@ -703,7 +703,7 @@ sub_08070C10: @ 0x08070C10 bl _call_via_r1 pop {pc} .align 2, 0 -_08070C34: .4byte gLinkState +_08070C34: .4byte gPlayerState _08070C38: .4byte gUnk_0811BA60 thumb_func_start sub_08070C3C @@ -711,7 +711,7 @@ sub_08070C3C: @ 0x08070C3C push {r4, lr} adds r4, r0, #0 bl sub_08004168 - ldr r2, _08070C64 @ =gLinkState + ldr r2, _08070C64 @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #5 orrs r1, r0 @@ -728,7 +728,7 @@ sub_08070C3C: @ 0x08070C3C lsls r0, r0, #1 b _08070C7E .align 2, 0 -_08070C64: .4byte gLinkState +_08070C64: .4byte gPlayerState _08070C68: .4byte 0xFFFFFBFF _08070C6C: movs r0, #8 @@ -757,7 +757,7 @@ _08070C7E: rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - bl ResetLink + bl ResetPlayer bl sub_0807A108 movs r0, #0x7b bl PlaySFX @@ -781,7 +781,7 @@ sub_08070CB4: @ 0x08070CB4 ldr r0, _08070CF4 @ =gUnk_02002A40 adds r0, #0xaa ldrb r0, [r0] - ldr r4, _08070CF8 @ =gLinkState + ldr r4, _08070CF8 @ =gPlayerState cmp r0, #0 beq _08070CFC ldr r1, [r4, #0x30] @@ -801,7 +801,7 @@ sub_08070CB4: @ 0x08070CB4 b _08070D1A .align 2, 0 _08070CF4: .4byte gUnk_02002A40 -_08070CF8: .4byte gLinkState +_08070CF8: .4byte gPlayerState _08070CFC: ldr r0, [r4, #0x30] ldr r1, _08070D1C @ =0xFFFF7FFB @@ -859,7 +859,7 @@ sub_08070D38: @ 0x08070D38 ldrb r0, [r2, #0xd] adds r0, #1 strb r0, [r2, #0xd] - ldr r3, _08070D94 @ =gLinkState + ldr r3, _08070D94 @ =gPlayerState adds r0, r3, #0 adds r0, #0x38 ldrb r0, [r0] @@ -882,7 +882,7 @@ sub_08070D38: @ 0x08070D38 bl sub_08080964 b _08070DA2 .align 2, 0 -_08070D94: .4byte gLinkState +_08070D94: .4byte gPlayerState _08070D98: ldr r0, _08070DBC @ =0x00000C18 strh r0, [r3, #8] @@ -890,18 +890,18 @@ _08070D98: lsls r0, r0, #9 str r0, [r2, #0x20] _08070DA2: - ldr r0, _08070DC0 @ =gLinkState + ldr r0, _08070DC0 @ =gPlayerState movs r1, #0x80 strb r1, [r0, #2] movs r0, #0xa6 lsls r0, r0, #1 bl PlaySFX - bl ResetLink + bl ResetPlayer bl sub_08078F60 pop {r4, pc} .align 2, 0 _08070DBC: .4byte 0x00000C18 -_08070DC0: .4byte gLinkState +_08070DC0: .4byte gPlayerState thumb_func_start sub_08070DC4 sub_08070DC4: @ 0x08070DC4 @@ -921,7 +921,7 @@ sub_08070DC4: @ 0x08070DC4 bl sub_08003FC4 cmp r0, #0 bne _08070E76 - ldr r6, _08070E18 @ =gLinkState + ldr r6, _08070E18 @ =gPlayerState strb r0, [r6, #2] bl sub_08078EFC adds r5, r0, #0 @@ -940,7 +940,7 @@ _08070E10: bl sub_080791D0 b _08070E76 .align 2, 0 -_08070E18: .4byte gLinkState +_08070E18: .4byte gPlayerState _08070E1C: ldrb r0, [r4, #0xe] subs r0, #1 @@ -977,7 +977,7 @@ _08070E56: ldrb r0, [r4, #0xd] adds r0, #1 strb r0, [r4, #0xd] - ldr r2, _08070E78 @ =gLinkState + ldr r2, _08070E78 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -989,7 +989,7 @@ _08070E56: _08070E76: pop {r4, r5, r6, pc} .align 2, 0 -_08070E78: .4byte gLinkState +_08070E78: .4byte gPlayerState thumb_func_start sub_08070E7C sub_08070E7C: @ 0x08070E7C @@ -1001,13 +1001,13 @@ sub_08070E7C: @ 0x08070E7C lsrs r1, r1, #0x18 cmp r1, #0 bne _08070E94 - ldr r0, _08070E98 @ =gLinkState + ldr r0, _08070E98 @ =gPlayerState strb r1, [r0, #2] bl sub_080791D0 _08070E94: pop {pc} .align 2, 0 -_08070E98: .4byte gLinkState +_08070E98: .4byte gPlayerState thumb_func_start sub_08070E9C sub_08070E9C: @ 0x08070E9C @@ -1019,7 +1019,7 @@ sub_08070E9C: @ 0x08070E9C bl sub_08056360 b _08070ED2 _08070EAE: - ldr r1, _08070ED4 @ =gLinkState + ldr r1, _08070ED4 @ =gPlayerState adds r2, r1, #0 adds r2, #0x27 movs r0, #4 @@ -1038,7 +1038,7 @@ _08070EAE: _08070ED2: pop {r4, pc} .align 2, 0 -_08070ED4: .4byte gLinkState +_08070ED4: .4byte gPlayerState _08070ED8: .4byte gUnk_0811BA74 thumb_func_start sub_08070EDC @@ -1061,7 +1061,7 @@ sub_08070EDC: @ 0x08070EDC movs r0, #1 strb r0, [r2, #0xd] _08070EFE: - ldr r2, _08070F14 @ =gLinkState + ldr r2, _08070F14 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -1071,7 +1071,7 @@ _08070EFE: b _08070F1C .align 2, 0 _08070F10: .4byte gTextBox -_08070F14: .4byte gLinkState +_08070F14: .4byte gPlayerState _08070F18: ldr r0, _08070F20 @ =0x00000C18 strh r0, [r2, #8] @@ -1108,7 +1108,7 @@ _08070F4C: .4byte gTextBox sub_08070F50: @ 0x08070F50 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08070F9C @ =gLinkState + ldr r0, _08070F9C @ =gPlayerState adds r0, #0xa8 movs r1, #0x15 strb r1, [r0] @@ -1143,7 +1143,7 @@ sub_08070F50: @ 0x08070F50 _08070F9A: pop {r4, r5, pc} .align 2, 0 -_08070F9C: .4byte gLinkState +_08070F9C: .4byte gPlayerState _08070FA0: .4byte gUnk_0811BA7C thumb_func_start sub_08070FA4 @@ -1158,7 +1158,7 @@ sub_08070FA4: @ 0x08070FA4 movs r1, #0 movs r0, #4 strb r0, [r4, #0x14] - ldr r3, _08070FE8 @ =gLinkState + ldr r3, _08070FE8 @ =gPlayerState ldr r2, [r3, #0x30] movs r0, #1 orrs r2, r0 @@ -1182,7 +1182,7 @@ sub_08070FA4: @ 0x08070FA4 adds r1, #3 b _08071004 .align 2, 0 -_08070FE8: .4byte gLinkState +_08070FE8: .4byte gPlayerState _08070FEC: .4byte 0x0000045B _08070FF0: adds r0, r3, #0 @@ -1195,17 +1195,17 @@ _08070FF0: movs r1, #0xb8 lsls r1, r1, #2 _08071004: - ldr r0, _0807101C @ =gLinkState + ldr r0, _0807101C @ =gPlayerState strh r1, [r0, #8] _08071008: movs r0, #1 strb r0, [r4, #0xd] - bl ResetLink + bl ResetPlayer bl sub_08078F60 pop {r4, pc} .align 2, 0 _08071018: .4byte 0x000001B9 -_0807101C: .4byte gLinkState +_0807101C: .4byte gPlayerState thumb_func_start sub_08071020 sub_08071020: @ 0x08071020 @@ -1250,19 +1250,19 @@ sub_08071038: @ 0x08071038 subs r0, #5 movs r1, #0xf8 strb r1, [r0] - ldr r0, _08071080 @ =gLinkState + ldr r0, _08071080 @ =gPlayerState strb r2, [r0, #2] bl sub_080791D0 _08071078: pop {r4, pc} .align 2, 0 _0807107C: .4byte gTextBox -_08071080: .4byte gLinkState +_08071080: .4byte gPlayerState thumb_func_start sub_08071084 sub_08071084: @ 0x08071084 push {lr} - ldr r1, _080710A0 @ =gLinkState + ldr r1, _080710A0 @ =gPlayerState adds r1, #0xa8 movs r2, #0xb strb r2, [r1] @@ -1274,7 +1274,7 @@ sub_08071084: @ 0x08071084 bl _call_via_r1 pop {pc} .align 2, 0 -_080710A0: .4byte gLinkState +_080710A0: .4byte gPlayerState _080710A4: .4byte gUnk_0811BA88 thumb_func_start sub_080710A8 @@ -1285,7 +1285,7 @@ sub_080710A8: @ 0x080710A8 adds r0, #1 movs r2, #0 strb r0, [r4, #0xd] - ldr r1, _080710EC @ =gLinkState + ldr r1, _080710EC @ =gPlayerState ldr r3, [r1, #0x30] movs r0, #1 orrs r3, r0 @@ -1303,7 +1303,7 @@ sub_080710A8: @ 0x080710A8 ands r3, r0 cmp r3, #0 bne _080710FA - bl ResetLink + bl ResetPlayer ldr r0, [r5, #0x30] movs r1, #8 ands r0, r1 @@ -1313,7 +1313,7 @@ sub_080710A8: @ 0x080710A8 lsls r0, r0, #3 b _080710F8 .align 2, 0 -_080710EC: .4byte gLinkState +_080710EC: .4byte gPlayerState _080710F0: .4byte 0xFFFFF3FF _080710F4: movs r0, #0x81 @@ -1352,7 +1352,7 @@ sub_08071130: @ 0x08071130 bl sub_08078EFC cmp r0, #0 bne _08071206 - ldr r6, _080711B4 @ =gLinkState + ldr r6, _080711B4 @ =gPlayerState ldrb r0, [r6, #0x1b] cmp r0, #0 bne _08071158 @@ -1406,7 +1406,7 @@ _080711AC: bl sub_080791D0 b _08071206 .align 2, 0 -_080711B4: .4byte gLinkState +_080711B4: .4byte gPlayerState _080711B8: movs r0, #6 strb r0, [r5, #0xe] @@ -1455,7 +1455,7 @@ _08071206: sub_08071208: @ 0x08071208 push {r4, lr} adds r4, r0, #0 - ldr r2, _08071244 @ =gLinkState + ldr r2, _08071244 @ =gPlayerState ldrb r1, [r2, #5] ldrb r0, [r2, #0xb] orrs r0, r1 @@ -1476,19 +1476,19 @@ _08071228: lsrs r0, r0, #0x18 cmp r0, #0xff bne _08071240 - ldr r1, _08071244 @ =gLinkState + ldr r1, _08071244 @ =gPlayerState movs r0, #0 strb r0, [r1, #2] bl sub_080791D0 _08071240: pop {r4, pc} .align 2, 0 -_08071244: .4byte gLinkState +_08071244: .4byte gPlayerState thumb_func_start sub_08071248 sub_08071248: @ 0x08071248 push {lr} - ldr r3, _08071274 @ =gLinkState + ldr r3, _08071274 @ =gPlayerState adds r2, r3, #0 adds r2, #0xa8 movs r1, #0x16 @@ -1509,7 +1509,7 @@ sub_08071248: @ 0x08071248 bl _call_via_r1 pop {pc} .align 2, 0 -_08071274: .4byte gLinkState +_08071274: .4byte gPlayerState _08071278: .4byte gUnk_0811BA94 thumb_func_start sub_0807127C @@ -1524,7 +1524,7 @@ sub_0807127C: @ 0x0807127C subs r0, #0x3a ands r0, r1 strb r0, [r2] - ldr r5, _080712AC @ =gLinkState + ldr r5, _080712AC @ =gPlayerState ldr r1, [r5, #0x30] movs r0, #0x80 ands r0, r1 @@ -1538,7 +1538,7 @@ sub_0807127C: @ 0x0807127C bl PlaySFX b _080712E4 .align 2, 0 -_080712AC: .4byte gLinkState +_080712AC: .4byte gPlayerState _080712B0: .4byte 0x00000C19 _080712B4: movs r0, #0x80 @@ -1567,7 +1567,7 @@ _080712E0: _080712E2: strh r0, [r5, #8] _080712E4: - bl ResetLink + bl ResetPlayer pop {r4, r5, pc} .align 2, 0 _080712EC: .4byte 0x0000044C @@ -1578,7 +1578,7 @@ sub_080712F0: @ 0x080712F0 adds r4, r0, #0 bl UpdateAnimationSingleFrame movs r5, #0 - ldr r3, _08071314 @ =gLinkState + ldr r3, _08071314 @ =gPlayerState ldr r0, [r3, #0x30] movs r2, #0x80 ands r0, r2 @@ -1592,7 +1592,7 @@ sub_080712F0: @ 0x080712F0 bne _0807133E b _08071342 .align 2, 0 -_08071314: .4byte gLinkState +_08071314: .4byte gPlayerState _08071318: adds r0, r4, #0 adds r0, #0x5a @@ -1637,7 +1637,7 @@ _08071342: rsbs r0, r0, #0 ands r0, r1 strb r0, [r4, #0x18] - ldr r2, _0807137C @ =gLinkState + ldr r2, _0807137C @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #5 rsbs r1, r1, #0 @@ -1647,13 +1647,13 @@ _08071342: _0807137A: pop {r4, r5, pc} .align 2, 0 -_0807137C: .4byte gLinkState +_0807137C: .4byte gPlayerState thumb_func_start sub_08071380 sub_08071380: @ 0x08071380 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _080713E8 @ =gLinkState + ldr r5, _080713E8 @ =gPlayerState adds r1, r5, #0 adds r1, #0xa8 movs r0, #0xe @@ -1701,7 +1701,7 @@ _080713D0: bl PlaySFX b _080713FC .align 2, 0 -_080713E8: .4byte gLinkState +_080713E8: .4byte gPlayerState _080713EC: .4byte gUnk_0811BA9C _080713F0: .4byte gUnk_03000FF0 _080713F4: .4byte gArea @@ -1751,7 +1751,7 @@ _08071444: bl sub_08073904 adds r0, r4, #0 bl UpdateAnimationSingleFrame - ldr r2, _080714A0 @ =gLinkState + ldr r2, _080714A0 @ =gPlayerState ldrb r0, [r2, #2] cmp r0, #0 bne _0807147C @@ -1793,7 +1793,7 @@ _0807149A: pop {r4, r5, pc} .align 2, 0 _0807149C: .4byte gArea -_080714A0: .4byte gLinkState +_080714A0: .4byte gPlayerState _080714A4: .4byte 0x0000052C thumb_func_start sub_080714A8 @@ -1806,10 +1806,10 @@ sub_080714A8: @ 0x080714A8 bgt _080714BE cmp r0, #4 blt _080714BE - ldr r0, _08071528 @ =gLinkEntity + ldr r0, _08071528 @ =gPlayerEntity bl sub_0806F948 _080714BE: - ldr r3, _0807152C @ =gLinkState + ldr r3, _0807152C @ =gPlayerState ldrb r1, [r3, #0xd] movs r0, #0x84 ands r0, r1 @@ -1863,8 +1863,8 @@ _08071516: b _0807156A .align 2, 0 _08071524: .4byte gArea -_08071528: .4byte gLinkEntity -_0807152C: .4byte gLinkState +_08071528: .4byte gPlayerEntity +_0807152C: .4byte gPlayerState _08071530: .4byte 0x0000080C _08071534: .4byte 0x0000041C _08071538: @@ -1910,7 +1910,7 @@ sub_0807156C: @ 0x0807156C strb r1, [r0, #0xd] movs r1, #0x1e strb r1, [r0, #0xf] - ldr r2, _080715A8 @ =gLinkState + ldr r2, _080715A8 @ =gPlayerState movs r1, #0xe7 lsls r1, r1, #3 strh r1, [r2, #8] @@ -1924,7 +1924,7 @@ sub_0807156C: @ 0x0807156C .align 2, 0 _080715A0: .4byte gRoomControls _080715A4: .4byte gUnk_02034490 -_080715A8: .4byte gLinkState +_080715A8: .4byte gPlayerState thumb_func_start sub_080715AC sub_080715AC: @ 0x080715AC @@ -1935,7 +1935,7 @@ sub_080715AC: @ 0x080715AC bne _080715CC adds r0, r4, #0 bl UpdateAnimationSingleFrame - ldr r0, _080715D0 @ =gLinkState + ldr r0, _080715D0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -1946,7 +1946,7 @@ sub_080715AC: @ 0x080715AC _080715CC: pop {r4, pc} .align 2, 0 -_080715D0: .4byte gLinkState +_080715D0: .4byte gPlayerState thumb_func_start sub_080715D4 sub_080715D4: @ 0x080715D4 @@ -1980,7 +1980,7 @@ sub_080715D4: @ 0x080715D4 adds r1, r2, #0 movs r3, #0 bl sub_0805EC9C - ldr r2, _08071628 @ =gLinkState + ldr r2, _08071628 @ =gPlayerState ldr r0, _0807162C @ =0x000002C3 strh r0, [r2, #8] ldr r0, [r2, #0x30] @@ -1991,7 +1991,7 @@ sub_080715D4: @ 0x080715D4 bl PlaySFX pop {pc} .align 2, 0 -_08071628: .4byte gLinkState +_08071628: .4byte gPlayerState _0807162C: .4byte 0x000002C3 _08071630: .4byte 0x0000016F @@ -2276,7 +2276,7 @@ sub_080717F8: @ 0x080717F8 movs r1, #9 strb r1, [r0, #0xc] strb r4, [r0, #0xd] - ldr r3, _0807185C @ =gLinkState + ldr r3, _0807185C @ =gPlayerState ldr r1, [r3, #0x30] movs r2, #0x21 rsbs r2, r2, #0 @@ -2291,7 +2291,7 @@ sub_080717F8: @ 0x080717F8 _08071850: .4byte gArea _08071854: .4byte gUnk_0811BAC4 _08071858: .4byte gUnk_02034490 -_0807185C: .4byte gLinkState +_0807185C: .4byte gPlayerState thumb_func_start sub_08071860 sub_08071860: @ 0x08071860 @@ -2304,7 +2304,7 @@ sub_08071860: @ 0x08071860 bl sub_08071A6C b _08071896 _08071876: - ldr r0, _08071898 @ =gLinkState + ldr r0, _08071898 @ =gPlayerState adds r0, #0xa8 movs r1, #0x13 strb r1, [r0] @@ -2322,14 +2322,14 @@ _08071876: _08071896: pop {r4, pc} .align 2, 0 -_08071898: .4byte gLinkState +_08071898: .4byte gPlayerState _0807189C: .4byte gUnk_0811BAD4 thumb_func_start sub_080718A0 sub_080718A0: @ 0x080718A0 push {r4, r5, lr} adds r4, r0, #0 - bl ResetLink + bl ResetPlayer ldr r0, _080718EC @ =gUnk_03000B80 adds r0, #0x63 movs r1, #0 @@ -2346,7 +2346,7 @@ sub_080718A0: @ 0x080718A0 ands r0, r1 orrs r0, r2 strb r0, [r4, #0x11] - ldr r5, _080718F4 @ =gLinkState + ldr r5, _080718F4 @ =gPlayerState ldr r0, [r5, #0x30] movs r1, #0x80 ands r0, r1 @@ -2365,7 +2365,7 @@ sub_080718A0: @ 0x080718A0 .align 2, 0 _080718EC: .4byte gUnk_03000B80 _080718F0: .4byte gUnk_03003DC0 -_080718F4: .4byte gLinkState +_080718F4: .4byte gPlayerState _080718F8: ldrb r0, [r5, #2] cmp r0, #0 @@ -2430,14 +2430,14 @@ sub_0807193C: @ 0x0807193C ldrb r0, [r4, #0x14] cmp r0, #2 bne _0807197C - ldr r1, _08071978 @ =gLinkState + ldr r1, _08071978 @ =gPlayerState movs r0, #0xf3 lsls r0, r0, #2 b _08071980 .align 2, 0 -_08071978: .4byte gLinkState +_08071978: .4byte gPlayerState _0807197C: - ldr r1, _08071988 @ =gLinkState + ldr r1, _08071988 @ =gPlayerState ldr r0, _0807198C @ =0x000003C7 _08071980: strh r0, [r1, #8] @@ -2445,7 +2445,7 @@ _08071980: _08071986: pop {r4, pc} .align 2, 0 -_08071988: .4byte gLinkState +_08071988: .4byte gPlayerState _0807198C: .4byte 0x000003C7 thumb_func_start sub_08071990 @@ -2461,7 +2461,7 @@ sub_08071990: @ 0x08071990 ldrb r0, [r2, #0xd] adds r0, #1 strb r0, [r2, #0xd] - ldr r3, _080719C4 @ =gLinkState + ldr r3, _080719C4 @ =gPlayerState ldr r0, [r3, #0x30] movs r1, #0x80 ands r0, r1 @@ -2475,7 +2475,7 @@ sub_08071990: @ 0x08071990 b _08071A4A .align 2, 0 _080719C0: .4byte gTextBox -_080719C4: .4byte gLinkState +_080719C4: .4byte gPlayerState _080719C8: .4byte 0x000003CD _080719CC: ldr r0, _080719D4 @ =0x000003C9 @@ -2488,7 +2488,7 @@ _080719D8: bl sub_08079258 b _08071A4A _080719E2: - ldr r4, _08071A20 @ =gLinkState + ldr r4, _08071A20 @ =gPlayerState ldr r0, [r4, #0x30] movs r1, #0x80 ands r0, r1 @@ -2520,7 +2520,7 @@ _080719F8: strh r0, [r4, #8] b _08071A4A .align 2, 0 -_08071A20: .4byte gLinkState +_08071A20: .4byte gPlayerState _08071A24: adds r0, r3, #0 adds r0, #0xc7 @@ -2565,7 +2565,7 @@ sub_08071A6C: @ 0x08071A6C ldr r1, _08071A84 @ =gUnk_03003DC0 movs r0, #0 strb r0, [r1] - ldr r3, _08071A88 @ =gLinkEntity + ldr r3, _08071A88 @ =gPlayerEntity ldrb r1, [r3, #0x11] lsrs r2, r1, #4 subs r0, #0x10 @@ -2575,12 +2575,12 @@ sub_08071A6C: @ 0x08071A6C bx lr .align 2, 0 _08071A84: .4byte gUnk_03003DC0 -_08071A88: .4byte gLinkEntity +_08071A88: .4byte gPlayerEntity thumb_func_start sub_08071A8C sub_08071A8C: @ 0x08071A8C push {lr} - ldr r1, _08071AA8 @ =gLinkState + ldr r1, _08071AA8 @ =gPlayerState adds r1, #0xa8 movs r2, #0x19 strb r2, [r1] @@ -2592,7 +2592,7 @@ sub_08071A8C: @ 0x08071A8C bl _call_via_r1 pop {pc} .align 2, 0 -_08071AA8: .4byte gLinkState +_08071AA8: .4byte gPlayerState _08071AAC: .4byte gUnk_0811BAE4 thumb_func_start sub_08071AB0 @@ -2602,7 +2602,7 @@ sub_08071AB0: @ 0x08071AB0 ldrb r0, [r3, #0xd] adds r0, #1 strb r0, [r3, #0xd] - ldr r1, _08071AD8 @ =gLinkState + ldr r1, _08071AD8 @ =gPlayerState ldr r2, [r1, #0x30] movs r0, #1 orrs r2, r0 @@ -2617,7 +2617,7 @@ sub_08071AB0: @ 0x08071AB0 strb r4, [r3, #0xf] b _08071AE8 .align 2, 0 -_08071AD8: .4byte gLinkState +_08071AD8: .4byte gPlayerState _08071ADC: movs r0, #0x80 ands r2, r0 @@ -2635,7 +2635,7 @@ _08071AE8: sub_08071AF0: @ 0x08071AF0 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08071B34 @ =gLinkState + ldr r5, _08071B34 @ =gPlayerState adds r0, r5, #0 adds r0, #0x80 movs r1, #0 @@ -2667,7 +2667,7 @@ sub_08071AF0: @ 0x08071AF0 strb r0, [r4, #0xe] b _08071B58 .align 2, 0 -_08071B34: .4byte gLinkState +_08071B34: .4byte gPlayerState _08071B38: .4byte gUnk_0811BAF0 _08071B3C: ldrb r0, [r4, #0xd] @@ -2695,7 +2695,7 @@ _08071B5C: sub_08071B60: @ 0x08071B60 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08071BAC @ =gLinkState + ldr r5, _08071BAC @ =gPlayerState movs r2, #0 movs r0, #2 strb r0, [r5, #6] @@ -2730,7 +2730,7 @@ sub_08071B60: @ 0x08071B60 _08071BA8: pop {r4, r5, pc} .align 2, 0 -_08071BAC: .4byte gLinkState +_08071BAC: .4byte gPlayerState thumb_func_start sub_08071BB0 sub_08071BB0: @ 0x08071BB0 @@ -2745,20 +2745,20 @@ sub_08071BB0: @ 0x08071BB0 adds r1, r1, r2 ldr r1, [r1] bl _call_via_r1 - ldr r0, _08071BD8 @ =gLinkState + ldr r0, _08071BD8 @ =gPlayerState adds r0, #0xa8 movs r1, #0x12 strb r1, [r0] pop {pc} .align 2, 0 _08071BD4: .4byte gUnk_0811BB2C -_08071BD8: .4byte gLinkState +_08071BD8: .4byte gPlayerState thumb_func_start sub_08071BDC sub_08071BDC: @ 0x08071BDC push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08071C10 @ =gLinkState + ldr r5, _08071C10 @ =gPlayerState ldr r0, [r5, #0x30] movs r1, #0x88 lsls r1, r1, #1 @@ -2781,7 +2781,7 @@ sub_08071BDC: @ 0x08071BDC strh r0, [r5, #8] b _08071C9C .align 2, 0 -_08071C10: .4byte gLinkState +_08071C10: .4byte gPlayerState _08071C14: movs r0, #0x81 lsls r0, r0, #4 @@ -2819,7 +2819,7 @@ _08071C4C: beq _08071C5A ldr r0, _08071CA0 @ =0x00000459 _08071C5A: - ldr r2, _08071CA4 @ =gLinkState + ldr r2, _08071CA4 @ =gPlayerState movs r3, #0 strh r0, [r2, #8] ldr r0, [r2, #0x30] @@ -2846,14 +2846,14 @@ _08071C5A: strb r3, [r2, #6] adds r0, r4, #0 bl sub_0800451C - bl ResetLink + bl ResetPlayer movs r0, #0x87 bl PlaySFX _08071C9C: pop {r4, r5, pc} .align 2, 0 _08071CA0: .4byte 0x00000459 -_08071CA4: .4byte gLinkState +_08071CA4: .4byte gPlayerState _08071CA8: .4byte 0xFEDBF2FE thumb_func_start sub_08071CAC @@ -2869,7 +2869,7 @@ sub_08071CAC: @ 0x08071CAC ands r0, r1 cmp r0, #0 beq _08071CFE - ldr r1, _08071CE0 @ =gLinkState + ldr r1, _08071CE0 @ =gPlayerState ldr r2, [r1, #0x30] adds r0, r2, #0 ands r0, r3 @@ -2883,7 +2883,7 @@ sub_08071CAC: @ 0x08071CAC ldr r0, _08071CE8 @ =0x0000045A b _08071CEE .align 2, 0 -_08071CE0: .4byte gLinkState +_08071CE0: .4byte gPlayerState _08071CE4: .4byte 0x000002BD _08071CE8: .4byte 0x0000045A _08071CEC: @@ -2935,7 +2935,7 @@ _08071D3A: movs r2, #0 movs r0, #3 strb r0, [r5, #0xd] - ldr r1, _08071D70 @ =gLinkState + ldr r1, _08071D70 @ =gPlayerState adds r0, r1, #0 adds r0, #0x3c strb r2, [r0] @@ -2953,7 +2953,7 @@ _08071D3A: b _08071D7A .align 2, 0 _08071D6C: .4byte gUnk_02002A40 -_08071D70: .4byte gLinkState +_08071D70: .4byte gPlayerState _08071D74: ldr r1, _08071D7C @ =gScreenTransition movs r0, #1 @@ -2968,7 +2968,7 @@ sub_08071D80: @ 0x08071D80 push {r4, r5, lr} adds r4, r0, #0 bl UpdateAnimationSingleFrame - ldr r5, _08071DB4 @ =gLinkState + ldr r5, _08071DB4 @ =gPlayerState movs r0, #1 strb r0, [r5, #0x14] adds r0, r4, #0 @@ -2989,7 +2989,7 @@ sub_08071D80: @ 0x08071D80 _08071DB2: pop {r4, r5, pc} .align 2, 0 -_08071DB4: .4byte gLinkState +_08071DB4: .4byte gPlayerState thumb_func_start sub_08071DB8 sub_08071DB8: @ 0x08071DB8 @@ -3008,7 +3008,7 @@ _08071DCC: .4byte gUnk_0811BB3C sub_08071DD0: @ 0x08071DD0 push {lr} adds r2, r0, #0 - ldr r1, _08071DF4 @ =gLinkState + ldr r1, _08071DF4 @ =gPlayerState adds r0, r1, #0 adds r0, #0x38 ldrb r0, [r0] @@ -3025,7 +3025,7 @@ sub_08071DD0: @ 0x08071DD0 adds r0, #0xfe b _08071E00 .align 2, 0 -_08071DF4: .4byte gLinkState +_08071DF4: .4byte gPlayerState _08071DF8: movs r0, #1 strb r0, [r2, #0xd] @@ -3042,7 +3042,7 @@ sub_08071E04: @ 0x08071E04 ldr r0, [r4, #0x34] cmp r0, #0 beq _08071E38 - ldr r5, _08071E34 @ =gLinkState + ldr r5, _08071E34 @ =gPlayerState ldrb r0, [r5, #0x14] cmp r0, #0 bne _08071E38 @@ -3060,7 +3060,7 @@ sub_08071E04: @ 0x08071E04 bl sub_080791BC b _08071E72 .align 2, 0 -_08071E34: .4byte gLinkState +_08071E34: .4byte gPlayerState _08071E38: adds r0, r4, #0 bl UpdateAnimationSingleFrame @@ -3127,13 +3127,13 @@ _08071EAC: .4byte gUnk_0811BB48 sub_08071EB0: @ 0x08071EB0 push {r4, lr} adds r4, r0, #0 - bl ResetLink + bl ResetPlayer adds r0, r4, #0 movs r1, #0xe bl CreatePlayerBomb cmp r0, #0 beq _08071F12 - ldr r3, _08071EE4 @ =gLinkState + ldr r3, _08071EE4 @ =gPlayerState adds r2, r3, #0 adds r2, #0x38 ldrb r1, [r2] @@ -3149,7 +3149,7 @@ sub_08071EB0: @ 0x08071EB0 strh r0, [r3, #8] b _08071F12 .align 2, 0 -_08071EE4: .4byte gLinkState +_08071EE4: .4byte gPlayerState _08071EE8: .4byte 0x00000614 _08071EEC: cmp r0, #0x20 @@ -3184,14 +3184,14 @@ sub_08071F14: @ 0x08071F14 ands r0, r1 cmp r0, #0 beq _08071F32 - ldr r1, _08071F34 @ =gLinkState + ldr r1, _08071F34 @ =gPlayerState movs r0, #0 str r0, [r1, #0x2c] bl sub_0807921C _08071F32: pop {r4, pc} .align 2, 0 -_08071F34: .4byte gLinkState +_08071F34: .4byte gPlayerState thumb_func_start sub_08071F38 sub_08071F38: @ 0x08071F38 @@ -3218,7 +3218,7 @@ sub_08071F50: @ 0x08071F50 ldrb r1, [r0, #0xd] adds r1, #1 strb r1, [r0, #0xd] - ldr r1, _08071F78 @ =gLinkState + ldr r1, _08071F78 @ =gPlayerState movs r0, #0xa5 lsls r0, r0, #2 strh r0, [r1, #8] @@ -3227,7 +3227,7 @@ sub_08071F50: @ 0x08071F50 bl PlaySFX pop {pc} .align 2, 0 -_08071F78: .4byte gLinkState +_08071F78: .4byte gPlayerState _08071F7C: .4byte 0x00000195 thumb_func_start sub_08071F80 @@ -3242,7 +3242,7 @@ sub_08071F80: @ 0x08071F80 bne _08071FB8 adds r0, r4, #0 bl UpdateSpriteForCollisionLayer - ldr r0, _08071FB4 @ =gLinkState + ldr r0, _08071FB4 @ =gPlayerState strb r5, [r0, #2] ldrb r0, [r0, #0x14] cmp r0, #0 @@ -3254,7 +3254,7 @@ sub_08071F80: @ 0x08071F80 bl sub_08072008 b _08072004 .align 2, 0 -_08071FB4: .4byte gLinkState +_08071FB4: .4byte gPlayerState _08071FB8: bl sub_08079B24 cmp r0, #0 @@ -3263,7 +3263,7 @@ _08071FB8: bl sub_08079708 b _08071FFE _08071FC8: - ldr r0, _08071FEC @ =gLinkState + ldr r0, _08071FEC @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #4 @@ -3281,7 +3281,7 @@ _08071FC8: movs r0, #2 b _08071FF4 .align 2, 0 -_08071FEC: .4byte gLinkState +_08071FEC: .4byte gPlayerState _08071FF0: adds r1, r4, #0 adds r1, #0x62 @@ -3317,7 +3317,7 @@ sub_08072008: @ 0x08072008 adds r0, r3, #0 adds r0, #0x62 strb r2, [r0] - ldr r2, _08072044 @ =gLinkState + ldr r2, _08072044 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _08072048 @ =0xFFFFF7FE ands r0, r1 @@ -3329,7 +3329,7 @@ sub_08072008: @ 0x08072008 bl sub_080791BC pop {pc} .align 2, 0 -_08072044: .4byte gLinkState +_08072044: .4byte gPlayerState _08072048: .4byte 0xFFFFF7FE thumb_func_start sub_0807204C @@ -3354,7 +3354,7 @@ sub_08072064: @ 0x08072064 movs r1, #0x7f ands r1, r2 strb r1, [r0, #0x10] - ldr r2, _08072094 @ =gLinkState + ldr r2, _08072094 @ =gPlayerState adds r1, r2, #0 adds r1, #0x3a ldrb r1, [r1] @@ -3367,10 +3367,10 @@ sub_08072064: @ 0x08072064 lsls r0, r0, #8 orrs r1, r0 strh r1, [r2, #8] - bl ResetLink + bl ResetPlayer pop {pc} .align 2, 0 -_08072094: .4byte gLinkState +_08072094: .4byte gPlayerState thumb_func_start sub_08072098 sub_08072098: @ 0x08072098 @@ -3443,7 +3443,7 @@ sub_08072100: @ 0x08072100 strh r0, [r4, #0x24] ldr r0, _08072148 @ =gUnk_08114F88 str r0, [r4, #0x48] - ldr r2, _0807214C @ =gLinkState + ldr r2, _0807214C @ =gPlayerState adds r0, r2, #0 adds r0, #0x38 ldrb r0, [r0] @@ -3471,14 +3471,14 @@ _0807213A: b _08072158 .align 2, 0 _08072148: .4byte gUnk_08114F88 -_0807214C: .4byte gLinkState +_0807214C: .4byte gPlayerState _08072150: .4byte 0x00000404 _08072154: movs r0, #0x82 lsls r0, r0, #1 _08072158: strh r0, [r2, #8] - bl ResetLink + bl ResetPlayer adds r0, r4, #0 bl sub_08072168 pop {r4, pc} @@ -3504,7 +3504,7 @@ sub_08072168: @ 0x08072168 _0807218A: adds r0, r4, #0 bl sub_08003FC4 - ldr r0, _080721A4 @ =gLinkState + ldr r0, _080721A4 @ =gPlayerState adds r0, #0x3a ldrb r0, [r0] cmp r0, #0 @@ -3513,11 +3513,11 @@ _0807218A: bl sub_0806F69C b _080721AC .align 2, 0 -_080721A4: .4byte gLinkState +_080721A4: .4byte gPlayerState _080721A8: bl sub_08079E08 _080721AC: - ldr r1, _080721E0 @ =gLinkState + ldr r1, _080721E0 @ =gPlayerState ldrb r0, [r4, #0x15] strb r0, [r1, #0xd] bl sub_08019840 @@ -3542,12 +3542,12 @@ _080721AC: _080721DE: pop {r4, pc} .align 2, 0 -_080721E0: .4byte gLinkState +_080721E0: .4byte gPlayerState thumb_func_start sub_080721E4 sub_080721E4: @ 0x080721E4 push {lr} - ldr r1, _08072208 @ =gLinkState + ldr r1, _08072208 @ =gPlayerState adds r1, #0xa8 movs r2, #0x1a strb r2, [r1] @@ -3563,7 +3563,7 @@ sub_080721E4: @ 0x080721E4 strb r1, [r0] pop {pc} .align 2, 0 -_08072208: .4byte gLinkState +_08072208: .4byte gPlayerState _0807220C: .4byte gUnk_0811BB68 _08072210: .4byte gUnk_0200AF00 @@ -3575,7 +3575,7 @@ sub_08072214: @ 0x08072214 strb r0, [r3, #0xd] movs r0, #0x80 strh r0, [r3, #0x24] - ldr r2, _08072244 @ =gLinkState + ldr r2, _08072244 @ =gPlayerState adds r0, r2, #0 adds r0, #0x38 ldrb r0, [r0] @@ -3594,7 +3594,7 @@ sub_08072214: @ 0x08072214 lsls r0, r0, #2 b _0807224A .align 2, 0 -_08072244: .4byte gLinkState +_08072244: .4byte gPlayerState _08072248: ldr r0, _0807225C @ =0x00000944 _0807224A: @@ -3613,7 +3613,7 @@ _0807225C: .4byte 0x00000944 sub_08072260: @ 0x08072260 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _0807229C @ =gLinkState + ldr r5, _0807229C @ =gPlayerState adds r1, r5, #0 adds r1, #0x80 movs r0, #0 @@ -3640,7 +3640,7 @@ sub_08072260: @ 0x08072260 lsls r0, r0, #2 b _080722A2 .align 2, 0 -_0807229C: .4byte gLinkState +_0807229C: .4byte gPlayerState _080722A0: ldr r0, _080722B4 @ =0x00000944 _080722A2: @@ -3658,7 +3658,7 @@ _080722B4: .4byte 0x00000944 thumb_func_start sub_080722B8 sub_080722B8: @ 0x080722B8 push {lr} - ldr r1, _080722D4 @ =gLinkState + ldr r1, _080722D4 @ =gPlayerState adds r1, #0xa8 movs r2, #0xa strb r2, [r1] @@ -3670,7 +3670,7 @@ sub_080722B8: @ 0x080722B8 bl _call_via_r1 pop {pc} .align 2, 0 -_080722D4: .4byte gLinkState +_080722D4: .4byte gPlayerState _080722D8: .4byte gUnk_0811BB70 thumb_func_start sub_080722DC @@ -3681,7 +3681,7 @@ sub_080722DC: @ 0x080722DC movs r0, #0x7f ands r0, r1 strb r0, [r4, #0x10] - ldr r2, _08072318 @ =gLinkState + ldr r2, _08072318 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -3705,7 +3705,7 @@ _0807230E: strh r0, [r5, #8] b _08072332 .align 2, 0 -_08072318: .4byte gLinkState +_08072318: .4byte gPlayerState _0807231C: ldrb r1, [r4, #0x18] movs r0, #4 @@ -3723,7 +3723,7 @@ _08072332: ldr r1, _08072350 @ =0x00000401 orrs r0, r1 str r0, [r5, #0x30] - bl ResetLink + bl ResetPlayer movs r0, #0x92 lsls r0, r0, #1 bl PlaySFX @@ -3766,7 +3766,7 @@ sub_08072354: @ 0x08072354 strb r0, [r4, #0xd] movs r0, #0x3c strb r0, [r4, #0xe] - ldr r2, _080723C4 @ =gLinkState + ldr r2, _080723C4 @ =gPlayerState ldr r0, _080723C8 @ =0x000002C1 strh r0, [r2, #8] ldr r0, [r2, #0x30] @@ -3785,7 +3785,7 @@ sub_08072354: @ 0x08072354 _080723C0: pop {r4, pc} .align 2, 0 -_080723C4: .4byte gLinkState +_080723C4: .4byte gPlayerState _080723C8: .4byte 0x000002C1 _080723CC: .4byte 0xFFFFFBFF @@ -3841,7 +3841,7 @@ sub_0807240C: @ 0x0807240C adds r1, #0x3d movs r0, #0x14 strb r0, [r1] - ldr r2, _0807244C @ =gLinkState + ldr r2, _0807244C @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _08072450 @ =0xFFFFFBFF ands r0, r1 @@ -3853,7 +3853,7 @@ sub_0807240C: @ 0x0807240C _08072448: pop {pc} .align 2, 0 -_0807244C: .4byte gLinkState +_0807244C: .4byte gPlayerState _08072450: .4byte 0xFFFFFBFF thumb_func_start sub_08072454 @@ -3874,7 +3874,7 @@ sub_0807246C: @ 0x0807246C push {lr} movs r1, #1 strb r1, [r0, #0xd] - ldr r2, _0807248C @ =gLinkState + ldr r2, _0807248C @ =gPlayerState adds r1, r2, #0 adds r1, #0x38 ldrb r1, [r1] @@ -3886,7 +3886,7 @@ sub_0807246C: @ 0x0807246C bl PlaySFX pop {pc} .align 2, 0 -_0807248C: .4byte gLinkState +_0807248C: .4byte gPlayerState thumb_func_start sub_08072490 sub_08072490: @ 0x08072490 @@ -3941,7 +3941,7 @@ sub_080724DC: @ 0x080724DC bl sub_080002B8 cmp r0, #0x29 beq _0807254C - ldr r1, _08072530 @ =gLinkState + ldr r1, _08072530 @ =gPlayerState adds r0, r1, #0 adds r0, #0x89 ldrb r0, [r0] @@ -3970,10 +3970,10 @@ _08072512: bl sub_080728AC b _08072588 .align 2, 0 -_08072530: .4byte gLinkState +_08072530: .4byte gPlayerState _08072534: .4byte gRoomControls _08072538: - ldr r0, _08072548 @ =gLinkState + ldr r0, _08072548 @ =gPlayerState ldrb r0, [r0, #0x1c] cmp r0, #0 bne _08072588 @@ -3981,7 +3981,7 @@ _08072538: bl UpdateAnimationSingleFrame b _08072588 .align 2, 0 -_08072548: .4byte gLinkState +_08072548: .4byte gPlayerState _0807254C: ldrb r0, [r4, #0x18] movs r1, #3 @@ -3993,7 +3993,7 @@ _0807254C: ldrb r0, [r0] cmp r0, #0 bne _08072588 - ldr r2, _08072574 @ =gLinkState + ldr r2, _08072574 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -4003,7 +4003,7 @@ _0807254C: b _08072580 .align 2, 0 _08072570: .4byte gRoomVars -_08072574: .4byte gLinkState +_08072574: .4byte gPlayerState _08072578: .4byte 0x00000C18 _0807257C: movs r0, #0x82 @@ -4033,8 +4033,8 @@ sub_0807258C: @ 0x0807258C bl sub_080797C4 cmp r0, #0 beq _080725DC - ldr r2, _080725D4 @ =gLinkState - ldr r1, _080725D8 @ =gLinkEntity + ldr r2, _080725D4 @ =gPlayerState + ldr r1, _080725D8 @ =gPlayerEntity ldrh r0, [r1, #0x2e] strh r0, [r2, #0x16] ldrh r0, [r1, #0x32] @@ -4051,15 +4051,15 @@ sub_0807258C: @ 0x0807258C b _08072604 .align 2, 0 _080725D0: .4byte gRoomControls -_080725D4: .4byte gLinkState -_080725D8: .4byte gLinkEntity +_080725D4: .4byte gPlayerState +_080725D8: .4byte gPlayerEntity _080725DC: adds r0, r4, #0 bl UpdateAnimationSingleFrame b _08072604 _080725E4: - ldr r2, _08072624 @ =gLinkState - ldr r1, _08072628 @ =gLinkEntity + ldr r2, _08072624 @ =gPlayerState + ldr r1, _08072628 @ =gPlayerEntity ldrh r0, [r1, #0x2e] strh r0, [r2, #0x16] ldrh r0, [r1, #0x32] @@ -4074,7 +4074,7 @@ _080725E4: adds r0, r4, #0 bl sub_080728AC _08072604: - ldr r1, _08072624 @ =gLinkState + ldr r1, _08072624 @ =gPlayerState adds r0, r1, #0 adds r0, #0x89 ldrb r0, [r0] @@ -4090,13 +4090,13 @@ _08072604: _08072620: pop {r4, pc} .align 2, 0 -_08072624: .4byte gLinkState -_08072628: .4byte gLinkEntity +_08072624: .4byte gPlayerState +_08072628: .4byte gPlayerEntity thumb_func_start sub_0807262C sub_0807262C: @ 0x0807262C push {lr} - ldr r1, _08072648 @ =gLinkState + ldr r1, _08072648 @ =gPlayerState adds r1, #0xa8 movs r2, #9 strb r2, [r1] @@ -4108,21 +4108,21 @@ sub_0807262C: @ 0x0807262C bl _call_via_r1 pop {pc} .align 2, 0 -_08072648: .4byte gLinkState +_08072648: .4byte gPlayerState _0807264C: .4byte gUnk_0811BB90 thumb_func_start sub_08072650 sub_08072650: @ 0x08072650 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08072698 @ =gLinkState + ldr r5, _08072698 @ =gPlayerState ldr r0, [r5, #0x30] movs r1, #0x80 lsls r1, r1, #0xe ands r0, r1 cmp r0, #0 bne _0807266E - ldr r0, _0807269C @ =gLinkEntity + ldr r0, _0807269C @ =gPlayerEntity bl sub_0806F948 ldrb r0, [r4, #0x14] lsls r0, r0, #2 @@ -4132,7 +4132,7 @@ _0807266E: movs r0, #1 strb r0, [r4, #0xd] strb r1, [r4, #0xe] - bl ResetLink + bl ResetPlayer ldr r3, [r5, #0x30] movs r0, #0x80 ands r0, r3 @@ -4148,8 +4148,8 @@ _0807266E: ldr r0, _080726A0 @ =0x00000C08 b _080726BE .align 2, 0 -_08072698: .4byte gLinkState -_0807269C: .4byte gLinkEntity +_08072698: .4byte gPlayerState +_0807269C: .4byte gPlayerEntity _080726A0: .4byte 0x00000C08 _080726A4: adds r0, r4, #0 @@ -4168,7 +4168,7 @@ _080726BA: lsls r0, r0, #2 _080726BE: strh r0, [r5, #8] - ldr r2, _080726E0 @ =gLinkState + ldr r2, _080726E0 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 lsls r1, r1, #0xb @@ -4183,7 +4183,7 @@ _080726BE: bl PlaySFX b _080726EA .align 2, 0 -_080726E0: .4byte gLinkState +_080726E0: .4byte gPlayerState _080726E4: movs r0, #0x78 bl PlaySFX @@ -4197,7 +4197,7 @@ _080726EA: sub_080726F4: @ 0x080726F4 push {r4, r5, lr} adds r4, r0, #0 - ldr r3, _08072744 @ =gLinkState + ldr r3, _08072744 @ =gPlayerState ldr r2, [r3, #0x30] movs r0, #0xc0 lsls r0, r0, #0xc @@ -4236,7 +4236,7 @@ _08072730: _08072740: b _080727E0 .align 2, 0 -_08072744: .4byte gLinkState +_08072744: .4byte gPlayerState _08072748: .4byte 0xFFFBFFFF _0807274C: ldrb r1, [r4, #0x14] @@ -4244,7 +4244,7 @@ _0807274C: ands r0, r1 lsls r0, r0, #2 strb r0, [r4, #0x15] - ldr r0, _080727A0 @ =gLinkState + ldr r0, _080727A0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -4257,14 +4257,14 @@ _0807274C: lsrs r0, r0, #0x18 cmp r0, #0xff bne _0807277E - ldr r0, _080727A4 @ =gLinkEntity + ldr r0, _080727A4 @ =gPlayerEntity movs r1, #0x11 movs r2, #0x40 bl CreateFx movs r0, #4 strb r0, [r4, #0xe] _0807277E: - ldr r5, _080727A0 @ =gLinkState + ldr r5, _080727A0 @ =gPlayerState ldr r0, [r5, #0x30] movs r1, #2 ands r0, r1 @@ -4281,8 +4281,8 @@ _0807278E: str r0, [r5, #0x30] b _080728A0 .align 2, 0 -_080727A0: .4byte gLinkState -_080727A4: .4byte gLinkEntity +_080727A0: .4byte gPlayerState +_080727A4: .4byte gPlayerEntity _080727A8: .4byte 0xFFFBFFFF _080727AC: ldr r1, [r5, #0x30] @@ -4372,7 +4372,7 @@ _08072844: ands r0, r1 cmp r0, #0 bne _08072860 - ldr r0, _080728A4 @ =gLinkState + ldr r0, _080728A4 @ =gPlayerState ldr r1, [r0, #0x30] movs r0, #0x80 ands r1, r0 @@ -4395,7 +4395,7 @@ _08072870: ands r0, r1 cmp r0, #0 bne _08072882 - ldr r0, _080728A4 @ =gLinkState + ldr r0, _080728A4 @ =gPlayerState ldrb r0, [r0, #4] cmp r0, #0 beq _08072886 @@ -4407,7 +4407,7 @@ _08072886: ands r0, r1 cmp r0, #0 beq _0807289A - ldr r0, _080728A4 @ =gLinkState + ldr r0, _080728A4 @ =gPlayerState ldr r1, [r0, #0x30] ldr r2, _080728A8 @ =0xFFDBFFFF ands r1, r2 @@ -4418,7 +4418,7 @@ _0807289A: _080728A0: pop {r4, r5, pc} .align 2, 0 -_080728A4: .4byte gLinkState +_080728A4: .4byte gPlayerState _080728A8: .4byte 0xFFDBFFFF thumb_func_start sub_080728AC @@ -4426,7 +4426,7 @@ sub_080728AC: @ 0x080728AC push {r4, r5, lr} adds r4, r0, #0 bl sub_08079938 - ldr r0, _080728C8 @ =gLinkState + ldr r0, _080728C8 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -4436,11 +4436,11 @@ sub_080728AC: @ 0x080728AC bl sub_0807B068 b _080728D0 .align 2, 0 -_080728C8: .4byte gLinkState +_080728C8: .4byte gPlayerState _080728CC: bl sub_08078F60 _080728D0: - ldr r1, _08072940 @ =gLinkState + ldr r1, _08072940 @ =gPlayerState adds r0, r1, #0 adds r0, #0x26 ldrb r0, [r0] @@ -4455,7 +4455,7 @@ _080728E0: adds r3, r0, #0 cmp r5, #0 bne _080728F6 - ldr r0, _08072944 @ =gLinkEntity + ldr r0, _08072944 @ =gPlayerEntity ldrb r1, [r0, #0x18] movs r2, #3 orrs r1, r2 @@ -4465,7 +4465,7 @@ _080728F6: ands r0, r3 cmp r0, #0 bne _08072910 - ldr r2, _08072944 @ =gLinkEntity + ldr r2, _08072944 @ =gPlayerEntity adds r2, #0x29 ldrb r1, [r2] movs r0, #0x39 @@ -4490,7 +4490,7 @@ _08072910: _08072928: bl sub_080791D0 _0807292C: - ldr r0, _08072940 @ =gLinkState + ldr r0, _08072940 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #2 ands r0, r1 @@ -4500,14 +4500,14 @@ _0807292C: _0807293C: pop {r4, r5, pc} .align 2, 0 -_08072940: .4byte gLinkState -_08072944: .4byte gLinkEntity +_08072940: .4byte gPlayerState +_08072944: .4byte gPlayerEntity _08072948: .4byte gRoomControls thumb_func_start sub_0807294C sub_0807294C: @ 0x0807294C push {lr} - ldr r1, _08072968 @ =gLinkState + ldr r1, _08072968 @ =gPlayerState adds r1, #0xa8 movs r2, #0x17 strb r2, [r1] @@ -4519,7 +4519,7 @@ sub_0807294C: @ 0x0807294C bl _call_via_r1 pop {pc} .align 2, 0 -_08072968: .4byte gLinkState +_08072968: .4byte gPlayerState _0807296C: .4byte gUnk_0811BB98 thumb_func_start sub_08072970 @@ -4560,7 +4560,7 @@ sub_08072970: @ 0x08072970 ands r0, r1 strb r0, [r2] strb r3, [r5, #0xe] - ldr r2, _080729D8 @ =gLinkState + ldr r2, _080729D8 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 lsls r1, r1, #0xd @@ -4577,7 +4577,7 @@ sub_08072970: @ 0x08072970 adds r6, #0x38 b _08072A14 .align 2, 0 -_080729D8: .4byte gLinkState +_080729D8: .4byte gPlayerState _080729DC: ldr r0, _08072A50 @ =0x0000061C strh r0, [r2, #8] @@ -4626,7 +4626,7 @@ _08072A14: orrs r1, r2 ldrb r2, [r6] bl SetTile - bl ResetLink + bl ResetPlayer adds r0, r5, #0 bl sub_08072A60 movs r0, #0x81 @@ -4663,17 +4663,17 @@ sub_08072A60: @ 0x08072A60 movs r1, #8 orrs r0, r1 strb r0, [r2] - ldr r1, _08072A94 @ =gLinkState + ldr r1, _08072A94 @ =gPlayerState ldr r0, _08072A98 @ =0x00000624 strh r0, [r1, #8] b _08072ACA .align 2, 0 -_08072A94: .4byte gLinkState +_08072A94: .4byte gPlayerState _08072A98: .4byte 0x00000624 _08072A9C: movs r0, #2 strb r0, [r2, #0xd] - ldr r2, _08072AB4 @ =gLinkState + ldr r2, _08072AB4 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #8 ands r0, r1 @@ -4683,7 +4683,7 @@ _08072A9C: strh r0, [r2, #8] b _08072ACA .align 2, 0 -_08072AB4: .4byte gLinkState +_08072AB4: .4byte gPlayerState _08072AB8: .4byte 0x00000954 _08072ABC: movs r0, #0xc4 @@ -4700,7 +4700,7 @@ _08072ACA: sub_08072ACC: @ 0x08072ACC push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08072AE0 @ =gLinkState + ldr r5, _08072AE0 @ =gPlayerState ldrb r3, [r5, #0xd] lsls r2, r3, #0x18 lsrs r0, r2, #0x18 @@ -4709,7 +4709,7 @@ sub_08072ACC: @ 0x08072ACC movs r0, #0 b _08072B56 .align 2, 0 -_08072AE0: .4byte gLinkState +_08072AE0: .4byte gPlayerState _08072AE4: ldrb r1, [r4, #0xf] cmp r1, #7 @@ -4843,7 +4843,7 @@ _08072B82: ldr r0, [r5, #0x34] subs r0, #1 str r0, [r5, #0x34] - ldr r1, _08072C0C @ =gLinkState + ldr r1, _08072C0C @ =gPlayerState movs r0, #0x41 strb r0, [r1, #2] movs r2, #0xc @@ -4856,7 +4856,7 @@ _08072B82: .align 2, 0 _08072C04: .4byte 0x00004021 _08072C08: .4byte gRoomControls -_08072C0C: .4byte gLinkState +_08072C0C: .4byte gPlayerState _08072C10: bl sub_08052620 cmp r0, #0 @@ -4874,7 +4874,7 @@ _08072C1E: movs r0, #0x80 lsls r0, r0, #1 strh r0, [r5, #0x24] - ldr r1, _08072C44 @ =gLinkState + ldr r1, _08072C44 @ =gPlayerState movs r0, #0x81 lsls r0, r0, #4 strh r0, [r1, #8] @@ -4883,7 +4883,7 @@ _08072C1E: _08072C40: pop {r4, r5, r6, pc} .align 2, 0 -_08072C44: .4byte gLinkState +_08072C44: .4byte gPlayerState thumb_func_start sub_08072C48 sub_08072C48: @ 0x08072C48 @@ -4901,7 +4901,7 @@ sub_08072C48: @ 0x08072C48 adds r0, r4, #0 movs r1, #7 bl sub_08008790 - ldr r4, _08072C90 @ =gLinkState + ldr r4, _08072C90 @ =gPlayerState ldrb r0, [r4, #0x14] cmp r0, #0 beq _08072C94 @@ -4918,7 +4918,7 @@ sub_08072C48: @ 0x08072C48 bl sub_080791BC b _08072C98 .align 2, 0 -_08072C90: .4byte gLinkState +_08072C90: .4byte gPlayerState _08072C94: bl sub_0807921C _08072C98: @@ -4928,7 +4928,7 @@ _08072C98: thumb_func_start sub_08072C9C sub_08072C9C: @ 0x08072C9C push {lr} - ldr r1, _08072CB8 @ =gLinkState + ldr r1, _08072CB8 @ =gPlayerState adds r1, #0xa8 movs r2, #0x11 strb r2, [r1] @@ -4940,7 +4940,7 @@ sub_08072C9C: @ 0x08072C9C bl _call_via_r1 pop {pc} .align 2, 0 -_08072CB8: .4byte gLinkState +_08072CB8: .4byte gPlayerState _08072CBC: .4byte gUnk_0811BBAC thumb_func_start sub_08072CC0 @@ -4951,7 +4951,7 @@ sub_08072CC0: @ 0x08072CC0 movs r1, #0x7f ands r1, r2 strb r1, [r0, #0x10] - ldr r3, _08072CF4 @ =gLinkState + ldr r3, _08072CF4 @ =gPlayerState adds r1, r3, #0 adds r1, #0x3a ldrb r1, [r1] @@ -4971,7 +4971,7 @@ sub_08072CC0: @ 0x08072CC0 strb r2, [r3, #5] bx lr .align 2, 0 -_08072CF4: .4byte gLinkState +_08072CF4: .4byte gPlayerState _08072CF8: .4byte 0x00000524 thumb_func_start sub_08072CFC @@ -4993,7 +4993,7 @@ sub_08072CFC: @ 0x08072CFC _08072D1C: movs r0, #2 strb r0, [r4, #0xd] - ldr r2, _08072D50 @ =gLinkState + ldr r2, _08072D50 @ =gPlayerState adds r1, r2, #0 adds r1, #0x38 ldrb r0, [r1] @@ -5015,11 +5015,11 @@ _08072D30: movs r0, #5 strb r0, [r4, #0xe] strb r1, [r4, #0xf] - bl ResetLink + bl ResetPlayer _08072D4E: pop {r4, pc} .align 2, 0 -_08072D50: .4byte gLinkState +_08072D50: .4byte gPlayerState thumb_func_start sub_08072D54 sub_08072D54: @ 0x08072D54 @@ -5063,7 +5063,7 @@ _08072D9C: b _08072E6C _08072DA6: ldr r1, _08072DC8 @ =gUnk_0811BBD4 - ldr r0, _08072DCC @ =gLinkEntity + ldr r0, _08072DCC @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 lsls r0, r0, #2 @@ -5079,10 +5079,10 @@ _08072DA6: b _08072E6C .align 2, 0 _08072DC8: .4byte gUnk_0811BBD4 -_08072DCC: .4byte gLinkEntity +_08072DCC: .4byte gPlayerEntity _08072DD0: ldr r1, _08072DEC @ =gUnk_0811BBD4 - ldr r0, _08072DF0 @ =gLinkEntity + ldr r0, _08072DF0 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 lsls r0, r0, #2 @@ -5096,7 +5096,7 @@ _08072DD0: b _08072E6C .align 2, 0 _08072DEC: .4byte gUnk_0811BBD4 -_08072DF0: .4byte gLinkEntity +_08072DF0: .4byte gPlayerEntity _08072DF4: movs r0, #2 strb r0, [r4, #0xf] @@ -5107,7 +5107,7 @@ _08072DFA: eors r0, r5 strb r0, [r4, #0x14] ldr r1, _08072E28 @ =gUnk_0811BBD4 - ldr r0, _08072E2C @ =gLinkEntity + ldr r0, _08072E2C @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 lsls r0, r0, #2 @@ -5127,14 +5127,14 @@ _08072E22: b _08072E6A .align 2, 0 _08072E28: .4byte gUnk_0811BBD4 -_08072E2C: .4byte gLinkEntity +_08072E2C: .4byte gPlayerEntity _08072E30: ldrb r0, [r4, #0x14] movs r1, #4 eors r0, r1 strb r0, [r4, #0x14] ldr r1, _08072E58 @ =gUnk_0811BBD4 - ldr r0, _08072E5C @ =gLinkEntity + ldr r0, _08072E5C @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 lsls r0, r0, #2 @@ -5149,7 +5149,7 @@ _08072E30: b _08072E64 .align 2, 0 _08072E58: .4byte gUnk_0811BBD4 -_08072E5C: .4byte gLinkEntity +_08072E5C: .4byte gPlayerEntity _08072E60: movs r0, #4 strb r0, [r4, #0xf] @@ -5197,7 +5197,7 @@ _08072EB0: adds r0, r4, #0 movs r1, #7 bl sub_08008790 - ldr r5, _08072EDC @ =gLinkState + ldr r5, _08072EDC @ =gPlayerState ldrb r0, [r5, #0x14] cmp r0, #0 beq _08072EE0 @@ -5214,7 +5214,7 @@ _08072EB0: bl sub_080791BC b _08072F10 .align 2, 0 -_08072EDC: .4byte gLinkState +_08072EDC: .4byte gPlayerState _08072EE0: ldr r0, [r5, #0x30] movs r1, #8 @@ -5270,7 +5270,7 @@ sub_08072F34: @ 0x08072F34 bl sub_08078EFC cmp r0, #0 bne _08072F86 - ldr r6, _08072F88 @ =gLinkState + ldr r6, _08072F88 @ =gPlayerState adds r1, r6, #0 adds r1, #0xa8 movs r0, #0x18 @@ -5305,7 +5305,7 @@ sub_08072F34: @ 0x08072F34 _08072F86: pop {r4, r5, r6, pc} .align 2, 0 -_08072F88: .4byte gLinkState +_08072F88: .4byte gPlayerState _08072F8C: .4byte gUnk_0811BBE4 _08072F90: .4byte 0x000002CF @@ -5313,7 +5313,7 @@ _08072F90: .4byte 0x000002CF sub_08072F94: @ 0x08072F94 push {r4, lr} adds r4, r0, #0 - ldr r0, _08072FB4 @ =gLinkState + ldr r0, _08072FB4 @ =gPlayerState ldrb r1, [r0, #0x12] adds r3, r0, #0 cmp r1, #0x1e @@ -5328,7 +5328,7 @@ _08072FAE: bl sub_0807921C b _0807308C .align 2, 0 -_08072FB4: .4byte gLinkState +_08072FB4: .4byte gPlayerState _08072FB8: adds r2, r4, #0 adds r2, #0x29 @@ -5475,7 +5475,7 @@ sub_08073094: @ 0x08073094 bl sub_08019840 cmp r0, #0 bne _080731A4 - ldr r0, _08073100 @ =gLinkState + ldr r0, _08073100 @ =gPlayerState ldrb r1, [r0, #6] movs r2, #0x80 eors r1, r2 @@ -5490,7 +5490,7 @@ _080730DE: bl sub_08078EFC cmp r0, #0 bne _080731A4 - ldr r1, _08073100 @ =gLinkState + ldr r1, _08073100 @ =gPlayerState ldrb r0, [r1, #0x12] subs r0, #0x19 adds r2, r1, #0 @@ -5503,7 +5503,7 @@ _080730DE: mov pc, r0 .align 2, 0 _080730FC: .4byte gUnk_0811BBEC -_08073100: .4byte gLinkState +_08073100: .4byte gPlayerState _08073104: .4byte _08073108 _08073108: @ jump table .4byte _0807316C @ case 0 @@ -5570,7 +5570,7 @@ _080731A4: sub_080731A8: @ 0x080731A8 push {r4, lr} adds r4, r0, #0 - ldr r0, _080731D0 @ =gLinkState + ldr r0, _080731D0 @ =gPlayerState adds r0, #0xa8 movs r1, #0x1c strb r1, [r0] @@ -5586,5 +5586,5 @@ sub_080731A8: @ 0x080731A8 bl _call_via_r1 pop {r4, pc} .align 2, 0 -_080731D0: .4byte gLinkState +_080731D0: .4byte gPlayerState _080731D4: .4byte gUnk_0811BBF8 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index f675fcf8..6068b8b1 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -31,7 +31,7 @@ _080732EE: movs r2, #1 movs r3, #0 bl CreateObjectWithParent - ldr r0, _08073318 @ =gLinkState + ldr r0, _08073318 @ =gPlayerState adds r0, #0x39 ldrb r0, [r0] cmp r0, #7 @@ -40,7 +40,7 @@ _080732EE: bl PlaySFX b _08073328 .align 2, 0 -_08073318: .4byte gLinkState +_08073318: .4byte gPlayerState _0807331C: .4byte 0x00000187 _08073320: movs r0, #0xc4 @@ -55,7 +55,7 @@ sub_0807332C: @ 0x0807332C push {r4, lr} adds r4, r0, #0 bl UpdateAnimationSingleFrame - ldr r0, _08073344 @ =gLinkState + ldr r0, _08073344 @ =gPlayerState adds r0, #0x39 ldrb r0, [r0] cmp r0, #7 @@ -63,7 +63,7 @@ sub_0807332C: @ 0x0807332C movs r0, #0 b _0807334A .align 2, 0 -_08073344: .4byte gLinkState +_08073344: .4byte gPlayerState _08073348: movs r0, #0x1c _0807334A: @@ -73,7 +73,7 @@ _0807334A: ands r0, r1 cmp r0, #0xf beq _08073386 - ldr r0, _08073368 @ =gLinkState + ldr r0, _08073368 @ =gPlayerState adds r0, #0x39 ldrb r0, [r0] cmp r0, #7 @@ -83,7 +83,7 @@ _0807334A: movs r0, #4 b _0807337C .align 2, 0 -_08073368: .4byte gLinkState +_08073368: .4byte gPlayerState _0807336C: movs r0, #6 strb r0, [r4, #0x14] @@ -100,7 +100,7 @@ _0807337E: bl sub_0806F69C b _080733B6 _08073386: - ldr r0, _0807339C @ =gLinkState + ldr r0, _0807339C @ =gPlayerState adds r0, #0x38 ldrb r0, [r0] cmp r0, #0 @@ -110,7 +110,7 @@ _08073386: bl sub_080791BC b _080733B6 .align 2, 0 -_0807339C: .4byte gLinkState +_0807339C: .4byte gPlayerState _080733A0: .4byte gRoomControls _080733A4: ldr r0, _080733B8 @ =gUnk_03001000 @@ -194,7 +194,7 @@ sub_08073420: @ 0x08073420 ands r1, r0 orrs r1, r2 strb r1, [r4, #0x19] - ldr r0, _08073460 @ =gLinkState + ldr r0, _08073460 @ =gPlayerState adds r0, #0xa8 movs r1, #8 strb r1, [r0] @@ -208,14 +208,14 @@ sub_08073420: @ 0x08073420 _0807345E: pop {r4, pc} .align 2, 0 -_08073460: .4byte gLinkState +_08073460: .4byte gPlayerState _08073464: .4byte gUnk_0811BC08 thumb_func_start sub_08073468 sub_08073468: @ 0x08073468 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _080734CC @ =gLinkState + ldr r5, _080734CC @ =gPlayerState movs r1, #0 movs r0, #0xe0 lsls r0, r0, #3 @@ -247,7 +247,7 @@ sub_08073468: @ 0x08073468 movs r3, #0 bl CreateObjectWithParent _080734AC: - bl ResetLink + bl ResetPlayer ldr r0, [r4, #0x20] cmp r0, #0 bgt _080734C0 @@ -264,7 +264,7 @@ _080734C0: _080734C8: pop {r4, r5, pc} .align 2, 0 -_080734CC: .4byte gLinkState +_080734CC: .4byte gPlayerState _080734D0: .4byte 0xFFFF0000 thumb_func_start sub_080734D4 @@ -276,7 +276,7 @@ sub_080734D4: @ 0x080734D4 ldr r0, [r4, #0x20] cmp r0, #0 bgt _080734EE - ldr r0, _08073500 @ =gLinkState + ldr r0, _08073500 @ =gPlayerState adds r0, #0x38 ldrb r0, [r0] cmp r0, #1 @@ -292,7 +292,7 @@ _080734FA: pop {r4, pc} .align 2, 0 _080734FC: .4byte 0xFFFFF000 -_08073500: .4byte gLinkState +_08073500: .4byte gPlayerState thumb_func_start sub_08073504 sub_08073504: @ 0x08073504 @@ -331,7 +331,7 @@ _08073516: strb r2, [r0] subs r0, #1 strb r2, [r0] - ldr r0, _08073580 @ =gLinkState + ldr r0, _08073580 @ =gPlayerState movs r1, #0xe1 lsls r1, r1, #3 strh r1, [r0, #8] @@ -357,13 +357,13 @@ _08073576: bl UpdateAnimationSingleFrame pop {r4, pc} .align 2, 0 -_08073580: .4byte gLinkState +_08073580: .4byte gPlayerState thumb_func_start sub_08073584 sub_08073584: @ 0x08073584 push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r2, _080735DC @ =gLinkState + ldr r2, _080735DC @ =gPlayerState adds r0, r2, #0 adds r0, #0x92 ldrh r1, [r0] @@ -404,7 +404,7 @@ _080735C0: strh r0, [r6, #8] b _08073794 .align 2, 0 -_080735DC: .4byte gLinkState +_080735DC: .4byte gPlayerState _080735E0: ldr r0, _0807360C @ =gUnk_0200AF00 adds r0, #0x2f @@ -443,7 +443,7 @@ _08073620: .4byte gArea _08073624: strh r5, [r4, #0x24] _08073626: - ldr r3, _08073650 @ =gLinkState + ldr r3, _08073650 @ =gPlayerState ldrb r1, [r3, #0xd] movs r0, #0x80 ands r0, r1 @@ -464,7 +464,7 @@ _08073626: subs r0, #0x20 b _08073658 .align 2, 0 -_08073650: .4byte gLinkState +_08073650: .4byte gPlayerState _08073654: ldr r0, [r2] adds r0, #0x20 @@ -517,7 +517,7 @@ _08073696: _080736A8: strb r3, [r4, #0x14] movs r5, #0 - ldr r1, _080736E4 @ =gLinkState + ldr r1, _080736E4 @ =gPlayerState ldrb r2, [r1, #0xd] lsrs r3, r2, #2 mov r6, ip @@ -547,7 +547,7 @@ _080736CA: movs r5, #2 b _080736FA .align 2, 0 -_080736E4: .4byte gLinkState +_080736E4: .4byte gPlayerState _080736E8: movs r0, #6 ands r0, r3 @@ -618,7 +618,7 @@ _08073762: rsbs r0, r0, #0 cmp r1, r0 bne _08073784 - ldr r2, _08073780 @ =gLinkState + ldr r2, _08073780 @ =gPlayerState ldrb r1, [r2, #2] movs r0, #0x40 orrs r0, r1 @@ -626,7 +626,7 @@ _08073762: bl sub_0807921C b _08073794 .align 2, 0 -_08073780: .4byte gLinkState +_08073780: .4byte gPlayerState _08073784: adds r0, r1, #0 movs r1, #0x14 @@ -691,7 +691,7 @@ _080737E4: bl sub_080002D0 cmp r0, #0 bne _08073804 - ldr r2, _08073808 @ =gLinkState + ldr r2, _08073808 @ =gPlayerState ldrb r1, [r2, #2] movs r0, #0x40 orrs r0, r1 @@ -700,7 +700,7 @@ _080737E4: _08073804: pop {r4, pc} .align 2, 0 -_08073808: .4byte gLinkState +_08073808: .4byte gPlayerState thumb_func_start sub_0807380C sub_0807380C: @ 0x0807380C @@ -720,7 +720,7 @@ sub_0807380C: @ 0x0807380C lsls r0, r0, #2 strb r0, [r4, #0x15] _0807382A: - ldr r2, _08073858 @ =gLinkState + ldr r2, _08073858 @ =gPlayerState ldr r1, _0807385C @ =gUnk_0811BC38 ldrb r0, [r4, #0x14] lsrs r0, r0, #1 @@ -741,7 +741,7 @@ _0807382A: b _0807387A .align 2, 0 _08073854: .4byte gScreenTransition -_08073858: .4byte gLinkState +_08073858: .4byte gPlayerState _0807385C: .4byte gUnk_0811BC38 _08073860: ldrb r0, [r4, #0xe] @@ -781,7 +781,7 @@ sub_08073884: @ 0x08073884 lsls r0, r0, #2 strb r0, [r4, #0x15] _080738A2: - ldr r2, _080738E0 @ =gLinkState + ldr r2, _080738E0 @ =gPlayerState ldr r1, _080738E4 @ =gUnk_0811BC40 ldrb r0, [r4, #0x14] lsrs r0, r0, #1 @@ -810,7 +810,7 @@ _080738A2: b _080738F0 .align 2, 0 _080738DC: .4byte gScreenTransition -_080738E0: .4byte gLinkState +_080738E0: .4byte gPlayerState _080738E4: .4byte gUnk_0811BC40 _080738E8: .4byte gUnk_0813AD88 _080738EC: @@ -829,7 +829,7 @@ _08073900: .4byte 0xFFFFE800 sub_08073904: @ 0x08073904 push {lr} ldr r3, _0807391C @ =gUnk_0811BC48 - ldr r1, _08073920 @ =gLinkState + ldr r1, _08073920 @ =gPlayerState ldrb r2, [r1, #2] movs r1, #7 ands r1, r2 @@ -840,13 +840,13 @@ sub_08073904: @ 0x08073904 pop {pc} .align 2, 0 _0807391C: .4byte gUnk_0811BC48 -_08073920: .4byte gLinkState +_08073920: .4byte gPlayerState thumb_func_start sub_08073924 sub_08073924: @ 0x08073924 push {r4, lr} adds r4, r0, #0 - ldr r2, _08073964 @ =gLinkState + ldr r2, _08073964 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 lsls r1, r1, #0xb @@ -876,13 +876,13 @@ sub_08073924: @ 0x08073924 _08073962: pop {r4, pc} .align 2, 0 -_08073964: .4byte gLinkState +_08073964: .4byte gPlayerState thumb_func_start sub_08073968 sub_08073968: @ 0x08073968 push {r4, r5, lr} adds r5, r0, #0 - ldr r4, _08073998 @ =gLinkState + ldr r4, _08073998 @ =gPlayerState ldrb r1, [r4, #2] movs r0, #0xc0 ands r0, r1 @@ -905,7 +905,7 @@ _0807397C: ldr r0, _0807399C @ =0x0000041C b _080739BA .align 2, 0 -_08073998: .4byte gLinkState +_08073998: .4byte gPlayerState _0807399C: .4byte 0x0000041C _080739A0: movs r0, #0x80 @@ -925,7 +925,7 @@ _080739B8: _080739BA: strh r0, [r4, #8] _080739BC: - ldr r0, _080739E8 @ =gLinkState + ldr r0, _080739E8 @ =gPlayerState ldrb r1, [r0, #2] movs r0, #0xc0 ands r0, r1 @@ -937,7 +937,7 @@ _080739CE: movs r0, #0x7c bl PlaySFX _080739D4: - ldr r2, _080739E8 @ =gLinkState + ldr r2, _080739E8 @ =gPlayerState ldrb r1, [r2, #2] movs r0, #0xf8 ands r0, r1 @@ -947,13 +947,13 @@ _080739D4: pop {r4, r5, pc} .align 2, 0 _080739E4: .4byte 0x0000080C -_080739E8: .4byte gLinkState +_080739E8: .4byte gPlayerState thumb_func_start sub_080739EC sub_080739EC: @ 0x080739EC push {r4, r5, lr} adds r4, r0, #0 - ldr r1, _08073A14 @ =gLinkState + ldr r1, _08073A14 @ =gPlayerState ldrb r2, [r1, #2] movs r0, #0xc0 ands r0, r2 @@ -973,7 +973,7 @@ _08073A0E: lsls r2, r2, #6 b _08073A48 .align 2, 0 -_08073A14: .4byte gLinkState +_08073A14: .4byte gPlayerState _08073A18: movs r2, #0xc rsbs r2, r2, #0 @@ -1057,11 +1057,11 @@ _08073AAE: adds r0, r4, #0 bl sub_08073B60 _08073AB4: - ldr r0, _08073ACC @ =gLinkEntity + ldr r0, _08073ACC @ =gPlayerEntity ldr r0, [r0, #0x34] cmp r0, #0 beq _08073AC8 - ldr r1, _08073AD0 @ =gLinkState + ldr r1, _08073AD0 @ =gPlayerState movs r0, #0 strb r0, [r1, #2] adds r0, r4, #0 @@ -1069,8 +1069,8 @@ _08073AB4: _08073AC8: pop {r4, pc} .align 2, 0 -_08073ACC: .4byte gLinkEntity -_08073AD0: .4byte gLinkState +_08073ACC: .4byte gPlayerEntity +_08073AD0: .4byte gPlayerState thumb_func_start sub_08073AD4 sub_08073AD4: @ 0x08073AD4 @@ -1094,7 +1094,7 @@ sub_08073AD4: @ 0x08073AD4 orrs r1, r2 strb r1, [r4, #0x19] _08073AFA: - ldr r6, _08073B48 @ =gLinkState + ldr r6, _08073B48 @ =gPlayerState ldrb r5, [r6, #2] movs r0, #0xc1 rsbs r0, r0, #0 @@ -1120,7 +1120,7 @@ _08073AFA: adds r0, r4, #0 bl sub_08073B60 _08073B32: - ldr r2, _08073B48 @ =gLinkState + ldr r2, _08073B48 @ =gPlayerState adds r0, r5, #1 strb r0, [r2, #2] ldr r0, [r2, #0x30] @@ -1131,7 +1131,7 @@ _08073B32: ldr r0, _08073B4C @ =0x00000424 b _08073B54 .align 2, 0 -_08073B48: .4byte gLinkState +_08073B48: .4byte gPlayerState _08073B4C: .4byte 0x00000424 _08073B50: movs r0, #0x82 @@ -1148,7 +1148,7 @@ _08073B5C: sub_08073B60: @ 0x08073B60 push {r4, r5, lr} adds r5, r0, #0 - ldr r4, _08073B88 @ =gLinkState + ldr r4, _08073B88 @ =gPlayerState movs r0, #0 strb r0, [r4, #0x1b] strb r0, [r4, #4] @@ -1165,13 +1165,13 @@ sub_08073B60: @ 0x08073B60 _08073B86: pop {r4, r5, pc} .align 2, 0 -_08073B88: .4byte gLinkState +_08073B88: .4byte gPlayerState thumb_func_start sub_08073B8C sub_08073B8C: @ 0x08073B8C push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08073BCC @ =gLinkState + ldr r5, _08073BCC @ =gPlayerState ldrb r0, [r5, #4] cmp r0, #0 beq _08073C04 @@ -1201,7 +1201,7 @@ _08073BB8: strb r0, [r4, #0xe] b _08073C28 .align 2, 0 -_08073BCC: .4byte gLinkState +_08073BCC: .4byte gPlayerState _08073BD0: movs r1, #0x80 lsls r1, r1, #7 @@ -1232,7 +1232,7 @@ _08073C04: bl sub_08073B60 b _08073C28 _08073C0C: - ldr r1, _08073C2C @ =gLinkState + ldr r1, _08073C2C @ =gPlayerState ldrb r0, [r1, #2] adds r0, #1 strb r0, [r1, #2] @@ -1247,13 +1247,13 @@ _08073C0C: _08073C28: pop {r4, r5, pc} .align 2, 0 -_08073C2C: .4byte gLinkState +_08073C2C: .4byte gPlayerState thumb_func_start sub_08073C30 sub_08073C30: @ 0x08073C30 push {lr} adds r2, r0, #0 - ldr r0, _08073C54 @ =gLinkState + ldr r0, _08073C54 @ =gPlayerState ldrb r0, [r0, #4] cmp r0, #0 beq _08073C4A @@ -1269,7 +1269,7 @@ _08073C4A: bl sub_08073B60 b _08073C66 .align 2, 0 -_08073C54: .4byte gLinkState +_08073C54: .4byte gPlayerState _08073C58: ldrb r0, [r2, #0x10] movs r1, #0x80 @@ -1297,7 +1297,7 @@ _08073C7C: .4byte gUnk_0811BC60 sub_08073C80: @ 0x08073C80 push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r2, _08073D00 @ =gLinkState + ldr r2, _08073D00 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 orrs r0, r1 @@ -1358,7 +1358,7 @@ sub_08073C80: @ 0x08073C80 strb r6, [r4, #0xd] b _08073D1E .align 2, 0 -_08073D00: .4byte gLinkState +_08073D00: .4byte gPlayerState _08073D04: .4byte 0x00000C18 _08073D08: .4byte gUnk_0811BC80 _08073D0C: .4byte gRoomControls @@ -1377,7 +1377,7 @@ sub_08073D20: @ 0x08073D20 mov r7, r8 push {r7} adds r4, r0, #0 - ldr r5, _08073D70 @ =gLinkState + ldr r5, _08073D70 @ =gPlayerState movs r0, #0xa8 adds r0, r0, r5 mov r8, r0 @@ -1412,7 +1412,7 @@ _08073D60: bl sub_08079708 b _08073EFC .align 2, 0 -_08073D70: .4byte gLinkState +_08073D70: .4byte gPlayerState _08073D74: bl sub_08078EFC adds r6, r0, #0 @@ -1504,10 +1504,10 @@ _08073E10: adds r1, r0, #0 cmp r1, #0 bne _08073E32 - ldr r0, _08073E74 @ =gLinkState + ldr r0, _08073E74 @ =gPlayerState strb r1, [r0, #2] _08073E32: - ldr r2, _08073E74 @ =gLinkState + ldr r2, _08073E74 @ =gPlayerState ldrb r1, [r2, #7] movs r3, #0x80 adds r0, r3, #0 @@ -1538,7 +1538,7 @@ _08073E32: bl sub_08079E08 b _08073E90 .align 2, 0 -_08073E74: .4byte gLinkState +_08073E74: .4byte gPlayerState _08073E78: ldrb r1, [r2, #0xd] strb r1, [r4, #0x15] @@ -1552,7 +1552,7 @@ _08073E78: strb r0, [r1] bl sub_08079E08 _08073E90: - ldr r5, _08073EF0 @ =gLinkState + ldr r5, _08073EF0 @ =gPlayerState ldrb r0, [r5, #0xb] cmp r0, #0 bne _08073E9E @@ -1595,7 +1595,7 @@ _08073EDC: bl sub_08008AC6 b _08073EFC .align 2, 0 -_08073EF0: .4byte gLinkState +_08073EF0: .4byte gPlayerState _08073EF4: adds r1, r5, #0 adds r1, #0xa8 @@ -1633,16 +1633,16 @@ sub_08073F04: @ 0x08073F04 movs r1, #0x80 lsls r1, r1, #1 strh r1, [r0, #0x24] - ldr r2, _08073F48 @ =gLinkState + ldr r2, _08073F48 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x81 rsbs r1, r1, #0 ands r0, r1 str r0, [r2, #0x30] - bl ResetLink + bl ResetPlayer pop {pc} .align 2, 0 -_08073F48: .4byte gLinkState +_08073F48: .4byte gPlayerState thumb_func_start sub_08073F4C sub_08073F4C: @ 0x08073F4C @@ -1703,13 +1703,13 @@ _08073F88: strb r0, [r4, #0x19] adds r0, r4, #0 bl sub_08074018 - ldr r1, _08073FC8 @ =gLinkState + ldr r1, _08073FC8 @ =gPlayerState ldr r0, _08073FCC @ =0x0000073C strh r0, [r1, #8] _08073FC6: pop {r4, r5, pc} .align 2, 0 -_08073FC8: .4byte gLinkState +_08073FC8: .4byte gPlayerState _08073FCC: .4byte 0x0000073C thumb_func_start sub_08073FD0 @@ -1833,7 +1833,7 @@ sub_08074060: @ 0x08074060 movs r0, #0x80 lsls r0, r0, #0xa str r0, [r4, #0x20] - ldr r1, _080740C8 @ =gLinkState + ldr r1, _080740C8 @ =gPlayerState ldr r0, _080740CC @ =0x0000080C strh r0, [r1, #8] adds r0, r4, #0 @@ -1841,7 +1841,7 @@ sub_08074060: @ 0x08074060 b _080740D6 .align 2, 0 _080740C4: .4byte gUnk_08114F88 -_080740C8: .4byte gLinkState +_080740C8: .4byte gPlayerState _080740CC: .4byte 0x0000080C _080740D0: adds r0, r4, #0 @@ -1976,7 +1976,7 @@ _080741C2: thumb_func_start sub_080741C4 sub_080741C4: @ 0x080741C4 push {lr} - ldr r0, _080741F0 @ =gLinkState + ldr r0, _080741F0 @ =gPlayerState ldrb r1, [r0, #2] adds r2, r0, #0 cmp r1, #0 @@ -1986,7 +1986,7 @@ sub_080741C4: @ 0x080741C4 cmp r0, #3 bne _080741E0 _080741D8: - ldr r0, _080741F4 @ =gLinkEntity + ldr r0, _080741F4 @ =gPlayerEntity ldr r0, [r0, #0x34] cmp r0, #0 beq _080741F8 @@ -1999,8 +1999,8 @@ _080741E0: movs r0, #1 b _080741FA .align 2, 0 -_080741F0: .4byte gLinkState -_080741F4: .4byte gLinkEntity +_080741F0: .4byte gPlayerState +_080741F4: .4byte gPlayerEntity _080741F8: movs r0, #0 _080741FA: @@ -2025,14 +2025,14 @@ sub_08074200: @ 0x08074200 ldrb r0, [r4, #0xc] cmp r0, #3 beq _08074226 - bl ResetLink - ldr r1, _08074228 @ =gLinkState + bl ResetPlayer + ldr r1, _08074228 @ =gPlayerState movs r0, #3 strb r0, [r1, #0xc] _08074226: pop {r4, pc} .align 2, 0 -_08074228: .4byte gLinkState +_08074228: .4byte gPlayerState thumb_func_start sub_0807422C sub_0807422C: @ 0x0807422C @@ -2056,7 +2056,7 @@ sub_08074244: @ 0x08074244 adds r4, r0, #0 adds r6, r1, #0 adds r7, r2, #0 - ldr r5, _0807428C @ =gLinkState + ldr r5, _0807428C @ =gPlayerState ldrb r0, [r5, #0x12] subs r0, #0x28 lsls r0, r0, #0x18 @@ -2088,7 +2088,7 @@ _08074278: ldrb r0, [r5, #0xd] b _08074294 .align 2, 0 -_0807428C: .4byte gLinkState +_0807428C: .4byte gPlayerState _08074290: ldrb r0, [r4, #0x14] lsls r0, r0, #2 @@ -2098,7 +2098,7 @@ _08074294: cmp r7, r0 beq _080742A6 _0807429C: - ldr r1, _080742A8 @ =gLinkState + ldr r1, _080742A8 @ =gPlayerState adds r1, #0x80 ldrh r0, [r1] subs r0, #0x50 @@ -2106,13 +2106,13 @@ _0807429C: _080742A6: pop {r4, r5, r6, r7, pc} .align 2, 0 -_080742A8: .4byte gLinkState +_080742A8: .4byte gPlayerState thumb_func_start sub_080742AC sub_080742AC: @ 0x080742AC push {lr} adds r2, r0, #0 - ldr r0, _080742E0 @ =gLinkState + ldr r0, _080742E0 @ =gPlayerState adds r1, r0, #0 adds r1, #0x26 ldrb r0, [r1] @@ -2137,7 +2137,7 @@ _080742C0: strb r0, [r2] pop {pc} .align 2, 0 -_080742E0: .4byte gLinkState +_080742E0: .4byte gPlayerState thumb_func_start sub_080742E4 sub_080742E4: @ 0x080742E4 @@ -2146,7 +2146,7 @@ sub_080742E4: @ 0x080742E4 bl sub_080741C4 cmp r0, #0 bne _0807430E - ldr r2, _08074310 @ =gLinkState + ldr r2, _08074310 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -2163,7 +2163,7 @@ sub_080742E4: @ 0x080742E4 _0807430E: pop {r4, pc} .align 2, 0 -_08074310: .4byte gLinkState +_08074310: .4byte gPlayerState thumb_func_start sub_08074314 sub_08074314: @ 0x08074314 @@ -2252,7 +2252,7 @@ _080743A0: thumb_func_start sub_080743A4 sub_080743A4: @ 0x080743A4 push {lr} - ldr r3, _080743D0 @ =gLinkState + ldr r3, _080743D0 @ =gPlayerState ldr r1, [r3, #0x30] movs r2, #0x40 orrs r1, r2 @@ -2270,10 +2270,10 @@ sub_080743A4: @ 0x080743A4 strb r1, [r0, #0x10] adds r0, #0x42 strb r3, [r0] - bl ResetLink + bl ResetPlayer pop {pc} .align 2, 0 -_080743D0: .4byte gLinkState +_080743D0: .4byte gPlayerState thumb_func_start sub_080743D4 sub_080743D4: @ 0x080743D4 @@ -2297,7 +2297,7 @@ sub_080743D4: @ 0x080743D4 strh r0, [r5, #0x24] movs r0, #0x10 strb r0, [r5, #0x15] - ldr r2, _08074418 @ =gLinkState + ldr r2, _08074418 @ =gPlayerState ldrb r1, [r2, #0xa] movs r0, #0x80 orrs r0, r1 @@ -2308,13 +2308,13 @@ sub_080743D4: @ 0x080743D4 _08074416: pop {r4, r5, pc} .align 2, 0 -_08074418: .4byte gLinkState +_08074418: .4byte gPlayerState thumb_func_start sub_0807441C sub_0807441C: @ 0x0807441C push {r4, r5, r6, r7, lr} adds r7, r0, #0 - ldr r0, _08074440 @ =gLinkState + ldr r0, _08074440 @ =gPlayerState adds r0, #0xa0 ldrb r0, [r0] cmp r0, #4 @@ -2329,7 +2329,7 @@ sub_0807441C: @ 0x0807441C ldrb r0, [r4] b _0807444E .align 2, 0 -_08074440: .4byte gLinkState +_08074440: .4byte gPlayerState _08074444: .4byte gUnk_02002A40 _08074448: adds r0, r6, #0 @@ -2403,7 +2403,7 @@ _080744A6: .align 2, 0 _080744D0: .4byte gUnk_03004040 _080744D4: - ldr r2, _08074504 @ =gLinkState + ldr r2, _08074504 @ =gPlayerState ldrb r1, [r2, #0x1b] movs r0, #0x80 orrs r0, r1 @@ -2428,7 +2428,7 @@ _080744D4: _08074502: pop {r4, r5, r6, r7, pc} .align 2, 0 -_08074504: .4byte gLinkState +_08074504: .4byte gPlayerState _08074508: .4byte 0xFFF00000 thumb_func_start sub_0807450C @@ -2438,7 +2438,7 @@ sub_0807450C: @ 0x0807450C bl sub_080741C4 cmp r0, #0 bne _0807457A - ldr r7, _0807457C @ =gLinkState + ldr r7, _0807457C @ =gPlayerState ldrb r0, [r7, #0x14] cmp r0, #0 bne _0807457A @@ -2487,7 +2487,7 @@ _08074568: _0807457A: pop {r4, r5, r6, r7, pc} .align 2, 0 -_0807457C: .4byte gLinkState +_0807457C: .4byte gPlayerState _08074580: .4byte 0x0000FFF0 thumb_func_start sub_08074584 @@ -2497,7 +2497,7 @@ sub_08074584: @ 0x08074584 bl sub_080741C4 cmp r0, #0 bne _080745AC - ldr r0, _080745B0 @ =gLinkState + ldr r0, _080745B0 @ =gPlayerState adds r0, #0x35 ldrb r1, [r0] movs r0, #0x80 @@ -2514,7 +2514,7 @@ _080745A8: _080745AC: pop {r4, pc} .align 2, 0 -_080745B0: .4byte gLinkState +_080745B0: .4byte gPlayerState thumb_func_start sub_080745B4 sub_080745B4: @ 0x080745B4 @@ -2523,7 +2523,7 @@ sub_080745B4: @ 0x080745B4 bl sub_080741C4 cmp r0, #0 bne _08074636 - ldr r0, _080745E4 @ =gLinkState + ldr r0, _080745E4 @ =gPlayerState mov ip, r0 ldr r3, [r0, #0x30] movs r0, #0x80 @@ -2540,7 +2540,7 @@ sub_080745B4: @ 0x080745B4 bl sub_0807479C b _08074636 .align 2, 0 -_080745E4: .4byte gLinkState +_080745E4: .4byte gPlayerState _080745E8: mov r5, ip adds r5, #0x26 @@ -2589,7 +2589,7 @@ _08074636: sub_08074638: @ 0x08074638 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08074674 @ =gLinkState + ldr r0, _08074674 @ =gPlayerState adds r5, r0, #0 adds r5, #0x26 ldrb r0, [r5] @@ -2618,7 +2618,7 @@ sub_08074638: @ 0x08074638 _08074670: pop {r4, r5, pc} .align 2, 0 -_08074674: .4byte gLinkState +_08074674: .4byte gPlayerState thumb_func_start sub_08074678 sub_08074678: @ 0x08074678 @@ -2627,12 +2627,12 @@ sub_08074678: @ 0x08074678 bl sub_080741C4 cmp r0, #0 beq _08074690 - ldr r0, _0807468C @ =gLinkState + ldr r0, _0807468C @ =gPlayerState movs r1, #0 strb r1, [r0, #0x11] b _080746CE .align 2, 0 -_0807468C: .4byte gLinkState +_0807468C: .4byte gPlayerState _08074690: adds r0, r4, #0 adds r0, #0x45 @@ -2644,13 +2644,13 @@ _08074690: adds r1, r0, #0 cmp r1, #0 bne _080746B0 - ldr r0, _080746AC @ =gLinkState + ldr r0, _080746AC @ =gPlayerState strb r1, [r0, #0x11] b _080746CE .align 2, 0 -_080746AC: .4byte gLinkState +_080746AC: .4byte gPlayerState _080746B0: - ldr r3, _080746D4 @ =gLinkState + ldr r3, _080746D4 @ =gPlayerState ldr r1, [r3, #0x30] movs r0, #0x80 ands r1, r0 @@ -2670,11 +2670,11 @@ _080746CE: strb r1, [r0] b _08074792 .align 2, 0 -_080746D4: .4byte gLinkState +_080746D4: .4byte gPlayerState _080746D8: bl sub_08077B20 _080746DC: - ldr r1, _08074700 @ =gLinkState + ldr r1, _08074700 @ =gPlayerState adds r0, r1, #0 adds r0, #0x37 ldrb r0, [r0] @@ -2691,7 +2691,7 @@ _080746DC: bl CreateFx b _08074714 .align 2, 0 -_08074700: .4byte gLinkState +_08074700: .4byte gPlayerState _08074704: adds r0, r1, #0 adds r0, #0x92 @@ -2717,7 +2717,7 @@ _08074720: ldr r0, _08074764 @ =0x00000161 bl PlaySFX _08074732: - ldr r2, _08074768 @ =gLinkState + ldr r2, _08074768 @ =gPlayerState adds r1, r2, #0 adds r1, #0x80 ldrh r0, [r1] @@ -2743,9 +2743,9 @@ _08074732: .align 2, 0 _08074760: .4byte gScreenTransition _08074764: .4byte 0x00000161 -_08074768: .4byte gLinkState +_08074768: .4byte gPlayerState _0807476C: - ldr r2, _08074794 @ =gLinkState + ldr r2, _08074794 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _08074798 @ =0xFFFBFFFF ands r0, r1 @@ -2764,7 +2764,7 @@ _0807476C: _08074792: pop {r4, pc} .align 2, 0 -_08074794: .4byte gLinkState +_08074794: .4byte gPlayerState _08074798: .4byte 0xFFFBFFFF thumb_func_start sub_0807479C @@ -2775,7 +2775,7 @@ sub_0807479C: @ 0x0807479C adds r2, r0, #0 cmp r2, #0 bne _08074804 - ldr r1, _080747C0 @ =gLinkState + ldr r1, _080747C0 @ =gPlayerState ldrb r0, [r1, #0x14] adds r3, r1, #0 cmp r0, #0 @@ -2786,7 +2786,7 @@ sub_0807479C: @ 0x0807479C strb r0, [r1] b _080747E6 .align 2, 0 -_080747C0: .4byte gLinkState +_080747C0: .4byte gPlayerState _080747C4: adds r0, r3, #0 adds r0, #0x26 @@ -2834,7 +2834,7 @@ sub_08074808: @ 0x08074808 adds r3, r0, #0 cmp r3, #1 bne _080748B8 - ldr r1, _08074838 @ =gLinkState + ldr r1, _08074838 @ =gPlayerState adds r2, r1, #0 adds r2, #0x26 ldrb r0, [r2] @@ -2849,7 +2849,7 @@ sub_08074808: @ 0x08074808 strb r3, [r2] b _08074840 .align 2, 0 -_08074838: .4byte gLinkState +_08074838: .4byte gPlayerState _0807483C: movs r0, #8 strb r0, [r2] @@ -2857,7 +2857,7 @@ _08074840: movs r1, #0 movs r0, #0 strh r0, [r6, #0x24] - ldr r0, _080748AC @ =gLinkState + ldr r0, _080748AC @ =gPlayerState adds r2, r0, #0 adds r2, #0x89 strb r1, [r2] @@ -2873,9 +2873,9 @@ _08074840: _08074862: ldr r0, _080748B0 @ =0x000001A5 bl PlaySFX - bl ResetLink + bl ResetPlayer _0807486C: - ldr r5, _080748AC @ =gLinkState + ldr r5, _080748AC @ =gPlayerState adds r4, r5, #0 adds r4, #0x26 ldrb r1, [r4] @@ -2907,28 +2907,28 @@ _0807488A: strh r7, [r1] b _080748BE .align 2, 0 -_080748AC: .4byte gLinkState +_080748AC: .4byte gPlayerState _080748B0: .4byte 0x000001A5 _080748B4: .4byte 0xFFFFF3FF _080748B8: - ldr r1, _080748C0 @ =gLinkState + ldr r1, _080748C0 @ =gPlayerState movs r0, #0x14 strb r0, [r1, #0xc] _080748BE: pop {r4, r5, r6, r7, pc} .align 2, 0 -_080748C0: .4byte gLinkState +_080748C0: .4byte gPlayerState thumb_func_start sub_080748C4 sub_080748C4: @ 0x080748C4 - ldr r1, _080748D0 @ =gLinkState + ldr r1, _080748D0 @ =gPlayerState adds r1, #0x3f ldrb r0, [r1] subs r0, #2 strb r0, [r1] bx lr .align 2, 0 -_080748D0: .4byte gLinkState +_080748D0: .4byte gPlayerState thumb_func_start sub_080748D4 sub_080748D4: @ 0x080748D4 @@ -2951,7 +2951,7 @@ sub_080748DC: @ 0x080748DC ldrh r0, [r4, #0x32] adds r0, #0xc strh r0, [r4, #0x32] - ldr r0, _08074914 @ =gLinkState + ldr r0, _08074914 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -2966,7 +2966,7 @@ _0807490A: _08074910: pop {r4, pc} .align 2, 0 -_08074914: .4byte gLinkState +_08074914: .4byte gPlayerState thumb_func_start sub_08074918 sub_08074918: @ 0x08074918 @@ -2979,13 +2979,13 @@ sub_08074918: @ 0x08074918 bl sub_08079C30 cmp r0, #0 beq _08074934 - ldr r1, _08074938 @ =gLinkState + ldr r1, _08074938 @ =gPlayerState movs r0, #0x11 strb r0, [r1, #0xc] _08074934: pop {r4, pc} .align 2, 0 -_08074938: .4byte gLinkState +_08074938: .4byte gPlayerState thumb_func_start sub_0807493C sub_0807493C: @ 0x0807493C @@ -3007,12 +3007,12 @@ _08074952: movs r2, #0 orrs r0, r1 strh r0, [r4, #0x32] - ldr r0, _08074968 @ =gLinkState + ldr r0, _08074968 @ =gPlayerState strb r2, [r0, #0x12] _08074966: pop {r4, pc} .align 2, 0 -_08074968: .4byte gLinkState +_08074968: .4byte gPlayerState thumb_func_start sub_0807496C sub_0807496C: @ 0x0807496C @@ -3022,7 +3022,7 @@ sub_0807496C: @ 0x0807496C adds r3, r0, #0 cmp r3, #0 bne _080749A2 - ldr r0, _080749A4 @ =gLinkState + ldr r0, _080749A4 @ =gPlayerState strb r3, [r0, #2] ldrb r2, [r4, #0x19] movs r1, #0x3f @@ -3040,11 +3040,11 @@ sub_0807496C: @ 0x0807496C adds r1, #0x38 movs r0, #3 strb r0, [r1] - bl ResetLink + bl ResetPlayer _080749A2: pop {r4, pc} .align 2, 0 -_080749A4: .4byte gLinkState +_080749A4: .4byte gPlayerState thumb_func_start sub_080749A8 sub_080749A8: @ 0x080749A8 @@ -3064,12 +3064,12 @@ _080749BE: ands r0, r1 movs r1, #0 strh r0, [r4, #0x32] - ldr r0, _080749D0 @ =gLinkState + ldr r0, _080749D0 @ =gPlayerState strb r1, [r0, #0x12] _080749CE: pop {r4, pc} .align 2, 0 -_080749D0: .4byte gLinkState +_080749D0: .4byte gPlayerState thumb_func_start sub_080749D4 sub_080749D4: @ 0x080749D4 @@ -3095,7 +3095,7 @@ sub_080749D4: @ 0x080749D4 adds r1, #0x38 movs r0, #3 strb r0, [r1] - ldr r5, _08074A2C @ =gLinkState + ldr r5, _08074A2C @ =gPlayerState adds r0, r5, #0 adds r0, #0x26 strb r3, [r0] @@ -3116,7 +3116,7 @@ sub_080749D4: @ 0x080749D4 strb r0, [r4, #0x15] b _08074A3C .align 2, 0 -_08074A2C: .4byte gLinkState +_08074A2C: .4byte gPlayerState _08074A30: .4byte 0x000002D3 _08074A34: movs r1, #0 @@ -3124,7 +3124,7 @@ _08074A34: strh r0, [r5, #8] strb r1, [r4, #0x15] _08074A3C: - bl ResetLink + bl ResetPlayer _08074A40: pop {r4, r5, pc} .align 2, 0 @@ -3134,7 +3134,7 @@ _08074A44: .4byte 0x000002D6 sub_08074A48: @ 0x08074A48 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08074A90 @ =gLinkState + ldr r5, _08074A90 @ =gPlayerState adds r0, r5, #0 adds r0, #0x26 ldrb r1, [r0] @@ -3142,7 +3142,7 @@ sub_08074A48: @ 0x08074A48 ands r0, r1 cmp r0, #0 beq _08074A86 - ldr r0, _08074A94 @ =gLinkEntity + ldr r0, _08074A94 @ =gPlayerEntity movs r1, #0 movs r2, #0x54 movs r3, #0 @@ -3165,8 +3165,8 @@ _08074A86: bl sub_0807479C pop {r4, r5, pc} .align 2, 0 -_08074A90: .4byte gLinkState -_08074A94: .4byte gLinkEntity +_08074A90: .4byte gPlayerState +_08074A94: .4byte gPlayerEntity thumb_func_start nullsub_504 nullsub_504: @ 0x08074A98 @@ -3180,7 +3180,7 @@ sub_08074A9C: @ 0x08074A9C bl sub_080741C4 cmp r0, #0 bne _08074AF0 - ldr r2, _08074AE0 @ =gLinkState + ldr r2, _08074AE0 @ =gPlayerState adds r0, r2, #0 adds r0, #0x80 ldrh r1, [r0] @@ -3208,7 +3208,7 @@ _08074ACA: bl CreateObjectWithParent b _08074AF0 .align 2, 0 -_08074AE0: .4byte gLinkState +_08074AE0: .4byte gPlayerState _08074AE4: adds r0, r4, #0 movs r1, #0x21 @@ -3223,14 +3223,14 @@ _08074AF0: sub_08074AF4: @ 0x08074AF4 push {lr} adds r3, r0, #0 - ldr r1, _08074B04 @ =gLinkState + ldr r1, _08074B04 @ =gPlayerState ldrb r0, [r1, #0x1e] cmp r0, #0 bne _08074B08 ldrb r2, [r1, #0xd] b _08074B0C .align 2, 0 -_08074B04: .4byte gLinkState +_08074B04: .4byte gPlayerState _08074B08: ldrb r0, [r3, #0x14] lsls r2, r0, #2 @@ -3245,7 +3245,7 @@ _08074B0C: sub_08074B18: @ 0x08074B18 push {r4, r5, lr} adds r5, r0, #0 - ldr r4, _08074B40 @ =gLinkState + ldr r4, _08074B40 @ =gPlayerState ldrb r0, [r4, #0x14] cmp r0, #0 bne _08074B48 @@ -3261,7 +3261,7 @@ sub_08074B18: @ 0x08074B18 bl sub_08074200 b _08074B48 .align 2, 0 -_08074B40: .4byte gLinkState +_08074B40: .4byte gPlayerState _08074B44: movs r0, #0x1a strb r0, [r4, #0xc] @@ -3276,7 +3276,7 @@ sub_08074B4C: @ 0x08074B4C bl sub_080741C4 cmp r0, #0 bne _08074B6E - ldr r0, _08074B70 @ =gLinkState + ldr r0, _08074B70 @ =gPlayerState ldr r1, [r0, #0x30] movs r0, #0x80 ands r1, r0 @@ -3289,7 +3289,7 @@ sub_08074B4C: @ 0x08074B4C _08074B6E: pop {r4, pc} .align 2, 0 -_08074B70: .4byte gLinkState +_08074B70: .4byte gPlayerState thumb_func_start sub_08074B74 sub_08074B74: @ 0x08074B74 @@ -3298,7 +3298,7 @@ sub_08074B74: @ 0x08074B74 bl sub_080741C4 cmp r0, #0 bne _08074B9A - ldr r0, _08074B9C @ =gLinkState + ldr r0, _08074B9C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -3313,7 +3313,7 @@ sub_08074B74: @ 0x08074B74 _08074B9A: pop {r4, pc} .align 2, 0 -_08074B9C: .4byte gLinkState +_08074B9C: .4byte gPlayerState thumb_func_start sub_08074BA0 sub_08074BA0: @ 0x08074BA0 @@ -3322,7 +3322,7 @@ sub_08074BA0: @ 0x08074BA0 bl sub_080741C4 cmp r0, #0 bne _08074BC6 - ldr r0, _08074BC8 @ =gLinkState + ldr r0, _08074BC8 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -3337,7 +3337,7 @@ sub_08074BA0: @ 0x08074BA0 _08074BC6: pop {r4, pc} .align 2, 0 -_08074BC8: .4byte gLinkState +_08074BC8: .4byte gPlayerState thumb_func_start sub_08074BCC sub_08074BCC: @ 0x08074BCC @@ -3346,7 +3346,7 @@ sub_08074BCC: @ 0x08074BCC bl sub_080741C4 cmp r0, #0 bne _08074BF2 - ldr r0, _08074BF4 @ =gLinkState + ldr r0, _08074BF4 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -3361,13 +3361,13 @@ sub_08074BCC: @ 0x08074BCC _08074BF2: pop {r4, pc} .align 2, 0 -_08074BF4: .4byte gLinkState +_08074BF4: .4byte gPlayerState thumb_func_start sub_08074BF8 sub_08074BF8: @ 0x08074BF8 push {r4, lr} adds r4, r0, #0 - bl ResetLink + bl ResetPlayer adds r2, r4, #0 adds r2, #0x29 ldrb r1, [r2] @@ -3378,7 +3378,7 @@ sub_08074BF8: @ 0x08074BF8 movs r0, #0xa0 lsls r0, r0, #1 strh r0, [r4, #0x24] - ldr r1, _08074C40 @ =gLinkState + ldr r1, _08074C40 @ =gPlayerState ldr r0, [r1, #0x30] movs r2, #0x80 lsls r2, r2, #0x12 @@ -3399,7 +3399,7 @@ sub_08074BF8: @ 0x08074BF8 bl sub_0806F69C pop {r4, pc} .align 2, 0 -_08074C40: .4byte gLinkState +_08074C40: .4byte gPlayerState thumb_func_start sub_08074C44 sub_08074C44: @ 0x08074C44 @@ -3428,7 +3428,7 @@ sub_08074C68: @ 0x08074C68 adds r6, #0x68 movs r2, #0 strb r2, [r6] - ldr r5, _08074CA0 @ =gLinkState + ldr r5, _08074CA0 @ =gPlayerState adds r0, r5, #0 adds r0, #0x38 ldrb r3, [r0] @@ -3448,7 +3448,7 @@ sub_08074C68: @ 0x08074C68 bl sub_08074CF8 b _08074CF2 .align 2, 0 -_08074CA0: .4byte gLinkState +_08074CA0: .4byte gPlayerState _08074CA4: .4byte gUnk_02022750 _08074CA8: ldrb r1, [r4, #0x18] @@ -3632,7 +3632,7 @@ _08074DE0: _08074DEA: b _08074EF0 _08074DEC: - ldr r2, _08074E00 @ =gLinkState + ldr r2, _08074E00 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #8 ands r0, r1 @@ -3643,12 +3643,12 @@ _08074DEC: strh r0, [r2, #8] b _08074EF0 .align 2, 0 -_08074E00: .4byte gLinkState +_08074E00: .4byte gPlayerState _08074E04: strh r7, [r2, #8] b _08074EF0 _08074E08: - ldr r2, _08074E1C @ =gLinkState + ldr r2, _08074E1C @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #8 ands r0, r1 @@ -3658,7 +3658,7 @@ _08074E08: strh r0, [r2, #8] b _08074EF0 .align 2, 0 -_08074E1C: .4byte gLinkState +_08074E1C: .4byte gPlayerState _08074E20: .4byte 0x00000404 _08074E24: movs r0, #0x82 @@ -3666,7 +3666,7 @@ _08074E24: strh r0, [r2, #8] b _08074EF0 _08074E2C: - ldr r1, _08074E3C @ =gLinkState + ldr r1, _08074E3C @ =gPlayerState ldr r0, [r1, #0x30] ands r0, r2 cmp r0, #0 @@ -3674,7 +3674,7 @@ _08074E2C: ldr r0, _08074E40 @ =0x0000041C b _08074E46 .align 2, 0 -_08074E3C: .4byte gLinkState +_08074E3C: .4byte gPlayerState _08074E40: .4byte 0x0000041C _08074E44: ldr r0, _08074E50 @ =0x0000080C @@ -3831,13 +3831,13 @@ sub_08074F44: @ 0x08074F44 ldrb r1, [r0] adds r1, #1 strb r1, [r0] - ldr r0, _08074F74 @ =gLinkEntity + ldr r0, _08074F74 @ =gPlayerEntity ldr r0, [r0, #0x6c] cmp r0, #0 beq _08074F5A bl DeleteEntity _08074F5A: - ldr r2, _08074F78 @ =gLinkState + ldr r2, _08074F78 @ =gPlayerState adds r0, r2, #0 adds r0, #0x39 ldrb r0, [r0] @@ -3851,8 +3851,8 @@ _08074F5A: str r0, [r2, #0x30] b _08074F84 .align 2, 0 -_08074F74: .4byte gLinkEntity -_08074F78: .4byte gLinkState +_08074F74: .4byte gPlayerEntity +_08074F78: .4byte gPlayerState _08074F7C: .4byte 0x0000073B _08074F80: ldr r0, _08074F88 @ =0x00000737 @@ -3894,7 +3894,7 @@ _08074FAC: strb r0, [r4, #0xe] movs r0, #4 strb r0, [r4, #0x14] - ldr r1, _08074FE0 @ =gLinkState + ldr r1, _08074FE0 @ =gPlayerState adds r0, r1, #0 adds r0, #0x39 ldrb r0, [r0] @@ -3905,7 +3905,7 @@ _08074FAC: b _08074FE8 .align 2, 0 _08074FDC: .4byte gUnk_02033280 -_08074FE0: .4byte gLinkState +_08074FE0: .4byte gPlayerState _08074FE4: movs r0, #0x80 lsls r0, r0, #1 @@ -3932,14 +3932,14 @@ sub_08074FEC: @ 0x08074FEC strb r0, [r1] movs r0, #4 strb r0, [r4, #0xe] - ldr r0, _08075018 @ =gLinkState + ldr r0, _08075018 @ =gPlayerState adds r0, #0x3a ldrb r0, [r0] strb r0, [r4, #0x14] _08075016: pop {r4, pc} .align 2, 0 -_08075018: .4byte gLinkState +_08075018: .4byte gPlayerState thumb_func_start sub_0807501C sub_0807501C: @ 0x0807501C @@ -3951,7 +3951,7 @@ sub_0807501C: @ 0x0807501C lsls r0, r0, #0x18 cmp r0, #0 bne _08075086 - ldr r1, _08075044 @ =gLinkState + ldr r1, _08075044 @ =gPlayerState adds r0, r1, #0 adds r0, #0x3a ldrb r0, [r0] @@ -3964,7 +3964,7 @@ sub_0807501C: @ 0x0807501C ldr r0, _08075048 @ =0x0000041C b _0807504E .align 2, 0 -_08075044: .4byte gLinkState +_08075044: .4byte gPlayerState _08075048: .4byte 0x0000041C _0807504C: ldr r0, _08075088 @ =0x0000080C @@ -4016,7 +4016,7 @@ sub_0807508C: @ 0x0807508C bl sub_0806F69C b _080750F2 _080750AA: - ldr r2, _080750BC @ =gLinkState + ldr r2, _080750BC @ =gPlayerState adds r0, r2, #0 adds r0, #0x39 ldrb r0, [r0] @@ -4026,7 +4026,7 @@ _080750AA: lsls r0, r0, #3 b _080750CE .align 2, 0 -_080750BC: .4byte gLinkState +_080750BC: .4byte gPlayerState _080750C0: ldr r0, [r2, #0x30] movs r1, #9 @@ -4082,7 +4082,7 @@ sub_08075110: @ 0x08075110 ldrb r1, [r0, #0x14] strb r1, [r0, #0xf] strb r3, [r0, #0x14] - ldr r2, _08075134 @ =gLinkState + ldr r2, _08075134 @ =gPlayerState ldr r0, _08075138 @ =0x00000734 strh r0, [r2, #8] ldr r0, [r2, #0x30] @@ -4092,7 +4092,7 @@ sub_08075110: @ 0x08075110 str r0, [r2, #0x30] bx lr .align 2, 0 -_08075134: .4byte gLinkState +_08075134: .4byte gPlayerState _08075138: .4byte 0x00000734 thumb_func_start sub_0807513C @@ -4151,13 +4151,13 @@ sub_0807518C: @ 0x0807518C ldrb r0, [r1] adds r0, #1 strb r0, [r1] - ldr r1, _080751AC @ =gLinkState + ldr r1, _080751AC @ =gPlayerState ldr r0, _080751B0 @ =0x000003C9 strh r0, [r1, #8] _080751AA: pop {pc} .align 2, 0 -_080751AC: .4byte gLinkState +_080751AC: .4byte gPlayerState _080751B0: .4byte 0x000003C9 thumb_func_start sub_080751B4 @@ -4180,14 +4180,14 @@ sub_080751B4: @ 0x080751B4 adds r0, r4, #0 adds r0, #0x68 strb r1, [r0] - ldr r1, _080751E4 @ =gLinkState + ldr r1, _080751E4 @ =gPlayerState movs r0, #0x80 lsls r0, r0, #1 strh r0, [r1, #8] _080751E2: pop {r4, pc} .align 2, 0 -_080751E4: .4byte gLinkState +_080751E4: .4byte gPlayerState thumb_func_start sub_080751E8 sub_080751E8: @ 0x080751E8 @@ -4200,10 +4200,10 @@ sub_080751E8: @ 0x080751E8 movs r1, #0x24 bl _DmaZero str r6, [r4] - ldr r0, _08075234 @ =gLinkEntity + ldr r0, _08075234 @ =gPlayerEntity adds r0, #0x84 str r4, [r0] - ldr r2, _08075238 @ =gLinkState + ldr r2, _08075238 @ =gPlayerState movs r1, #0 movs r0, #0x1c strb r0, [r2, #0xc] @@ -4227,14 +4227,14 @@ sub_080751E8: @ 0x080751E8 b _08075244 .align 2, 0 _08075230: .4byte gUnk_02022750 -_08075234: .4byte gLinkEntity -_08075238: .4byte gLinkState +_08075234: .4byte gPlayerEntity +_08075238: .4byte gPlayerState _0807523C: .4byte gUnk_08009ECC _08075240: strb r4, [r3] ldr r6, _08075290 @ =gUnk_08009EF0 _08075244: - ldr r0, _08075294 @ =gLinkState + ldr r0, _08075294 @ =gPlayerState adds r0, #0x39 ldrb r0, [r0] movs r1, #0 @@ -4248,14 +4248,14 @@ _08075252: adds r4, r0, #0 cmp r4, #0 beq _08075270 - ldr r0, _08075298 @ =gLinkEntity + ldr r0, _08075298 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition adds r0, r4, #0 adds r1, r6, #0 bl StartCutscene _08075270: - ldr r4, _08075298 @ =gLinkEntity + ldr r4, _08075298 @ =gPlayerEntity movs r1, #0xe rsbs r1, r1, #0 movs r2, #0x1c @@ -4271,8 +4271,8 @@ _0807528C: pop {r4, r5, r6, r7, pc} .align 2, 0 _08075290: .4byte gUnk_08009EF0 -_08075294: .4byte gLinkState -_08075298: .4byte gLinkEntity +_08075294: .4byte gPlayerState +_08075298: .4byte gPlayerEntity thumb_func_start sub_0807529C sub_0807529C: @ 0x0807529C @@ -4345,7 +4345,7 @@ DebugItem: @ 0x08075300 thumb_func_start Sword Sword: @ 0x08075314 push {lr} - ldr r2, _08075330 @ =gLinkState + ldr r2, _08075330 @ =gPlayerState adds r2, #0xa8 movs r3, #2 strb r3, [r2] @@ -4357,7 +4357,7 @@ Sword: @ 0x08075314 bl _call_via_r2 pop {pc} .align 2, 0 -_08075330: .4byte gLinkState +_08075330: .4byte gPlayerState _08075334: .4byte gUnk_0811BD44 thumb_func_start sub_08075338 @@ -4365,7 +4365,7 @@ sub_08075338: @ 0x08075338 push {r4, r5, r6, r7, lr} adds r5, r0, #0 adds r7, r1, #0 - ldr r4, _0807536C @ =gLinkState + ldr r4, _0807536C @ =gPlayerState ldr r1, [r4, #0x30] movs r3, #0x80 adds r0, r1, #0 @@ -4386,7 +4386,7 @@ sub_08075338: @ 0x08075338 bl PlaySFX b _080754B4 .align 2, 0 -_0807536C: .4byte gLinkState +_0807536C: .4byte gPlayerState _08075370: ldrb r2, [r4, #2] cmp r2, #0 @@ -4400,7 +4400,7 @@ _08075370: ands r0, r2 cmp r0, #0 bne _080753E4 - ldr r3, _080753D4 @ =gLinkEntity + ldr r3, _080753D4 @ =gPlayerEntity ldr r1, [r3, #0x20] ldr r0, _080753D8 @ =0x00017FFF cmp r1, r0 @@ -4437,10 +4437,10 @@ _08075370: bl sub_08075898 b _080754B4 .align 2, 0 -_080753D4: .4byte gLinkEntity +_080753D4: .4byte gPlayerEntity _080753D8: .4byte 0x00017FFF _080753DC: - ldr r2, _080753F0 @ =gLinkEntity + ldr r2, _080753F0 @ =gPlayerEntity ldr r0, [r2, #0x34] cmp r0, #0 beq _080753F4 @@ -4450,7 +4450,7 @@ _080753E4: bl sub_080759B8 b _080754B4 .align 2, 0 -_080753F0: .4byte gLinkEntity +_080753F0: .4byte gPlayerEntity _080753F4: movs r6, #0x80 lsls r6, r6, #0xb @@ -4552,7 +4552,7 @@ sub_080754B8: @ 0x080754B8 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r7, _080754D4 @ =gLinkState + ldr r7, _080754D4 @ =gPlayerState ldrb r1, [r7, #0x1b] movs r0, #0x80 ands r0, r1 @@ -4563,7 +4563,7 @@ sub_080754B8: @ 0x080754B8 bl sub_08075694 b _0807557E .align 2, 0 -_080754D4: .4byte gLinkState +_080754D4: .4byte gPlayerState _080754D8: ldrb r0, [r7, #4] cmp r0, #0 @@ -4578,7 +4578,7 @@ _080754D8: ands r0, r1 strb r0, [r4, #9] _080754F2: - ldr r0, _0807552C @ =gLinkEntity + ldr r0, _0807552C @ =gPlayerEntity adds r0, #0x5b ldrb r1, [r0] movs r0, #1 @@ -4605,7 +4605,7 @@ _080754F2: movs r0, #5 b _08075536 .align 2, 0 -_0807552C: .4byte gLinkEntity +_0807552C: .4byte gPlayerEntity _08075530: adds r1, r7, #0 adds r1, #0xab @@ -4619,7 +4619,7 @@ _08075538: ands r0, r1 cmp r0, #0 beq _0807557E - ldr r1, _08075568 @ =gLinkState + ldr r1, _08075568 @ =gPlayerState ldr r0, [r1, #0x30] ands r0, r2 cmp r0, #0 @@ -4637,7 +4637,7 @@ _0807555C: bl sub_080759B8 b _0807557E .align 2, 0 -_08075568: .4byte gLinkState +_08075568: .4byte gPlayerState _0807556C: adds r0, r4, #0 adds r1, r6, #0 @@ -4658,7 +4658,7 @@ sub_08075580: @ 0x08075580 bl sub_08077EFC cmp r0, #0 beq _080755E6 - ldr r2, _080755C8 @ =gLinkState + ldr r2, _080755C8 @ =gPlayerState ldrb r3, [r2, #2] cmp r3, #0 bne _080755E6 @@ -4687,7 +4687,7 @@ sub_08075580: @ 0x08075580 movs r0, #0x28 b _080755CE .align 2, 0 -_080755C8: .4byte gLinkState +_080755C8: .4byte gPlayerState _080755CC: movs r0, #0x50 _080755CE: @@ -4720,7 +4720,7 @@ sub_080755F0: @ 0x080755F0 bl sub_08077EC8 cmp r0, #0 bne _0807564A - ldr r2, _08075634 @ =gLinkState + ldr r2, _08075634 @ =gPlayerState ldrb r3, [r2, #0x1b] ldrb r0, [r2, #4] orrs r0, r3 @@ -4743,7 +4743,7 @@ sub_080755F0: @ 0x080755F0 strb r0, [r2, #0x1b] b _0807564A .align 2, 0 -_08075634: .4byte gLinkState +_08075634: .4byte gPlayerState _08075638: adds r0, r4, #0 adds r1, r5, #0 @@ -4761,7 +4761,7 @@ sub_0807564C: @ 0x0807564C push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r5, _08075668 @ =gLinkState + ldr r5, _08075668 @ =gPlayerState ldrb r1, [r5, #0x1b] ldrb r0, [r5, #4] orrs r0, r1 @@ -4772,7 +4772,7 @@ sub_0807564C: @ 0x0807564C bl sub_080759B8 b _08075692 .align 2, 0 -_08075668: .4byte gLinkState +_08075668: .4byte gPlayerState _0807566C: adds r0, r4, #0 bl sub_08077EC8 @@ -4801,7 +4801,7 @@ sub_08075694: @ 0x08075694 adds r5, r1, #0 movs r3, #1 strb r3, [r4, #7] - ldr r2, _080756C4 @ =gLinkState + ldr r2, _080756C4 @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #0x80 lsls r0, r0, #0x14 @@ -4819,7 +4819,7 @@ sub_08075694: @ 0x08075694 bl sub_08077DF4 b _080756E0 .align 2, 0 -_080756C4: .4byte gLinkState +_080756C4: .4byte gPlayerState _080756C8: .4byte 0xF7FFFFFF _080756CC: .4byte 0xFFFBFFFF _080756D0: @@ -4831,7 +4831,7 @@ _080756D0: adds r0, r4, #0 bl sub_08077DF4 _080756E0: - ldr r2, _08075730 @ =gLinkState + ldr r2, _08075730 @ =gPlayerState movs r0, #8 asrs r0, r5 ldrb r1, [r2, #0xa] @@ -4841,7 +4841,7 @@ _080756E0: strb r0, [r4, #4] movs r0, #6 strb r0, [r4, #0xf] - ldr r0, _08075734 @ =gLinkEntity + ldr r0, _08075734 @ =gPlayerEntity adds r0, #0x40 movs r1, #0x1e strb r1, [r0] @@ -4870,15 +4870,15 @@ _08075726: bl PlaySFX pop {r4, r5, pc} .align 2, 0 -_08075730: .4byte gLinkState -_08075734: .4byte gLinkEntity +_08075730: .4byte gPlayerState +_08075734: .4byte gPlayerEntity thumb_func_start sub_08075738 sub_08075738: @ 0x08075738 push {r4, r5, r6, r7, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r5, _08075750 @ =gLinkState + ldr r5, _08075750 @ =gPlayerState ldrb r0, [r5, #4] cmp r0, #0 bne _08075754 @@ -4886,7 +4886,7 @@ sub_08075738: @ 0x08075738 bl sub_080759B8 b _0807588C .align 2, 0 -_08075750: .4byte gLinkState +_08075750: .4byte gPlayerState _08075754: adds r0, r4, #0 bl UpdateItemAnim @@ -4910,7 +4910,7 @@ _08075768: bne _08075780 strb r1, [r4, #0xb] _08075780: - ldr r1, _080757D0 @ =gLinkEntity + ldr r1, _080757D0 @ =gPlayerEntity ldrb r0, [r4, #0xb] strb r0, [r1, #0x15] movs r0, #0xc0 @@ -4952,9 +4952,9 @@ _080757C6: bl sub_080759B8 b _0807588C .align 2, 0 -_080757D0: .4byte gLinkEntity +_080757D0: .4byte gPlayerEntity _080757D4: - ldr r7, _08075890 @ =gLinkEntity + ldr r7, _08075890 @ =gPlayerEntity adds r0, r7, #0 adds r0, #0x5b ldrb r1, [r0] @@ -4987,7 +4987,7 @@ _080757D4: orrs r1, r0 strb r1, [r2, #0x14] _08075816: - ldr r5, _08075890 @ =gLinkEntity + ldr r5, _08075890 @ =gPlayerEntity adds r0, r5, #0 adds r0, #0x5b ldrb r1, [r0] @@ -4995,7 +4995,7 @@ _08075816: ands r0, r1 cmp r0, #0 beq _0807587A - ldr r2, _08075894 @ =gLinkState + ldr r2, _08075894 @ =gPlayerState ldrb r3, [r2, #0x1b] movs r0, #0x80 ands r0, r3 @@ -5048,14 +5048,14 @@ _0807587A: _0807588C: pop {r4, r5, r6, r7, pc} .align 2, 0 -_08075890: .4byte gLinkEntity -_08075894: .4byte gLinkState +_08075890: .4byte gPlayerEntity +_08075894: .4byte gPlayerState thumb_func_start sub_08075898 sub_08075898: @ 0x08075898 push {lr} adds r2, r0, #0 - ldr r0, _080758AC @ =gLinkState + ldr r0, _080758AC @ =gPlayerState ldrb r0, [r0, #4] cmp r0, #0 bne _080758AA @@ -5064,13 +5064,13 @@ sub_08075898: @ 0x08075898 _080758AA: pop {pc} .align 2, 0 -_080758AC: .4byte gLinkState +_080758AC: .4byte gPlayerState thumb_func_start sub_080758B0 sub_080758B0: @ 0x080758B0 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _080758C4 @ =gLinkState + ldr r5, _080758C4 @ =gPlayerState ldrb r0, [r5, #4] cmp r0, #0 bne _080758C8 @@ -5078,7 +5078,7 @@ sub_080758B0: @ 0x080758B0 bl sub_080759B8 b _080758F8 .align 2, 0 -_080758C4: .4byte gLinkState +_080758C4: .4byte gPlayerState _080758C8: adds r0, r4, #0 bl UpdateItemAnim @@ -5100,7 +5100,7 @@ _080758EA: movs r0, #5 _080758EC: strb r0, [r4, #4] - ldr r2, _080758FC @ =gLinkState + ldr r2, _080758FC @ =gPlayerState ldrb r1, [r2, #0x1b] movs r0, #0xf7 ands r0, r1 @@ -5108,14 +5108,14 @@ _080758EC: _080758F8: pop {r4, r5, pc} .align 2, 0 -_080758FC: .4byte gLinkState +_080758FC: .4byte gPlayerState thumb_func_start sub_08075900 sub_08075900: @ 0x08075900 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r5, _08075920 @ =gLinkState + ldr r5, _08075920 @ =gPlayerState ldrb r0, [r5, #0x12] cmp r0, #0x11 bne _08075928 @@ -5128,7 +5128,7 @@ sub_08075900: @ 0x08075900 bl sub_080759B8 b _080759B2 .align 2, 0 -_08075920: .4byte gLinkState +_08075920: .4byte gPlayerState _08075924: .4byte 0xFFFBFFFF _08075928: adds r0, r4, #0 @@ -5159,7 +5159,7 @@ _08075948: adds r0, r4, #0 bl sub_08077DF4 _08075962: - ldr r4, _08075990 @ =gLinkEntity + ldr r4, _08075990 @ =gPlayerEntity ldrb r0, [r4, #0x14] lsrs r0, r0, #1 lsls r0, r0, #3 @@ -5180,7 +5180,7 @@ _08075962: bl CreateFx b _080759B2 .align 2, 0 -_08075990: .4byte gLinkEntity +_08075990: .4byte gPlayerEntity _08075994: .4byte gScreenTransition _08075998: ldrb r1, [r4, #0xe] @@ -5205,13 +5205,13 @@ sub_080759B8: @ 0x080759B8 push {r4, lr} adds r3, r0, #0 adds r4, r1, #0 - ldr r2, _080759E8 @ =gLinkState + ldr r2, _080759E8 @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #0x80 ands r1, r0 cmp r1, #0 bne _080759D0 - ldr r0, _080759EC @ =gLinkEntity + ldr r0, _080759EC @ =gPlayerEntity adds r0, #0x40 strb r1, [r0] _080759D0: @@ -5227,8 +5227,8 @@ _080759D0: bl sub_08077E78 pop {r4, pc} .align 2, 0 -_080759E8: .4byte gLinkState -_080759EC: .4byte gLinkEntity +_080759E8: .4byte gPlayerState +_080759EC: .4byte gPlayerEntity _080759F0: .4byte 0xF7FFFFFF thumb_func_start Lantern @@ -5252,7 +5252,7 @@ sub_08075A0C: @ 0x08075A0C ldrb r0, [r4, #1] bl IsItemEquipped adds r6, r0, #0 - ldr r1, _08075A64 @ =gLinkState + ldr r1, _08075A64 @ =gPlayerState ldrb r0, [r1, #5] cmp r0, #0 bne _08075A3E @@ -5274,7 +5274,7 @@ _08075A3E: movs r0, #0xf adds r1, r6, #0 bl ForceEquipItem - ldr r0, _08075A64 @ =gLinkState + ldr r0, _08075A64 @ =gPlayerState ldr r1, [r0, #0x30] ldr r2, _08075A68 @ =0xFF7FFFFF ands r1, r2 @@ -5287,7 +5287,7 @@ _08075A3E: bl sub_08077E78 b _08075AD0 .align 2, 0 -_08075A64: .4byte gLinkState +_08075A64: .4byte gPlayerState _08075A68: .4byte 0xFF7FFFFF _08075A6C: ldrb r1, [r4, #9] @@ -5299,7 +5299,7 @@ _08075A6C: bl sub_08077D38 adds r0, r4, #0 bl sub_08077BD4 - ldr r5, _08075AD4 @ =gLinkEntity + ldr r5, _08075AD4 @ =gPlayerEntity adds r0, r5, #0 bl sub_0806F948 movs r0, #0x10 @@ -5338,7 +5338,7 @@ _08075A6C: _08075AD0: pop {r4, r5, r6, pc} .align 2, 0 -_08075AD4: .4byte gLinkEntity +_08075AD4: .4byte gPlayerEntity _08075AD8: .4byte gUnk_08126EEC thumb_func_start sub_08075ADC @@ -5346,7 +5346,7 @@ sub_08075ADC: @ 0x08075ADC push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r2, _08075B44 @ =gLinkState + ldr r2, _08075B44 @ =gPlayerState ldr r0, [r2, #0x2c] cmp r0, #0 bne _08075B08 @@ -5370,7 +5370,7 @@ _08075B08: ldrb r0, [r4, #4] adds r0, #1 strb r0, [r4, #4] - ldr r3, _08075B44 @ =gLinkState + ldr r3, _08075B44 @ =gPlayerState ldr r0, [r3, #0x30] movs r1, #0x80 lsls r1, r1, #0x10 @@ -5395,7 +5395,7 @@ _08075B08: bl PlaySFX b _08075B52 .align 2, 0 -_08075B44: .4byte gLinkState +_08075B44: .4byte gPlayerState _08075B48: .4byte 0x0000013D _08075B4C: adds r0, r4, #0 @@ -5411,7 +5411,7 @@ sub_08075B54: @ 0x08075B54 push {r6, r7} adds r6, r0, #0 mov sb, r1 - ldr r5, _08075BB0 @ =gLinkState + ldr r5, _08075BB0 @ =gPlayerState ldr r0, [r5, #0x30] movs r1, #0x88 lsls r1, r1, #1 @@ -5448,15 +5448,15 @@ _08075B86: bl PlaySFX b _08075C80 .align 2, 0 -_08075BB0: .4byte gLinkState +_08075BB0: .4byte gPlayerState _08075BB4: .4byte 0xFF7FFFFF _08075BB8: - ldr r0, _08075C88 @ =gLinkState + ldr r0, _08075C88 @ =gPlayerState mov r8, r0 ldrb r0, [r0, #0xc] cmp r0, #0x18 beq _08075C80 - ldr r5, _08075C8C @ =gLinkEntity + ldr r5, _08075C8C @ =gPlayerEntity ldrb r0, [r5, #0x1e] cmp r0, #0x36 bhi _08075C80 @@ -5555,8 +5555,8 @@ _08075C80: mov sb, r4 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08075C88: .4byte gLinkState -_08075C8C: .4byte gLinkEntity +_08075C88: .4byte gPlayerState +_08075C8C: .4byte gPlayerEntity _08075C90: .4byte gUnk_08126EEC _08075C94: .4byte gRoomControls _08075C98: .4byte 0x0000060C @@ -5572,7 +5572,7 @@ sub_08075C9C: @ 0x08075C9C ands r0, r1 cmp r0, #0 beq _08075CCA - ldr r0, _08075CF8 @ =gLinkEntity + ldr r0, _08075CF8 @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r2, #6 ands r2, r1 @@ -5595,7 +5595,7 @@ _08075CCA: ldrb r0, [r4, #4] subs r0, #1 strb r0, [r4, #4] - ldr r2, _08075D00 @ =gLinkState + ldr r2, _08075D00 @ =gPlayerState movs r1, #8 asrs r1, r5 mvns r1, r1 @@ -5608,11 +5608,11 @@ _08075CCA: strb r1, [r2, #0xb] b _08075D0E .align 2, 0 -_08075CF8: .4byte gLinkEntity +_08075CF8: .4byte gPlayerEntity _08075CFC: .4byte gUnk_08126EEC -_08075D00: .4byte gLinkState +_08075D00: .4byte gPlayerState _08075D04: - ldr r1, _08075D10 @ =gLinkEntity + ldr r1, _08075D10 @ =gPlayerEntity adds r1, #0x7a ldrh r0, [r1] adds r0, #1 @@ -5620,7 +5620,7 @@ _08075D04: _08075D0E: pop {r4, r5, pc} .align 2, 0 -_08075D10: .4byte gLinkEntity +_08075D10: .4byte gPlayerEntity thumb_func_start sub_08075D14 sub_08075D14: @ 0x08075D14 @@ -5640,7 +5640,7 @@ sub_08075D2C: @ 0x08075D2C push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r5, _08075D74 @ =gLinkState + ldr r5, _08075D74 @ =gPlayerState ldrb r1, [r5, #4] movs r0, #8 ands r0, r1 @@ -5655,7 +5655,7 @@ sub_08075D2C: @ 0x08075D2C movs r0, #0xf orrs r0, r1 strb r0, [r4, #9] - ldr r0, _08075D78 @ =gLinkEntity + ldr r0, _08075D78 @ =gPlayerEntity bl sub_0806F948 adds r0, r4, #0 movs r1, #0xb @@ -5669,8 +5669,8 @@ sub_08075D2C: @ 0x08075D2C strb r0, [r5, #4] b _08075D84 .align 2, 0 -_08075D74: .4byte gLinkState -_08075D78: .4byte gLinkEntity +_08075D74: .4byte gPlayerState +_08075D78: .4byte gPlayerEntity _08075D7C: adds r0, r4, #0 adds r1, r6, #0 @@ -5684,7 +5684,7 @@ sub_08075D88: @ 0x08075D88 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r2, _08075DBC @ =gLinkState + ldr r2, _08075DBC @ =gPlayerState ldrb r1, [r2, #4] movs r3, #0x80 adds r0, r3, #0 @@ -5707,7 +5707,7 @@ sub_08075D88: @ 0x08075D88 bl sub_08078F60 b _08075DD8 .align 2, 0 -_08075DBC: .4byte gLinkState +_08075DBC: .4byte gPlayerState _08075DC0: adds r0, r4, #0 bl UpdateItemAnim @@ -5742,7 +5742,7 @@ sub_08075DF4: @ 0x08075DF4 push {r4, r5, r6, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r6, _08075E2C @ =gLinkState + ldr r6, _08075E2C @ =gPlayerState ldrb r1, [r6, #4] movs r0, #8 ands r0, r1 @@ -5752,7 +5752,7 @@ sub_08075DF4: @ 0x08075DF4 movs r0, #0x80 orrs r0, r1 strb r0, [r4, #9] - ldr r0, _08075E30 @ =gLinkEntity + ldr r0, _08075E30 @ =gPlayerEntity bl sub_0806F948 adds r0, r4, #0 bl sub_08077BB8 @@ -5765,8 +5765,8 @@ sub_08075DF4: @ 0x08075DF4 strb r0, [r1] b _08075E3C .align 2, 0 -_08075E2C: .4byte gLinkState -_08075E30: .4byte gLinkEntity +_08075E2C: .4byte gPlayerState +_08075E30: .4byte gPlayerEntity _08075E34: adds r0, r4, #0 adds r1, r5, #0 @@ -5782,7 +5782,7 @@ sub_08075E40: @ 0x08075E40 push {r7} adds r4, r0, #0 mov r8, r1 - ldr r0, _08075EA0 @ =gLinkState + ldr r0, _08075EA0 @ =gPlayerState adds r1, r0, #0 adds r1, #0x21 ldrb r1, [r1] @@ -5824,7 +5824,7 @@ sub_08075E40: @ 0x08075E40 strb r0, [r6, #0xa] b _08075EB8 .align 2, 0 -_08075EA0: .4byte gLinkState +_08075EA0: .4byte gPlayerState _08075EA4: .4byte gUnk_02002A40 _08075EA8: adds r1, r6, #0 @@ -5854,7 +5854,7 @@ sub_08075EC0: @ 0x08075EC0 beq _08075F0C cmp r5, #0 beq _08075F0C - ldr r2, _08075F08 @ =gLinkState + ldr r2, _08075F08 @ =gPlayerState ldrb r1, [r2, #4] movs r0, #0x80 ands r0, r1 @@ -5876,9 +5876,9 @@ _08075EF0: b _08075F32 .align 2, 0 _08075F04: .4byte gUnk_02002A40 -_08075F08: .4byte gLinkState +_08075F08: .4byte gPlayerState _08075F0C: - ldr r2, _08075F34 @ =gLinkState + ldr r2, _08075F34 @ =gPlayerState movs r0, #8 asrs r0, r6 ldrb r1, [r2, #0xa] @@ -5899,14 +5899,14 @@ _08075F0C: _08075F32: pop {r4, r5, r6, pc} .align 2, 0 -_08075F34: .4byte gLinkState +_08075F34: .4byte gPlayerState thumb_func_start sub_08075F38 sub_08075F38: @ 0x08075F38 push {r4, lr} adds r4, r0, #0 adds r3, r1, #0 - ldr r2, _08075F6C @ =gLinkState + ldr r2, _08075F6C @ =gPlayerState ldrb r1, [r2, #4] movs r0, #0x80 ands r0, r1 @@ -5928,7 +5928,7 @@ sub_08075F38: @ 0x08075F38 strb r0, [r4, #4] b _08075F80 .align 2, 0 -_08075F6C: .4byte gLinkState +_08075F6C: .4byte gPlayerState _08075F70: adds r1, r2, #0 adds r1, #0x21 @@ -5946,7 +5946,7 @@ sub_08075F84: @ 0x08075F84 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r2, _08075FB4 @ =gLinkState + ldr r2, _08075FB4 @ =gPlayerState ldrb r1, [r2, #4] movs r0, #0x80 ands r0, r1 @@ -5966,7 +5966,7 @@ sub_08075F84: @ 0x08075F84 bl sub_08077E3C b _08075FBE .align 2, 0 -_08075FB4: .4byte gLinkState +_08075FB4: .4byte gPlayerState _08075FB8: adds r0, r4, #0 bl UpdateItemAnim @@ -5977,7 +5977,7 @@ _08075FBE: cmp r0, #0 beq _08075FD8 _08075FC8: - ldr r0, _08075FDC @ =gLinkState + ldr r0, _08075FDC @ =gPlayerState adds r0, #0x21 movs r1, #0 strb r1, [r0] @@ -5987,7 +5987,7 @@ _08075FC8: _08075FD8: pop {r4, r5, pc} .align 2, 0 -_08075FDC: .4byte gLinkState +_08075FDC: .4byte gPlayerState thumb_func_start Bomb Bomb: @ 0x08075FE0 @@ -6007,7 +6007,7 @@ sub_08075FF8: @ 0x08075FF8 push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - ldr r0, _08076018 @ =gLinkState + ldr r0, _08076018 @ =gPlayerState ldrb r1, [r0, #2] ldrb r0, [r0, #4] orrs r0, r1 @@ -6020,7 +6020,7 @@ sub_08075FF8: @ 0x08075FF8 bl sub_0805EB00 b _08076026 .align 2, 0 -_08076018: .4byte gLinkState +_08076018: .4byte gPlayerState _0807601C: adds r5, #1 adds r0, r4, #0 @@ -6044,7 +6044,7 @@ _08076036: adds r4, r0, #0 cmp r4, #0 beq _08076076 - ldr r0, _08076080 @ =gLinkEntity + ldr r0, _08076080 @ =gPlayerEntity ldrb r2, [r0, #0x14] movs r1, #6 ands r1, r2 @@ -6070,7 +6070,7 @@ _08076076: bl sub_08077E78 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08076080: .4byte gLinkEntity +_08076080: .4byte gPlayerEntity _08076084: .4byte gUnk_0811BDAC thumb_func_start sub_08076088 @@ -6095,7 +6095,7 @@ _080760A4: strb r1, [r3, #0xd] _080760AA: str r3, [r4, #0x18] - ldr r0, _080760C4 @ =gLinkState + ldr r0, _080760C4 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #8 ands r0, r1 @@ -6106,7 +6106,7 @@ _080760AA: bl sub_08077DF4 b _080760D6 .align 2, 0 -_080760C4: .4byte gLinkState +_080760C4: .4byte gPlayerState _080760C8: .4byte 0x00000928 _080760CC: movs r1, #0xce @@ -6114,7 +6114,7 @@ _080760CC: adds r0, r4, #0 bl sub_08077DF4 _080760D6: - ldr r3, _08076130 @ =gLinkState + ldr r3, _08076130 @ =gPlayerState movs r0, #0 mov r8, r0 movs r7, #3 @@ -6127,7 +6127,7 @@ _080760D6: strb r0, [r4, #4] movs r0, #0xf strb r0, [r4, #0xf] - ldr r2, _08076134 @ =gLinkEntity + ldr r2, _08076134 @ =gPlayerEntity movs r1, #0x79 adds r1, r1, r2 mov ip, r1 @@ -6159,8 +6159,8 @@ _080760D6: strb r0, [r4, #0xf] b _0807614A .align 2, 0 -_08076130: .4byte gLinkState -_08076134: .4byte gLinkEntity +_08076130: .4byte gPlayerState +_08076134: .4byte gPlayerEntity _08076138: movs r1, #8 asrs r1, r5 @@ -6183,7 +6183,7 @@ _0807614A: bl sub_08077F50 b _080761A0 _08076162: - ldr r1, _08076194 @ =gLinkEntity + ldr r1, _08076194 @ =gPlayerEntity str r3, [r1, #0x74] movs r2, #0 strb r2, [r1, #0xf] @@ -6209,7 +6209,7 @@ _08076162: strb r0, [r4, #7] b _0807619A .align 2, 0 -_08076194: .4byte gLinkEntity +_08076194: .4byte gPlayerEntity _08076198: strb r2, [r4, #7] _0807619A: @@ -6239,7 +6239,7 @@ sub_080761C0: @ 0x080761C0 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r5, _08076220 @ =gLinkState + ldr r5, _08076220 @ =gPlayerState ldrb r0, [r5, #4] cmp r0, #0 bne _080762B8 @@ -6252,7 +6252,7 @@ sub_080761C0: @ 0x080761C0 cmp r0, #0 beq _080762B8 _080761DE: - ldr r1, _08076228 @ =gLinkEntity + ldr r1, _08076228 @ =gPlayerEntity ldrb r2, [r1, #0x14] movs r0, #0x80 orrs r0, r2 @@ -6283,9 +6283,9 @@ _080761DE: bl sub_08076088 b _080762C0 .align 2, 0 -_08076220: .4byte gLinkState +_08076220: .4byte gPlayerState _08076224: .4byte 0x00001201 -_08076228: .4byte gLinkEntity +_08076228: .4byte gPlayerEntity _0807622C: .4byte gUnk_03003BE0 _08076230: str r2, [r4, #0x18] @@ -6366,20 +6366,20 @@ _080762C0: sub_080762C4: @ 0x080762C4 push {lr} str r1, [r0, #0x18] - ldr r1, _080762D4 @ =gLinkState + ldr r1, _080762D4 @ =gPlayerState strb r2, [r1, #5] adds r1, r3, #0 bl sub_08077D38 pop {pc} .align 2, 0 -_080762D4: .4byte gLinkState +_080762D4: .4byte gPlayerState thumb_func_start sub_080762D8 sub_080762D8: @ 0x080762D8 push {r4, r5, r6, r7, lr} adds r5, r0, #0 adds r6, r1, #0 - ldr r4, _08076334 @ =gLinkState + ldr r4, _08076334 @ =gPlayerState ldrb r0, [r4, #5] movs r1, #0xcf ands r1, r0 @@ -6391,7 +6391,7 @@ sub_080762D8: @ 0x080762D8 bne _080762F6 b _08076486 _080762F6: - ldr r0, _08076338 @ =gLinkEntity + ldr r0, _08076338 @ =gPlayerEntity adds r1, r0, #0 adds r1, #0x3d ldrb r1, [r1] @@ -6422,11 +6422,11 @@ _080762F6: strb r0, [r2, #0xd] b _08076376 .align 2, 0 -_08076334: .4byte gLinkState -_08076338: .4byte gLinkEntity +_08076334: .4byte gPlayerState +_08076338: .4byte gPlayerEntity _0807633C: .4byte 0x00000502 _08076340: - ldr r2, _08076364 @ =gLinkState + ldr r2, _08076364 @ =gPlayerState adds r1, r2, #0 adds r1, #0xa8 movs r0, #5 @@ -6445,7 +6445,7 @@ _0807635A: bne _08076394 b _08076380 .align 2, 0 -_08076364: .4byte gLinkState +_08076364: .4byte gPlayerState _08076368: .4byte gUnk_0200AF00 _0807636C: ldr r1, [r5, #0x18] @@ -6470,12 +6470,12 @@ _08076380: b _080763EC _08076394: ldr r1, _080763F4 @ =gUnk_0811BE38 - ldr r7, _080763F8 @ =gLinkEntity + ldr r7, _080763F8 @ =gPlayerEntity ldrb r0, [r7, #0x14] lsrs r0, r0, #1 lsls r3, r0, #1 adds r1, r3, r1 - ldr r4, _080763FC @ =gLinkState + ldr r4, _080763FC @ =gPlayerState adds r2, r4, #0 adds r2, #0x90 ldrh r0, [r1] @@ -6519,8 +6519,8 @@ _080763EC: b _08076486 .align 2, 0 _080763F4: .4byte gUnk_0811BE38 -_080763F8: .4byte gLinkEntity -_080763FC: .4byte gLinkState +_080763F8: .4byte gPlayerEntity +_080763FC: .4byte gPlayerState _08076400: ldr r0, _08076418 @ =gUnk_0811BE40 adds r0, r3, r0 @@ -6627,12 +6627,12 @@ _080764B8: ands r0, r1 cmp r0, #0 beq _08076508 - ldr r2, _080764FC @ =gLinkEntity + ldr r2, _080764FC @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x80 orrs r0, r1 strb r0, [r2, #0x10] - ldr r2, _08076500 @ =gLinkState + ldr r2, _08076500 @ =gPlayerState movs r0, #4 strb r0, [r2, #5] movs r1, #8 @@ -6652,20 +6652,20 @@ _080764B8: b _08076508 .align 2, 0 _080764F8: .4byte gScreenTransition -_080764FC: .4byte gLinkEntity -_08076500: .4byte gLinkState +_080764FC: .4byte gPlayerEntity +_08076500: .4byte gPlayerState _08076504: subs r0, #1 strb r0, [r4, #7] _08076508: - ldr r0, _08076514 @ =gLinkState + ldr r0, _08076514 @ =gPlayerState adds r0, #0xa8 movs r1, #4 strb r1, [r0] _08076510: pop {r4, r5, r6, pc} .align 2, 0 -_08076514: .4byte gLinkState +_08076514: .4byte gPlayerState thumb_func_start sub_08076518 sub_08076518: @ 0x08076518 @@ -6677,7 +6677,7 @@ sub_08076518: @ 0x08076518 bl sub_08077F64 cmp r0, #0 beq _080765D4 - ldr r5, _0807655C @ =gLinkState + ldr r5, _0807655C @ =gPlayerState adds r1, r5, #0 adds r1, #0xa8 movs r0, #4 @@ -6690,7 +6690,7 @@ sub_08076518: @ 0x08076518 ldrb r0, [r5, #0x1f] cmp r0, #0 bne _080765D4 - ldr r6, _08076560 @ =gLinkEntity + ldr r6, _08076560 @ =gPlayerEntity adds r0, r6, #0 adds r0, #0x42 ldrb r7, [r0] @@ -6701,8 +6701,8 @@ sub_08076518: @ 0x08076518 bl sub_08077F50 b _080765D4 .align 2, 0 -_0807655C: .4byte gLinkState -_08076560: .4byte gLinkEntity +_0807655C: .4byte gPlayerState +_08076560: .4byte gPlayerEntity _08076564: adds r0, r5, #0 adds r0, #0x92 @@ -6748,7 +6748,7 @@ _080765B4: adds r0, r4, #0 bl sub_08077DF4 _080765BE: - ldr r2, _080765DC @ =gLinkState + ldr r2, _080765DC @ =gPlayerState movs r1, #8 mov r0, r8 asrs r1, r0 @@ -6764,7 +6764,7 @@ _080765D4: mov r8, r3 pop {r4, r5, r6, r7, pc} .align 2, 0 -_080765DC: .4byte gLinkState +_080765DC: .4byte gPlayerState thumb_func_start sub_080765E0 sub_080765E0: @ 0x080765E0 @@ -6803,12 +6803,12 @@ sub_0807660C: @ 0x0807660C lsrs r0, r0, #0x18 cmp r0, #0xff beq _0807662C - ldr r0, _0807663C @ =gLinkState + ldr r0, _0807663C @ =gPlayerState ldrb r0, [r0, #1] cmp r0, #0 bne _0807663A _0807662C: - ldr r1, _0807663C @ =gLinkState + ldr r1, _0807663C @ =gPlayerState movs r0, #0 strb r0, [r1, #1] adds r0, r4, #0 @@ -6817,7 +6817,7 @@ _0807662C: _0807663A: pop {r4, r5, pc} .align 2, 0 -_0807663C: .4byte gLinkState +_0807663C: .4byte gPlayerState thumb_func_start RocsCape RocsCape: @ 0x08076640 @@ -6831,7 +6831,7 @@ RocsCape: @ 0x08076640 bl sub_08076758 b _08076754 _08076654: - ldr r0, _080766BC @ =gLinkState + ldr r0, _080766BC @ =gPlayerState ldr r1, [r0, #0x2c] adds r2, r0, #0 cmp r1, #0 @@ -6850,7 +6850,7 @@ _08076654: cmp r0, #1 bne _08076686 _08076678: - ldr r0, _080766C0 @ =gLinkEntity + ldr r0, _080766C0 @ =gPlayerEntity ldr r0, [r0, #0x34] cmp r0, #0 bne _08076686 @@ -6866,7 +6866,7 @@ _08076686: cmp r0, #3 bne _08076710 _08076694: - ldr r5, _080766C0 @ =gLinkEntity + ldr r5, _080766C0 @ =gPlayerEntity ldr r0, [r5, #0x34] cmp r0, #0 blt _0807674C @@ -6886,8 +6886,8 @@ _08076694: str r0, [r5, #0x20] b _0807673C .align 2, 0 -_080766BC: .4byte gLinkState -_080766C0: .4byte gLinkEntity +_080766BC: .4byte gPlayerState +_080766C0: .4byte gPlayerEntity _080766C4: ldrb r0, [r2, #0x1b] ldrb r1, [r2, #0xa] @@ -6914,7 +6914,7 @@ _080766C4: cmp r1, #1 bne _08076702 _080766F4: - ldr r0, _0807671C @ =gLinkEntity + ldr r0, _0807671C @ =gPlayerEntity ldr r0, [r0, #0x34] cmp r0, #0 bne _08076702 @@ -6935,9 +6935,9 @@ _08076710: bl sub_08076758 b _08076754 .align 2, 0 -_0807671C: .4byte gLinkEntity +_0807671C: .4byte gPlayerEntity _08076720: - ldr r1, _08076748 @ =gLinkEntity + ldr r1, _08076748 @ =gPlayerEntity ldr r0, [r1, #0x34] cmp r0, #0 blt _0807674C @@ -6957,7 +6957,7 @@ _0807673C: bl PlaySFX b _08076754 .align 2, 0 -_08076748: .4byte gLinkEntity +_08076748: .4byte gPlayerEntity _0807674C: adds r0, r3, #0 adds r1, r4, #0 @@ -6970,7 +6970,7 @@ _08076754: sub_08076758: @ 0x08076758 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _080767C0 @ =gLinkState + ldr r5, _080767C0 @ =gPlayerState movs r0, #0 strb r0, [r5, #0xe] ldrb r2, [r5, #2] @@ -6991,7 +6991,7 @@ sub_08076758: @ 0x08076758 ldrb r0, [r4, #4] cmp r0, #1 bhi _080767C8 - ldr r2, _080767C4 @ =gLinkEntity + ldr r2, _080767C4 @ =gPlayerEntity ldr r0, [r2, #0x20] cmp r0, #0 bgt _080767FE @@ -7019,22 +7019,22 @@ sub_08076758: @ 0x08076758 bl PlaySFX b _080767FE .align 2, 0 -_080767C0: .4byte gLinkState -_080767C4: .4byte gLinkEntity +_080767C0: .4byte gPlayerState +_080767C4: .4byte gPlayerEntity _080767C8: - ldr r1, _080767D4 @ =gLinkEntity + ldr r1, _080767D4 @ =gPlayerEntity adds r1, #0x7a ldrh r0, [r1] adds r0, #1 strh r0, [r1] b _080767FE .align 2, 0 -_080767D4: .4byte gLinkEntity +_080767D4: .4byte gPlayerEntity _080767D8: ldrb r0, [r4, #4] cmp r0, #1 bls _080767FE - ldr r1, _080767F4 @ =gLinkEntity + ldr r1, _080767F4 @ =gPlayerEntity adds r1, #0x7a ldrh r0, [r1] adds r0, #1 @@ -7045,7 +7045,7 @@ _080767D8: strb r0, [r5, #2] b _080767FE .align 2, 0 -_080767F4: .4byte gLinkEntity +_080767F4: .4byte gPlayerEntity _080767F8: adds r0, r4, #0 bl sub_08077E78 @@ -7060,13 +7060,13 @@ sub_08076800: @ 0x08076800 push {r6, r7} adds r6, r0, #0 mov sb, r1 - ldr r4, _0807682C @ =gLinkEntity + ldr r4, _0807682C @ =gPlayerEntity adds r0, r4, #0 adds r0, #0x7a ldrh r0, [r0] cmp r0, #0 beq _08076834 - ldr r1, _08076830 @ =gLinkState + ldr r1, _08076830 @ =gPlayerState movs r0, #0 strb r0, [r1, #0x1e] strb r0, [r1, #0xe] @@ -7075,8 +7075,8 @@ sub_08076800: @ 0x08076800 bl sub_08077E78 b _080768EC .align 2, 0 -_0807682C: .4byte gLinkEntity -_08076830: .4byte gLinkState +_0807682C: .4byte gPlayerEntity +_08076830: .4byte gPlayerState _08076834: ldrb r0, [r6, #7] subs r0, #1 @@ -7089,7 +7089,7 @@ _08076834: movs r0, #0x7d bl PlaySFX _0807684A: - ldr r2, _08076880 @ =gLinkState + ldr r2, _08076880 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -7116,7 +7116,7 @@ _0807684A: bl CreateFx b _080768DA .align 2, 0 -_08076880: .4byte gLinkState +_08076880: .4byte gPlayerState _08076884: adds r0, r4, #0 movs r1, #0x11 @@ -7180,7 +7180,7 @@ sub_080768F8: @ 0x080768F8 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r3, _08076934 @ =gLinkState + ldr r3, _08076934 @ =gPlayerState ldrb r1, [r3, #0x1c] ldrb r0, [r3, #4] orrs r1, r0 @@ -7208,7 +7208,7 @@ sub_080768F8: @ 0x080768F8 strb r0, [r4, #7] b _0807693C .align 2, 0 -_08076934: .4byte gLinkState +_08076934: .4byte gPlayerState _08076938: ldr r0, _08076950 @ =0x00000C14 strh r0, [r3, #8] @@ -7244,11 +7244,11 @@ sub_08076964: @ 0x08076964 bne _08076978 b _08076A70 _08076978: - ldr r0, _080769C4 @ =gLinkEntity + ldr r0, _080769C4 @ =gPlayerEntity ldr r7, [r0, #0x34] cmp r7, #0 bne _08076A70 - ldr r5, _080769C8 @ =gLinkState + ldr r5, _080769C8 @ =gPlayerState ldrb r0, [r5, #0x1e] cmp r0, #0 beq _08076A70 @@ -7281,8 +7281,8 @@ _080769A0: bl sub_08077E78 b _08076A7E .align 2, 0 -_080769C4: .4byte gLinkEntity -_080769C8: .4byte gLinkState +_080769C4: .4byte gPlayerEntity +_080769C8: .4byte gPlayerState _080769CC: movs r0, #0x40 strb r0, [r5, #0x1e] @@ -7344,7 +7344,7 @@ _08076A3E: strb r1, [r0] b _08076A7E _08076A46: - ldr r0, _08076A5C @ =gLinkState + ldr r0, _08076A5C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -7355,17 +7355,17 @@ _08076A46: bl sub_08077DF4 b _08076A7E .align 2, 0 -_08076A5C: .4byte gLinkState +_08076A5C: .4byte gPlayerState _08076A60: - ldr r1, _08076A6C @ =gLinkState + ldr r1, _08076A6C @ =gPlayerState movs r0, #0xc1 lsls r0, r0, #4 strh r0, [r1, #8] b _08076A7E .align 2, 0 -_08076A6C: .4byte gLinkState +_08076A6C: .4byte gPlayerState _08076A70: - ldr r1, _08076A84 @ =gLinkState + ldr r1, _08076A84 @ =gPlayerState movs r0, #0 strb r0, [r1, #0x1e] adds r0, r4, #0 @@ -7376,7 +7376,7 @@ _08076A7E: mov r8, r3 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08076A84: .4byte gLinkState +_08076A84: .4byte gPlayerState thumb_func_start sub_08076A88 sub_08076A88: @ 0x08076A88 @@ -7386,7 +7386,7 @@ sub_08076A88: @ 0x08076A88 bl sub_08077EFC cmp r0, #0 beq _08076B64 - ldr r1, _08076AB4 @ =gLinkState + ldr r1, _08076AB4 @ =gPlayerState ldrb r0, [r1, #0x1e] adds r3, r1, #0 cmp r0, #0 @@ -7396,15 +7396,15 @@ sub_08076A88: @ 0x08076A88 ands r0, r1 cmp r0, #0 bne _08076ABC - ldr r1, _08076AB8 @ =gLinkEntity + ldr r1, _08076AB8 @ =gPlayerEntity movs r0, #0xc0 lsls r0, r0, #2 b _08076AC2 .align 2, 0 -_08076AB4: .4byte gLinkState -_08076AB8: .4byte gLinkEntity +_08076AB4: .4byte gPlayerState +_08076AB8: .4byte gPlayerEntity _08076ABC: - ldr r1, _08076B00 @ =gLinkEntity + ldr r1, _08076B00 @ =gPlayerEntity movs r0, #0xa0 lsls r0, r0, #2 _08076AC2: @@ -7440,7 +7440,7 @@ _08076AC2: strb r0, [r3, #0xd] b _08076B72 .align 2, 0 -_08076B00: .4byte gLinkEntity +_08076B00: .4byte gPlayerEntity _08076B04: .4byte gUnk_0800275C _08076B08: movs r0, #1 @@ -7491,7 +7491,7 @@ _08076B52: .align 2, 0 _08076B60: .4byte gUnk_0811BE38 _08076B64: - ldr r1, _08076B74 @ =gLinkState + ldr r1, _08076B74 @ =gPlayerState movs r0, #0 strb r0, [r1, #0x1e] adds r0, r4, #0 @@ -7500,4 +7500,4 @@ _08076B64: _08076B72: pop {r4, r5, r6, r7, pc} .align 2, 0 -_08076B74: .4byte gLinkState +_08076B74: .4byte gPlayerState diff --git a/asm/code_08076C80.s b/asm/code_08076C80.s index 2b1a0501..a1d47e18 100644 --- a/asm/code_08076C80.s +++ b/asm/code_08076C80.s @@ -13,12 +13,12 @@ sub_08076DF4: @ 0x08076DF4 push {r7} adds r4, r0, #0 adds r7, r1, #0 - ldr r0, _08076E48 @ =gLinkEntity + ldr r0, _08076E48 @ =gPlayerEntity mov r8, r0 bl sub_0807A894 cmp r0, #0x29 beq _08076E50 - ldr r6, _08076E4C @ =gLinkState + ldr r6, _08076E4C @ =gPlayerState ldrb r0, [r6, #0x12] cmp r0, #0x12 beq _08076E50 @@ -48,8 +48,8 @@ sub_08076DF4: @ 0x08076DF4 bl sub_08077BB8 b _08076E58 .align 2, 0 -_08076E48: .4byte gLinkEntity -_08076E4C: .4byte gLinkState +_08076E48: .4byte gPlayerEntity +_08076E4C: .4byte gPlayerState _08076E50: adds r0, r4, #0 adds r1, r7, #0 @@ -65,7 +65,7 @@ sub_08076E60: @ 0x08076E60 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r5, _08076EB4 @ =gLinkState + ldr r5, _08076EB4 @ =gPlayerState ldrb r1, [r5, #0x1c] movs r0, #0xf ands r0, r1 @@ -98,13 +98,13 @@ _08076E7A: adds r1, r0, #0 cmp r1, #0 beq _08076EC6 - ldr r0, _08076EBC @ =gLinkEntity + ldr r0, _08076EBC @ =gPlayerEntity str r0, [r1, #0x50] b _08076EC6 .align 2, 0 -_08076EB4: .4byte gLinkState +_08076EB4: .4byte gPlayerState _08076EB8: .4byte 0x00000504 -_08076EBC: .4byte gLinkEntity +_08076EBC: .4byte gPlayerEntity _08076EC0: adds r0, r4, #0 bl UpdateItemAnim @@ -116,7 +116,7 @@ sub_08076EC8: @ 0x08076EC8 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r5, _08076EE4 @ =gLinkState + ldr r5, _08076EE4 @ =gPlayerState ldrb r1, [r5, #0x1c] movs r0, #0xf ands r0, r1 @@ -127,7 +127,7 @@ sub_08076EC8: @ 0x08076EC8 bl sub_08077E78 b _08076F60 .align 2, 0 -_08076EE4: .4byte gLinkState +_08076EE4: .4byte gPlayerState _08076EE8: adds r0, r4, #0 bl sub_08077EFC @@ -151,17 +151,17 @@ _08076F0C: movs r0, #1 _08076F0E: strb r0, [r5, #0x1d] - ldr r0, _08076F1C @ =gLinkEntity + ldr r0, _08076F1C @ =gPlayerEntity ldrb r0, [r0, #0xd] cmp r0, #0x1b bne _08076F24 ldr r1, _08076F20 @ =0x00000524 b _08076F36 .align 2, 0 -_08076F1C: .4byte gLinkEntity +_08076F1C: .4byte gPlayerEntity _08076F20: .4byte 0x00000524 _08076F24: - ldr r0, _08076F44 @ =gLinkState + ldr r0, _08076F44 @ =gPlayerState ldrb r1, [r0, #0xd] movs r0, #0x80 ands r0, r1 @@ -178,7 +178,7 @@ _08076F36: bl sub_08077DF4 b _08076F60 .align 2, 0 -_08076F44: .4byte gLinkState +_08076F44: .4byte gPlayerState _08076F48: adds r0, r4, #0 bl UpdateItemAnim @@ -201,7 +201,7 @@ sub_08076F64: @ 0x08076F64 push {r4, r5, r6, lr} adds r4, r0, #0 adds r6, r1, #0 - ldr r1, _08076F84 @ =gLinkState + ldr r1, _08076F84 @ =gPlayerState ldrb r0, [r1, #0x1c] movs r2, #0xf ands r2, r0 @@ -216,7 +216,7 @@ _08076F7A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08076F84: .4byte gLinkState +_08076F84: .4byte gPlayerState _08076F88: .4byte _08076F8C _08076F8C: @ jump table .4byte _08077100 @ case 0 @@ -242,7 +242,7 @@ _08076FAC: strb r0, [r4, #7] movs r1, #1 strb r1, [r3, #0x1d] - ldr r5, _08076FFC @ =gLinkEntity + ldr r5, _08076FFC @ =gPlayerEntity str r0, [r5, #0x74] strb r1, [r3, #0x1c] movs r1, #8 @@ -267,7 +267,7 @@ _08076FF6: str r5, [r0, #0x50] b _08077110 .align 2, 0 -_08076FFC: .4byte gLinkEntity +_08076FFC: .4byte gPlayerEntity _08077000: .4byte 0x00000504 _08077004: movs r0, #6 @@ -285,13 +285,13 @@ _0807700E: _0807701C: adds r0, r4, #0 bl UpdateItemAnim - ldr r0, _08077044 @ =gLinkState + ldr r0, _08077044 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #2 ands r0, r1 cmp r0, #0 bne _08077110 - ldr r0, _08077048 @ =gLinkEntity + ldr r0, _08077048 @ =gPlayerEntity ldrb r1, [r0, #0x14] lsls r1, r1, #2 movs r2, #0x10 @@ -301,10 +301,10 @@ _0807701C: bl sub_08079E08 b _08077110 .align 2, 0 -_08077044: .4byte gLinkState -_08077048: .4byte gLinkEntity +_08077044: .4byte gPlayerState +_08077048: .4byte gPlayerEntity _0807704C: - ldr r1, _080770B0 @ =gLinkState + ldr r1, _080770B0 @ =gPlayerState movs r0, #4 strb r0, [r1, #0x1c] _08077052: @@ -322,11 +322,11 @@ _08077060: ands r0, r1 cmp r0, #0 beq _0807708C - ldr r1, _080770B0 @ =gLinkState + ldr r1, _080770B0 @ =gPlayerState movs r2, #0 movs r0, #5 strb r0, [r1, #0x1c] - ldr r0, _080770B4 @ =gLinkEntity + ldr r0, _080770B4 @ =gPlayerEntity str r2, [r0, #0x70] ldrb r0, [r1, #0x1d] cmp r0, #0 @@ -336,13 +336,13 @@ _08077060: movs r3, #0 bl CreatePlayerItem _0807708C: - ldr r0, _080770B0 @ =gLinkState + ldr r0, _080770B0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #2 ands r0, r1 cmp r0, #0 bne _08077110 - ldr r2, _080770B4 @ =gLinkEntity + ldr r2, _080770B4 @ =gPlayerEntity ldrb r0, [r2, #0x14] lsls r0, r0, #2 movs r1, #0x10 @@ -353,8 +353,8 @@ _0807708C: bl sub_08079E08 b _08077110 .align 2, 0 -_080770B0: .4byte gLinkState -_080770B4: .4byte gLinkEntity +_080770B0: .4byte gPlayerState +_080770B4: .4byte gPlayerEntity _080770B8: adds r0, r4, #0 bl UpdateItemAnim @@ -363,15 +363,15 @@ _080770B8: ands r0, r1 cmp r0, #0 beq _08077110 - ldr r3, _080770CC @ =gLinkState + ldr r3, _080770CC @ =gPlayerState b _08077100 .align 2, 0 -_080770CC: .4byte gLinkState +_080770CC: .4byte gPlayerState _080770D0: ldr r1, _080770E4 @ =0x00000514 adds r0, r4, #0 bl sub_08077DF4 - ldr r1, _080770E8 @ =gLinkState + ldr r1, _080770E8 @ =gPlayerState movs r2, #0 movs r0, #3 strb r0, [r1, #0x1c] @@ -379,7 +379,7 @@ _080770D0: b _08077110 .align 2, 0 _080770E4: .4byte 0x00000514 -_080770E8: .4byte gLinkState +_080770E8: .4byte gPlayerState _080770EC: movs r0, #3 strb r0, [r3, #0x1c] @@ -393,7 +393,7 @@ _080770FC: .4byte 0x00000514 _08077100: movs r1, #0 strb r1, [r3, #0x1c] - ldr r0, _08077114 @ =gLinkEntity + ldr r0, _08077114 @ =gPlayerEntity str r1, [r0, #0x70] adds r0, r4, #0 adds r1, r6, #0 @@ -401,7 +401,7 @@ _08077100: _08077110: pop {r4, r5, r6, pc} .align 2, 0 -_08077114: .4byte gLinkEntity +_08077114: .4byte gPlayerEntity thumb_func_start MoleMitts MoleMitts: @ 0x08077118 @@ -420,7 +420,7 @@ _0807712C: .4byte gUnk_0811BE04 sub_08077130: @ 0x08077130 push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r5, _0807718C @ =gLinkState + ldr r5, _0807718C @ =gPlayerState ldrb r0, [r5, #2] cmp r0, #0 bne _080771B6 @@ -448,7 +448,7 @@ sub_08077130: @ 0x08077130 strb r0, [r4, #4] cmp r5, #0x56 bne _080771C4 - ldr r2, _08077194 @ =gLinkEntity + ldr r2, _08077194 @ =gPlayerEntity ldrb r1, [r2, #0x14] ands r0, r1 cmp r0, #0 @@ -462,9 +462,9 @@ sub_08077130: @ 0x08077130 strh r1, [r2, #0x32] b _080771C4 .align 2, 0 -_0807718C: .4byte gLinkState +_0807718C: .4byte gPlayerState _08077190: .4byte 0x0000050C -_08077194: .4byte gLinkEntity +_08077194: .4byte gPlayerEntity _08077198: ldrh r0, [r2, #0x2e] movs r1, #0x10 @@ -506,13 +506,13 @@ sub_080771C8: @ 0x080771C8 adds r0, r4, #0 adds r1, r5, #0 bl sub_08077E78 - ldr r0, _080771F0 @ =gLinkState + ldr r0, _080771F0 @ =gPlayerState adds r0, #0x3d movs r1, #0 strb r1, [r0] b _080772A4 .align 2, 0 -_080771F0: .4byte gLinkState +_080771F0: .4byte gPlayerState _080771F4: movs r0, #0x20 ands r0, r1 @@ -521,7 +521,7 @@ _080771F4: ldrb r0, [r4, #8] cmp r0, #0xff bne _0807720E - ldr r0, _08077240 @ =gLinkEntity + ldr r0, _08077240 @ =gPlayerEntity ldrb r2, [r4, #0xe] movs r1, #0x1e movs r3, #1 @@ -532,7 +532,7 @@ _0807720E: ands r0, r1 cmp r0, #0 beq _080772A4 - ldr r5, _08077240 @ =gLinkEntity + ldr r5, _08077240 @ =gPlayerEntity adds r0, r5, #0 movs r1, #0xd adds r2, r4, #0 @@ -549,7 +549,7 @@ _0807720E: bl PlaySFX b _080772A4 .align 2, 0 -_08077240: .4byte gLinkEntity +_08077240: .4byte gPlayerEntity _08077244: .4byte 0x00000107 _08077248: ldrb r0, [r4, #8] @@ -632,7 +632,7 @@ _080772C6: adds r0, r4, #0 movs r1, #2 bl sub_08077E3C - ldr r3, _080772F8 @ =gLinkEntity + ldr r3, _080772F8 @ =gPlayerEntity ldr r2, _080772FC @ =gUnk_0811BE16 ldrb r1, [r4, #0xe] adds r0, r5, #0 @@ -643,23 +643,23 @@ _080772C6: lsls r0, r0, #1 b _0807732E .align 2, 0 -_080772F8: .4byte gLinkEntity +_080772F8: .4byte gPlayerEntity _080772FC: .4byte gUnk_0811BE16 _08077300: adds r0, r4, #0 bl UpdateItemAnim - ldr r3, _08077310 @ =gLinkEntity + ldr r3, _08077310 @ =gPlayerEntity ldr r2, _08077314 @ =gUnk_0811BE16 ldrb r1, [r4, #0xe] adds r0, r5, #0 b _08077326 .align 2, 0 -_08077310: .4byte gLinkEntity +_08077310: .4byte gPlayerEntity _08077314: .4byte gUnk_0811BE16 _08077318: adds r0, r4, #0 bl UpdateItemAnim - ldr r3, _0807736C @ =gLinkEntity + ldr r3, _0807736C @ =gPlayerEntity ldr r2, _08077370 @ =gUnk_0811BE16 ldrb r1, [r4, #0xe] movs r0, #7 @@ -670,7 +670,7 @@ _08077326: ldrh r0, [r0] _0807732E: strh r0, [r3, #0x24] - ldr r5, _0807736C @ =gLinkEntity + ldr r5, _0807736C @ =gPlayerEntity ldrb r0, [r5, #0x14] lsls r0, r0, #2 strb r0, [r5, #0x15] @@ -699,19 +699,19 @@ _08077344: strb r0, [r4, #7] b _0807743E .align 2, 0 -_0807736C: .4byte gLinkEntity +_0807736C: .4byte gPlayerEntity _08077370: .4byte gUnk_0811BE16 _08077374: adds r0, r4, #0 adds r1, r6, #0 bl sub_08077E78 - ldr r0, _08077388 @ =gLinkState + ldr r0, _08077388 @ =gPlayerState adds r0, #0x3d movs r1, #0 strb r1, [r0] b _0807743E .align 2, 0 -_08077388: .4byte gLinkState +_08077388: .4byte gPlayerState _0807738C: movs r0, #0x60 ands r0, r1 @@ -809,7 +809,7 @@ sub_08077448: @ 0x08077448 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r2, _08077498 @ =gLinkEntity + ldr r2, _08077498 @ =gPlayerEntity ldrb r0, [r2, #0x14] lsls r0, r0, #2 movs r1, #0x10 @@ -835,7 +835,7 @@ _08077474: ands r0, r1 cmp r0, #0 beq _08077494 - ldr r0, _0807749C @ =gLinkState + ldr r0, _0807749C @ =gPlayerState adds r0, #0x3d movs r1, #0 strb r1, [r0] @@ -845,13 +845,13 @@ _08077474: _08077494: pop {r4, r5, pc} .align 2, 0 -_08077498: .4byte gLinkEntity -_0807749C: .4byte gLinkState +_08077498: .4byte gPlayerEntity +_0807749C: .4byte gPlayerState thumb_func_start sub_080774A0 sub_080774A0: @ 0x080774A0 push {r4, r5, r6, r7, lr} - ldr r3, _080774FC @ =gLinkEntity + ldr r3, _080774FC @ =gPlayerEntity movs r0, #0x2e ldrsh r2, [r3, r0] ldr r5, _08077500 @ =gUnk_0811BE1E @@ -896,7 +896,7 @@ _080774F6: movs r0, #0 b _0807751A .align 2, 0 -_080774FC: .4byte gLinkEntity +_080774FC: .4byte gPlayerEntity _08077500: .4byte gUnk_0811BE1E _08077504: .4byte gRoomControls _08077508: @@ -930,7 +930,7 @@ sub_08077534: @ 0x08077534 push {r4, lr} adds r4, r0, #0 bl sub_08077D38 - ldr r0, _08077570 @ =gLinkEntity + ldr r0, _08077570 @ =gPlayerEntity bl sub_0806F948 adds r0, r4, #0 bl sub_08077BB8 @@ -954,7 +954,7 @@ sub_08077534: @ 0x08077534 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08077570: .4byte gLinkEntity +_08077570: .4byte gPlayerEntity _08077574: .4byte gUnk_02002A40 _08077578: .4byte _0807757C _0807757C: @ jump table @@ -986,7 +986,7 @@ _080775D0: .4byte 0x00000614 _080775D4: movs r0, #3 strb r0, [r4, #4] - ldr r1, _080775F0 @ =gLinkEntity + ldr r1, _080775F0 @ =gPlayerEntity movs r0, #4 strb r0, [r1, #0x14] ldrb r2, [r1, #0x18] @@ -998,7 +998,7 @@ _080775D4: bl sub_08077DF4 b _08077606 .align 2, 0 -_080775F0: .4byte gLinkEntity +_080775F0: .4byte gPlayerEntity _080775F4: .4byte 0x000002DF _080775F8: movs r0, #3 @@ -1008,7 +1008,7 @@ _080775F8: adds r0, r4, #0 bl sub_08077DF4 _08077606: - ldr r2, _08077614 @ =gLinkEntity + ldr r2, _08077614 @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x7f ands r0, r1 @@ -1016,7 +1016,7 @@ _08077606: _08077610: pop {r4, pc} .align 2, 0 -_08077614: .4byte gLinkEntity +_08077614: .4byte gPlayerEntity thumb_func_start sub_08077618 sub_08077618: @ 0x08077618 @@ -1052,7 +1052,7 @@ sub_08077640: @ 0x08077640 ands r0, r1 cmp r0, #0 beq _08077666 - ldr r2, _08077668 @ =gLinkEntity + ldr r2, _08077668 @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x80 orrs r0, r1 @@ -1063,7 +1063,7 @@ sub_08077640: @ 0x08077640 _08077666: pop {r4, r5, pc} .align 2, 0 -_08077668: .4byte gLinkEntity +_08077668: .4byte gPlayerEntity thumb_func_start sub_0807766C sub_0807766C: @ 0x0807766C @@ -1076,7 +1076,7 @@ sub_0807766C: @ 0x0807766C ands r0, r1 cmp r0, #0 beq _08077692 - ldr r2, _08077694 @ =gLinkEntity + ldr r2, _08077694 @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x80 orrs r0, r1 @@ -1087,13 +1087,13 @@ sub_0807766C: @ 0x0807766C _08077692: pop {r4, r5, pc} .align 2, 0 -_08077694: .4byte gLinkEntity +_08077694: .4byte gPlayerEntity thumb_func_start sub_08077698 sub_08077698: @ 0x08077698 push {r4, r5, lr} adds r4, r0, #0 - ldr r2, _0807771C @ =gLinkState + ldr r2, _0807771C @ =gPlayerState ldrb r1, [r2, #3] movs r0, #0xfe ands r0, r1 @@ -1155,7 +1155,7 @@ _08077712: bls _08077704 pop {r4, r5, pc} .align 2, 0 -_0807771C: .4byte gLinkState +_0807771C: .4byte gPlayerState _08077720: .4byte gUnk_02002A40 _08077724: .4byte gUnk_03000B80 @@ -1189,7 +1189,7 @@ _08077754: .4byte gUnk_02002A40 sub_08077758: @ 0x08077758 push {lr} adds r3, r0, #0 - ldr r2, _08077794 @ =gLinkState + ldr r2, _08077794 @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #0x80 lsls r0, r0, #7 @@ -1218,7 +1218,7 @@ sub_08077758: @ 0x08077758 movs r0, #1 b _0807779E .align 2, 0 -_08077794: .4byte gLinkState +_08077794: .4byte gPlayerState _08077798: bl sub_0807A108 _0807779C: @@ -1229,7 +1229,7 @@ _0807779E: thumb_func_start sub_080777A0 sub_080777A0: @ 0x080777A0 push {r4, lr} - ldr r3, _080777D0 @ =gLinkState + ldr r3, _080777D0 @ =gPlayerState adds r0, r3, #0 adds r0, #0x92 ldrh r1, [r0] @@ -1253,7 +1253,7 @@ _080777CC: movs r0, #1 b _0807787C .align 2, 0 -_080777D0: .4byte gLinkState +_080777D0: .4byte gPlayerState _080777D4: ldr r2, _080777F4 @ =gArea ldrb r0, [r2, #0x18] @@ -1278,13 +1278,13 @@ _080777FC: ldrb r0, [r2, #0x1a] cmp r0, #0 bne _080777CC - ldr r1, _0807780C @ =gLinkEntity + ldr r1, _0807780C @ =gPlayerEntity ldrb r0, [r1, #0xd] adds r0, #1 strb r0, [r1, #0xd] b _080777CC .align 2, 0 -_0807780C: .4byte gLinkEntity +_0807780C: .4byte gPlayerEntity _08077810: ldrb r0, [r2, #0x1a] cmp r0, #0 @@ -1292,7 +1292,7 @@ _08077810: ands r1, r4 cmp r1, #0 beq _0807787A - ldr r0, _08077834 @ =gLinkEntity + ldr r0, _08077834 @ =gPlayerEntity ldrb r1, [r0, #0xd] adds r1, #1 strb r1, [r0, #0xd] @@ -1304,7 +1304,7 @@ _08077810: bl sub_0805E4E0 b _080777CC .align 2, 0 -_08077834: .4byte gLinkEntity +_08077834: .4byte gPlayerEntity _08077838: ldrb r0, [r2, #0x12] cmp r0, #0x11 @@ -1389,13 +1389,13 @@ _080778C8: .4byte gUnk_03004010 thumb_func_start sub_080778CC sub_080778CC: @ 0x080778CC push {lr} - ldr r2, _08077920 @ =gLinkState + ldr r2, _08077920 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _08077924 @ =0x000400A0 ands r0, r1 cmp r0, #0 bne _0807791C - ldr r0, _08077928 @ =gLinkEntity + ldr r0, _08077928 @ =gPlayerEntity adds r0, #0x79 ldrb r0, [r0] cmp r0, #0 @@ -1415,7 +1415,7 @@ _080778FA: bl sub_080789A8 cmp r0, #0 bne _08077910 - ldr r0, _08077920 @ =gLinkState + ldr r0, _08077920 @ =gPlayerState adds r0, #0x90 ldrh r1, [r0] ldr r0, _0807792C @ =0x00000F03 @@ -1432,9 +1432,9 @@ _0807791C: movs r0, #0 b _08077940 .align 2, 0 -_08077920: .4byte gLinkState +_08077920: .4byte gPlayerState _08077924: .4byte 0x000400A0 -_08077928: .4byte gLinkEntity +_08077928: .4byte gPlayerEntity _0807792C: .4byte 0x00000F03 _08077930: movs r0, #0x1b @@ -1455,7 +1455,7 @@ _08077948: .4byte 0x00000145 sub_0807794C: @ 0x0807794C push {lr} adds r2, r0, #0 - ldr r0, _080779B8 @ =gLinkState + ldr r0, _080779B8 @ =gPlayerState ldrb r1, [r0, #0xc] adds r3, r0, #0 cmp r1, #0x18 @@ -1475,7 +1475,7 @@ _0807796E: ldrb r0, [r3, #2] cmp r0, #0 bne _0807797C - ldr r0, _080779BC @ =gLinkEntity + ldr r0, _080779BC @ =gPlayerEntity ldr r0, [r0, #0x34] cmp r0, #0 beq _08077980 @@ -1513,8 +1513,8 @@ _080779B2: movs r0, #0 b _080779DE .align 2, 0 -_080779B8: .4byte gLinkState -_080779BC: .4byte gLinkEntity +_080779B8: .4byte gPlayerState +_080779BC: .4byte gPlayerEntity _080779C0: .4byte gUnk_0811BE48 _080779C4: ldr r1, _080779E0 @ =gUnk_0811BE48 @@ -1572,7 +1572,7 @@ _08077A16: sub_08077A18: @ 0x08077A18 push {lr} adds r1, r0, #0 - ldr r0, _08077A3C @ =gLinkState + ldr r0, _08077A3C @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _08077A44 @@ -1588,7 +1588,7 @@ sub_08077A18: @ 0x08077A18 bl sub_080779EC b _08077A46 .align 2, 0 -_08077A3C: .4byte gLinkState +_08077A3C: .4byte gPlayerState _08077A40: .4byte gUnk_03000B80 _08077A44: movs r0, #0 @@ -1599,7 +1599,7 @@ _08077A46: sub_08077A48: @ 0x08077A48 push {r4, r5, r6, lr} adds r2, r0, #0 - ldr r6, _08077A88 @ =gLinkState + ldr r6, _08077A88 @ =gPlayerState ldrb r0, [r6, #5] cmp r0, #0 bne _08077A94 @@ -1629,7 +1629,7 @@ sub_08077A48: @ 0x08077A48 adds r0, r5, #0 b _08077A96 .align 2, 0 -_08077A88: .4byte gLinkState +_08077A88: .4byte gPlayerState _08077A8C: .4byte gUnk_0811BE48 _08077A90: .4byte gUnk_03000B80 _08077A94: @@ -1645,7 +1645,7 @@ sub_08077A98: @ 0x08077A98 ldrb r0, [r0] cmp r0, #0 beq _08077AC4 - ldr r0, _08077ABC @ =gLinkState + ldr r0, _08077ABC @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _08077AC4 @@ -1657,7 +1657,7 @@ sub_08077A98: @ 0x08077A98 b _08077AC6 .align 2, 0 _08077AB8: .4byte gUnk_02002A40 -_08077ABC: .4byte gLinkState +_08077ABC: .4byte gPlayerState _08077AC0: .4byte gUnk_03000B80 _08077AC4: movs r0, #0 @@ -1694,7 +1694,7 @@ sub_08077AEC: @ 0x08077AEC ldr r0, _08077B14 @ =gUnk_03000BD4 movs r1, #3 bl sub_08077E78 - ldr r2, _08077B18 @ =gLinkState + ldr r2, _08077B18 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _08077B1C @ =0xFF7FFFFF ands r0, r1 @@ -1710,12 +1710,12 @@ _08077B12: pop {pc} .align 2, 0 _08077B14: .4byte gUnk_03000BD4 -_08077B18: .4byte gLinkState +_08077B18: .4byte gPlayerState _08077B1C: .4byte 0xFF7FFFFF thumb_func_start sub_08077B20 sub_08077B20: @ 0x08077B20 push {lr} - bl ResetLink + bl ResetPlayer bl sub_08077AEC pop {pc} \ No newline at end of file diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index 2b863d36..aaec6e04 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -49,7 +49,7 @@ _0807802E: _08078036: cmp r2, #0 beq _08078068 - ldr r0, _08078064 @ =gLinkState + ldr r0, _08078064 @ =gPlayerState ldrb r1, [r0, #0x1b] movs r0, #0x20 ands r0, r1 @@ -70,7 +70,7 @@ _08078036: b _0807806C .align 2, 0 _08078060: .4byte gUnk_02002A40 -_08078064: .4byte gLinkState +_08078064: .4byte gPlayerState _08078068: movs r0, #0 strb r0, [r4, #1] @@ -82,7 +82,7 @@ _0807806C: sub_08078070: @ 0x08078070 push {lr} adds r2, r0, #0 - ldr r3, _08078098 @ =gLinkState + ldr r3, _08078098 @ =gPlayerState ldrb r1, [r3, #0x1b] movs r0, #0x20 ands r0, r1 @@ -100,7 +100,7 @@ sub_08078070: @ 0x08078070 adds r0, #0xc b _080780A0 .align 2, 0 -_08078098: .4byte gLinkState +_08078098: .4byte gPlayerState _0807809C: ldrh r0, [r2, #4] adds r0, #6 @@ -142,7 +142,7 @@ _080780DA: sub_080780E0: @ 0x080780E0 push {lr} adds r2, r0, #0 - ldr r0, _080780F4 @ =gLinkState + ldr r0, _080780F4 @ =gPlayerState ldrb r1, [r0, #0x1b] movs r0, #0x40 ands r0, r1 @@ -151,7 +151,7 @@ sub_080780E0: @ 0x080780E0 movs r0, #5 b _08078102 .align 2, 0 -_080780F4: .4byte gLinkState +_080780F4: .4byte gPlayerState _080780F8: movs r0, #0x20 ands r0, r1 @@ -224,10 +224,10 @@ _0807815C: thumb_func_start sub_08078160 sub_08078160: @ 0x08078160 push {lr} - ldr r1, _08078178 @ =gLinkState + ldr r1, _08078178 @ =gPlayerState adds r1, #0xa8 strb r0, [r1] - ldr r2, _0807817C @ =gLinkEntity + ldr r2, _0807817C @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x7f ands r0, r1 @@ -235,8 +235,8 @@ sub_08078160: @ 0x08078160 bl sub_08078B48 pop {pc} .align 2, 0 -_08078178: .4byte gLinkState -_0807817C: .4byte gLinkEntity +_08078178: .4byte gPlayerState +_0807817C: .4byte gPlayerEntity thumb_func_start sub_08078180 sub_08078180: @ 0x08078180 @@ -251,7 +251,7 @@ sub_08078180: @ 0x08078180 b _080782BC _08078192: movs r4, #0 - ldr r5, _080781CC @ =gLinkState + ldr r5, _080781CC @ =gPlayerState ldrb r0, [r5, #2] cmp r0, #0 beq _0807819E @@ -282,7 +282,7 @@ _080781C4: b _080782B6 .align 2, 0 _080781C8: .4byte gUnk_0200AF00 -_080781CC: .4byte gLinkState +_080781CC: .4byte gPlayerState _080781D0: .4byte 0x00104D00 _080781D4: adds r1, r6, #0 @@ -399,7 +399,7 @@ _080782BC: thumb_func_start sub_080782C0 sub_080782C0: @ 0x080782C0 push {r4, r5, r6, lr} - ldr r1, _080782D8 @ =gLinkState + ldr r1, _080782D8 @ =gPlayerState adds r2, r1, #0 adds r2, #0xa8 ldrb r0, [r2] @@ -411,7 +411,7 @@ sub_080782C0: @ 0x080782C0 ldrb r0, [r0] b _080782DE .align 2, 0 -_080782D8: .4byte gLinkState +_080782D8: .4byte gPlayerState _080782DC: ldrb r0, [r2] _080782DE: @@ -500,7 +500,7 @@ _0807839A: beq _080783A6 b _080784AC _080783A6: - ldr r0, _08078400 @ =gLinkEntity + ldr r0, _08078400 @ =gPlayerEntity ldr r0, [r0, #0x74] ldr r0, [r0, #0x54] ldrh r1, [r0, #8] @@ -509,7 +509,7 @@ _080783A6: beq _080783B6 b _080784AC _080783B6: - ldr r2, _08078408 @ =gLinkState + ldr r2, _08078408 @ =gPlayerState adds r0, r2, #0 adds r0, #0x92 ldrh r1, [r0] @@ -546,9 +546,9 @@ _080783B6: strb r0, [r4, #0xc] b _08078420 .align 2, 0 -_08078400: .4byte gLinkEntity +_08078400: .4byte gPlayerEntity _08078404: .4byte 0x00000206 -_08078408: .4byte gLinkState +_08078408: .4byte gPlayerState _0807840C: .4byte gUnk_03003DF0 _08078410: .4byte gUnk_02002A40 _08078414: .4byte 0x0000012B @@ -667,7 +667,7 @@ sub_080784E4: @ 0x080784E4 .align 2, 0 _080784FC: .4byte gUnk_03003DF0 _08078500: - ldr r2, _08078528 @ =gLinkState + ldr r2, _08078528 @ =gPlayerState adds r0, r2, #0 adds r0, #0x27 adds r3, r2, #0 @@ -687,7 +687,7 @@ _08078500: ldrb r0, [r0] b _0807852E .align 2, 0 -_08078528: .4byte gLinkState +_08078528: .4byte gPlayerState _0807852C: ldrb r0, [r1] _0807852E: @@ -753,7 +753,7 @@ _080785C4: movs r0, #2 orrs r7, r0 _080785D2: - ldr r3, _080785E4 @ =gLinkEntity + ldr r3, _080785E4 @ =gPlayerEntity ldrb r0, [r3, #0x14] movs r1, #6 ands r1, r0 @@ -763,11 +763,11 @@ _080785D2: mov r8, r5 b _080785FE .align 2, 0 -_080785E4: .4byte gLinkEntity +_080785E4: .4byte gPlayerEntity _080785E8: .4byte gUnk_0811C00C _080785EC: .4byte gUnk_03003DF0 _080785F0: - ldr r3, _08078624 @ =gLinkEntity + ldr r3, _08078624 @ =gPlayerEntity ldrb r0, [r3, #0x14] movs r1, #6 ands r1, r0 @@ -794,7 +794,7 @@ _080785FE: ldr r5, _0807862C @ =gUnk_03003DF8 b _08078724 .align 2, 0 -_08078624: .4byte gLinkEntity +_08078624: .4byte gPlayerEntity _08078628: .4byte gUnk_0811C014 _0807862C: .4byte gUnk_03003DF8 _08078630: @@ -845,7 +845,7 @@ _08078674: @ jump table .4byte _080786A0 @ case 9 .4byte _080786D4 @ case 10 _080786A0: - ldr r0, _080786B0 @ =gLinkState + ldr r0, _080786B0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -853,15 +853,15 @@ _080786A0: bne _08078714 b _080786D4 .align 2, 0 -_080786B0: .4byte gLinkState +_080786B0: .4byte gPlayerState _080786B4: - ldr r0, _080786C0 @ =gLinkState + ldr r0, _080786C0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 b _080786D0 .align 2, 0 -_080786C0: .4byte gLinkState +_080786C0: .4byte gPlayerState _080786C4: ldrb r0, [r5, #3] b _080786D0 diff --git a/asm/code_08078778.s b/asm/code_08078778.s index 70aa7420..cf4104c6 100644 --- a/asm/code_08078778.s +++ b/asm/code_08078778.s @@ -186,13 +186,13 @@ sub_080789A8: @ 0x080789A8 .align 2, 0 _080789BC: .4byte gUnk_03003BE0 _080789C0: - ldr r0, _08078A5C @ =gLinkState + ldr r0, _08078A5C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 bne _08078A56 - ldr r0, _08078A60 @ =gLinkEntity + ldr r0, _08078A60 @ =gPlayerEntity bl sub_080002D0 adds r4, r0, #0 cmp r4, #0xf @@ -205,7 +205,7 @@ _080789C0: cmp r0, #0xf beq _08078A56 _080789E6: - ldr r0, _08078A5C @ =gLinkState + ldr r0, _08078A5C @ =gPlayerState ldrb r0, [r0, #0x12] cmp r0, #0x12 beq _08078A56 @@ -215,7 +215,7 @@ _080789E6: ldrb r4, [r3, #2] cmp r4, #0 beq _08078A2E - ldr r2, _08078A60 @ =gLinkEntity + ldr r2, _08078A60 @ =gPlayerEntity ldrb r1, [r2, #0x14] movs r0, #6 ands r0, r1 @@ -239,11 +239,11 @@ _08078A0C: bne _08078A74 _08078A26: subs r4, #1 - ldr r7, _08078A60 @ =gLinkEntity + ldr r7, _08078A60 @ =gPlayerEntity cmp r4, #0 bne _08078A0C _08078A2E: - ldr r0, _08078A60 @ =gLinkEntity + ldr r0, _08078A60 @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r2, #6 ands r2, r1 @@ -265,8 +265,8 @@ _08078A56: movs r0, #0 b _08078A88 .align 2, 0 -_08078A5C: .4byte gLinkState -_08078A60: .4byte gLinkEntity +_08078A5C: .4byte gPlayerState +_08078A60: .4byte gPlayerEntity _08078A64: .4byte gUnk_080084BC _08078A68: .4byte gUnk_03003BE0 _08078A6C: .4byte gUnk_0811BFE0 @@ -293,7 +293,7 @@ _08078A88: sub_08078A90: @ 0x08078A90 push {lr} adds r1, r0, #0 - ldr r0, _08078AA4 @ =gLinkState + ldr r0, _08078AA4 @ =gPlayerState adds r2, r0, #0 adds r2, #0x8b ldrb r0, [r2] @@ -303,11 +303,11 @@ sub_08078A90: @ 0x08078A90 _08078AA2: pop {pc} .align 2, 0 -_08078AA4: .4byte gLinkState +_08078AA4: .4byte gPlayerState thumb_func_start sub_08078AA8 sub_08078AA8: @ 0x08078AA8 - ldr r3, _08078AB8 @ =gLinkState + ldr r3, _08078AB8 @ =gPlayerState movs r2, #0x16 strb r2, [r3, #0xc] ldr r2, _08078ABC @ =gScreenTransition @@ -316,13 +316,13 @@ sub_08078AA8: @ 0x08078AA8 strb r1, [r2] bx lr .align 2, 0 -_08078AB8: .4byte gLinkState +_08078AB8: .4byte gPlayerState _08078ABC: .4byte gScreenTransition thumb_func_start sub_08078AC0 sub_08078AC0: @ 0x08078AC0 push {r4, lr} - ldr r3, _08078AEC @ =gLinkState + ldr r3, _08078AEC @ =gPlayerState mov ip, r3 movs r3, #0xf mov r4, ip @@ -343,12 +343,12 @@ sub_08078AC0: @ 0x08078AC0 strb r0, [r1] pop {r4, pc} .align 2, 0 -_08078AEC: .4byte gLinkState +_08078AEC: .4byte gPlayerState thumb_func_start sub_08078AF0 sub_08078AF0: @ 0x08078AF0 push {r4, lr} - ldr r3, _08078B40 @ =gLinkState + ldr r3, _08078B40 @ =gPlayerState mov ip, r3 adds r3, #0x38 movs r4, #0 @@ -370,7 +370,7 @@ sub_08078AF0: @ 0x08078AF0 movs r1, #1 mov r3, ip strb r1, [r3, #0x14] - ldr r2, _08078B44 @ =gLinkEntity + ldr r2, _08078B44 @ =gPlayerEntity str r0, [r2, #0x54] ldrb r1, [r2, #0x10] movs r0, #0x7f @@ -386,13 +386,13 @@ sub_08078AF0: @ 0x08078AF0 bl sub_0807A108 pop {r4, pc} .align 2, 0 -_08078B40: .4byte gLinkState -_08078B44: .4byte gLinkEntity +_08078B40: .4byte gPlayerState +_08078B44: .4byte gPlayerEntity thumb_func_start sub_08078B48 sub_08078B48: @ 0x08078B48 push {lr} - ldr r1, _08078B80 @ =gLinkState + ldr r1, _08078B80 @ =gPlayerState ldrb r0, [r1, #7] movs r2, #0x80 orrs r0, r2 @@ -420,7 +420,7 @@ sub_08078B48: @ 0x08078B48 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08078B80: .4byte gLinkState +_08078B80: .4byte gPlayerState _08078B84: .4byte _08078B88 _08078B88: @ jump table .4byte _08078C04 @ case 0 @@ -462,7 +462,7 @@ _08078BF8: movs r0, #1 strb r0, [r2, #0x1a] _08078C04: - ldr r0, _08078C20 @ =gLinkEntity + ldr r0, _08078C20 @ =gPlayerEntity adds r0, #0x3d movs r1, #0xfe strb r1, [r0] @@ -474,12 +474,12 @@ _08078C04: .align 2, 0 _08078C18: .4byte 0xFFFBFFFF _08078C1C: .4byte gRoomVars -_08078C20: .4byte gLinkEntity +_08078C20: .4byte gPlayerEntity thumb_func_start sub_08078C24 sub_08078C24: @ 0x08078C24 push {lr} - ldr r3, _08078CAC @ =gLinkState + ldr r3, _08078CAC @ =gPlayerState movs r2, #0 strb r2, [r3] strb r2, [r3, #1] @@ -545,13 +545,13 @@ sub_08078C24: @ 0x08078C24 bl _DmaZero pop {pc} .align 2, 0 -_08078CAC: .4byte gLinkState +_08078CAC: .4byte gPlayerState _08078CB0: .4byte gUnk_03003DF0 thumb_func_start sub_08078CB4 sub_08078CB4: @ 0x08078CB4 push {lr} - ldr r0, _08078CCC @ =gLinkState + ldr r0, _08078CCC @ =gPlayerState ldrb r0, [r0, #5] subs r0, #3 lsls r0, r0, #0x18 @@ -562,7 +562,7 @@ sub_08078CB4: @ 0x08078CB4 _08078CC8: pop {pc} .align 2, 0 -_08078CCC: .4byte gLinkState +_08078CCC: .4byte gPlayerState thumb_func_start sub_08078CD0 sub_08078CD0: @ 0x08078CD0 @@ -587,7 +587,7 @@ sub_08078CD0: @ 0x08078CD0 adds r0, #0x38 strb r1, [r0] ldr r1, _08078D28 @ =gUnk_0811C01C - ldr r0, _08078D2C @ =gLinkState + ldr r0, _08078D2C @ =gPlayerState ldr r0, [r0, #0x2c] ldrb r0, [r0, #0x1e] adds r0, r0, r1 @@ -612,7 +612,7 @@ sub_08078CD0: @ 0x08078CD0 b _08078D3C .align 2, 0 _08078D28: .4byte gUnk_0811C01C -_08078D2C: .4byte gLinkState +_08078D2C: .4byte gPlayerState _08078D30: .4byte gUnk_0811C0B0 _08078D34: movs r0, #0 @@ -641,7 +641,7 @@ _08078D5E: thumb_func_start sub_08078D60 sub_08078D60: @ 0x08078D60 push {r4, r5, r6, lr} - ldr r1, _08078DCC @ =gLinkEntity + ldr r1, _08078DCC @ =gPlayerEntity ldr r0, [r1, #0x74] ldr r4, [r0, #0x54] ldrb r0, [r4, #0xc] @@ -696,7 +696,7 @@ _08078D72: adds r1, r2, #0 b _08078DE0 .align 2, 0 -_08078DCC: .4byte gLinkEntity +_08078DCC: .4byte gPlayerEntity _08078DD0: .4byte gUnk_0811C0E8 _08078DD4: adds r1, r1, r2 @@ -717,7 +717,7 @@ _08078DE0: adds r0, r5, #0 adds r1, r4, #0 bl ResolveEntityOnTop - ldr r0, _08078E34 @ =gLinkState + ldr r0, _08078E34 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #4 bne _08078E4C @@ -746,7 +746,7 @@ _08078DE0: beq _08078E44 b _08078E82 .align 2, 0 -_08078E34: .4byte gLinkState +_08078E34: .4byte gPlayerState _08078E38: .4byte gScreenTransition _08078E3C: ldrh r0, [r4, #0x2e] @@ -796,7 +796,7 @@ sub_08078E84: @ 0x08078E84 push {r4, r5, lr} adds r5, r0, #0 adds r4, r1, #0 - ldr r0, _08078ED0 @ =gLinkEntity + ldr r0, _08078ED0 @ =gPlayerEntity cmp r4, r0 bne _08078EAC adds r0, r5, #0 @@ -831,7 +831,7 @@ _08078EAC: bl sub_0806FEBC b _08078EE2 .align 2, 0 -_08078ED0: .4byte gLinkEntity +_08078ED0: .4byte gPlayerEntity _08078ED4: .4byte gUnk_080029B4 _08078ED8: adds r0, r4, #0 @@ -843,25 +843,25 @@ _08078EE2: thumb_func_start sub_08078EE4 sub_08078EE4: @ 0x08078EE4 - ldr r2, _08078EF4 @ =gLinkEntity - ldr r1, _08078EF8 @ =gLinkState + ldr r2, _08078EF4 @ =gPlayerEntity + ldr r1, _08078EF8 @ =gPlayerState ldrh r0, [r1, #0x16] strh r0, [r2, #0x2e] ldrh r0, [r1, #0x18] strh r0, [r2, #0x32] bx lr .align 2, 0 -_08078EF4: .4byte gLinkEntity -_08078EF8: .4byte gLinkState +_08078EF4: .4byte gPlayerEntity +_08078EF8: .4byte gPlayerState thumb_func_start sub_08078EFC sub_08078EFC: @ 0x08078EFC push {lr} - ldr r3, _08078F18 @ =gLinkState + ldr r3, _08078F18 @ =gPlayerState ldrb r2, [r3, #0xc] cmp r2, #0 beq _08078F20 - ldr r0, _08078F1C @ =gLinkEntity + ldr r0, _08078F1C @ =gPlayerEntity movs r1, #0 strb r2, [r0, #0xc] strb r1, [r0, #0xd] @@ -870,8 +870,8 @@ sub_08078EFC: @ 0x08078EFC movs r0, #1 b _08078F22 .align 2, 0 -_08078F18: .4byte gLinkState -_08078F1C: .4byte gLinkEntity +_08078F18: .4byte gPlayerState +_08078F1C: .4byte gPlayerEntity _08078F20: movs r0, #0 _08078F22: @@ -880,7 +880,7 @@ _08078F22: thumb_func_start sub_08078F24 sub_08078F24: @ 0x08078F24 push {r4, lr} - ldr r4, _08078F38 @ =gLinkState + ldr r4, _08078F38 @ =gPlayerState ldrb r3, [r4, #0xd] movs r0, #0x80 ands r0, r3 @@ -889,7 +889,7 @@ sub_08078F24: @ 0x08078F24 bl sub_08078F60 b _08078F5A .align 2, 0 -_08078F38: .4byte gLinkState +_08078F38: .4byte gPlayerState _08078F3C: ldr r2, _08078F5C @ =gSineTable lsls r0, r3, #4 @@ -913,7 +913,7 @@ _08078F5C: .4byte gSineTable thumb_func_start sub_08078F60 sub_08078F60: @ 0x08078F60 - ldr r0, _08078F70 @ =gLinkState + ldr r0, _08078F70 @ =gPlayerState adds r1, r0, #0 adds r1, #0x8c movs r2, #0 @@ -922,7 +922,7 @@ sub_08078F60: @ 0x08078F60 strh r2, [r0] bx lr .align 2, 0 -_08078F70: .4byte gLinkState +_08078F70: .4byte gPlayerState thumb_func_start sub_08078F74 sub_08078F74: @ 0x08078F74 @@ -932,7 +932,7 @@ sub_08078F74: @ 0x08078F74 ldrb r0, [r0, #0x18] cmp r0, #3 bne _08078FAC - ldr r3, _08078FA8 @ =gLinkState + ldr r3, _08078FA8 @ =gPlayerState adds r0, r3, #0 adds r0, #0x35 ldrb r0, [r0] @@ -951,7 +951,7 @@ sub_08078F74: @ 0x08078F74 b _08078FAE .align 2, 0 _08078FA4: .4byte gArea -_08078FA8: .4byte gLinkState +_08078FA8: .4byte gPlayerState _08078FAC: movs r0, #0 _08078FAE: @@ -961,7 +961,7 @@ _08078FAE: sub_08078FB0: @ 0x08078FB0 push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r5, _08078FE0 @ =gLinkState + ldr r5, _08078FE0 @ =gPlayerState ldrb r1, [r5, #6] movs r6, #0x80 adds r0, r6, #0 @@ -983,7 +983,7 @@ _08078FCA: movs r2, #0x58 b _08078FFA .align 2, 0 -_08078FE0: .4byte gLinkState +_08078FE0: .4byte gPlayerState _08078FE4: ands r1, r6 cmp r1, #0 @@ -998,7 +998,7 @@ _08078FEE: bne _08078FFA movs r2, #0x34 _08078FFA: - ldr r0, _08079014 @ =gLinkState + ldr r0, _08079014 @ =gPlayerState adds r3, r0, #0 ldrb r1, [r0, #8] cmp r2, r1 @@ -1012,7 +1012,7 @@ _08078FFA: orrs r0, r1 b _08079020 .align 2, 0 -_08079014: .4byte gLinkState +_08079014: .4byte gPlayerState _08079018: ldrb r1, [r4, #0x18] movs r0, #0x41 @@ -1061,7 +1061,7 @@ _08079062: sub_08079064: @ 0x08079064 push {r4, r5, r6, lr} adds r6, r0, #0 - ldr r0, _0807909C @ =gLinkState + ldr r0, _0807909C @ =gPlayerState ldr r1, [r0, #0x30] ldr r2, _080790A0 @ =0x00100080 ands r1, r2 @@ -1089,7 +1089,7 @@ _08079086: strh r4, [r2, #8] b _080790DE .align 2, 0 -_0807909C: .4byte gLinkState +_0807909C: .4byte gPlayerState _080790A0: .4byte 0x00100080 _080790A4: .4byte gUnk_03000B80 _080790A8: @@ -1130,7 +1130,7 @@ _080790E0: .4byte 0x00000404 sub_080790E4: @ 0x080790E4 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08079128 @ =gLinkState + ldr r5, _08079128 @ =gPlayerState ldrb r0, [r5, #0xb] cmp r0, #0 bne _08079182 @@ -1159,7 +1159,7 @@ sub_080790E4: @ 0x080790E4 bl PlaySFX b _08079182 .align 2, 0 -_08079128: .4byte gLinkState +_08079128: .4byte gPlayerState _0807912C: ldrb r1, [r5, #6] movs r0, #0x80 @@ -1183,7 +1183,7 @@ _08079150: subs r0, r1, #1 strb r0, [r5, #6] _08079154: - ldr r2, _08079174 @ =gLinkState + ldr r2, _08079174 @ =gPlayerState ldrb r0, [r4, #0x14] adds r1, r2, #0 adds r1, #0x35 @@ -1199,7 +1199,7 @@ _08079154: ldr r0, _08079178 @ =0x0000093C b _08079180 .align 2, 0 -_08079174: .4byte gLinkState +_08079174: .4byte gPlayerState _08079178: .4byte 0x0000093C _0807917C: movs r0, #0xcf @@ -1211,21 +1211,21 @@ _08079182: thumb_func_start sub_08079184 sub_08079184: @ 0x08079184 - ldr r0, _08079194 @ =gLinkState + ldr r0, _08079194 @ =gPlayerState movs r1, #0 strb r1, [r0, #5] strb r1, [r0, #1] - ldr r0, _08079198 @ =gLinkEntity + ldr r0, _08079198 @ =gPlayerEntity str r1, [r0, #0x74] bx lr .align 2, 0 -_08079194: .4byte gLinkState -_08079198: .4byte gLinkEntity +_08079194: .4byte gPlayerState +_08079198: .4byte gPlayerEntity thumb_func_start sub_0807919C sub_0807919C: @ 0x0807919C push {lr} - ldr r0, _080791B0 @ =gLinkState + ldr r0, _080791B0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -1234,7 +1234,7 @@ sub_0807919C: @ 0x0807919C bl sub_080791BC b _080791B8 .align 2, 0 -_080791B0: .4byte gLinkState +_080791B0: .4byte gPlayerState _080791B4: bl sub_08079258 _080791B8: @@ -1243,7 +1243,7 @@ _080791B8: thumb_func_start sub_080791BC sub_080791BC: @ 0x080791BC - ldr r0, _080791CC @ =gLinkEntity + ldr r0, _080791CC @ =gPlayerEntity movs r2, #0 movs r1, #1 strb r1, [r0, #0xc] @@ -1251,18 +1251,18 @@ sub_080791BC: @ 0x080791BC strb r2, [r0, #0xf] bx lr .align 2, 0 -_080791CC: .4byte gLinkEntity +_080791CC: .4byte gPlayerEntity thumb_func_start sub_080791D0 sub_080791D0: @ 0x080791D0 push {lr} - ldr r3, _0807920C @ =gLinkState + ldr r3, _0807920C @ =gPlayerState ldr r0, [r3, #0x30] movs r1, #0x40 ands r0, r1 cmp r0, #0 bne _080791E8 - ldr r0, _08079210 @ =gLinkEntity + ldr r0, _08079210 @ =gPlayerEntity ldrb r1, [r0, #0x18] movs r2, #3 orrs r1, r2 @@ -1273,7 +1273,7 @@ _080791E8: ands r0, r1 cmp r0, #0 bne _08079214 - ldr r2, _08079210 @ =gLinkEntity + ldr r2, _08079210 @ =gPlayerEntity adds r2, #0x29 ldrb r1, [r2] movs r0, #0x39 @@ -1285,8 +1285,8 @@ _080791E8: bl sub_0807921C b _08079218 .align 2, 0 -_0807920C: .4byte gLinkState -_08079210: .4byte gLinkEntity +_0807920C: .4byte gPlayerState +_08079210: .4byte gPlayerEntity _08079214: bl sub_08079258 _08079218: @@ -1296,7 +1296,7 @@ _08079218: thumb_func_start sub_0807921C sub_0807921C: @ 0x0807921C push {r4, lr} - ldr r4, _0807924C @ =gLinkEntity + ldr r4, _0807924C @ =gPlayerEntity ldrb r1, [r4, #0x10] movs r0, #0x80 orrs r0, r1 @@ -1305,7 +1305,7 @@ sub_0807921C: @ 0x0807921C movs r1, #3 orrs r0, r1 strb r0, [r4, #0x18] - ldr r2, _08079250 @ =gLinkState + ldr r2, _08079250 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _08079254 @ =0xFECBF6FA ands r0, r1 @@ -1316,18 +1316,18 @@ sub_0807921C: @ 0x0807921C bl sub_0805E374 pop {r4, pc} .align 2, 0 -_0807924C: .4byte gLinkEntity -_08079250: .4byte gLinkState +_0807924C: .4byte gPlayerEntity +_08079250: .4byte gPlayerState _08079254: .4byte 0xFECBF6FA thumb_func_start sub_08079258 sub_08079258: @ 0x08079258 push {r4, lr} - ldr r4, _080792AC @ =gLinkState + ldr r4, _080792AC @ =gPlayerState ldr r0, [r4, #0x30] movs r1, #0x40 ands r0, r1 - ldr r3, _080792B0 @ =gLinkEntity + ldr r3, _080792B0 @ =gPlayerEntity cmp r0, #0 bne _08079278 ldrb r1, [r3, #0x10] @@ -1364,31 +1364,31 @@ _08079278: bl sub_0805E374 pop {r4, pc} .align 2, 0 -_080792AC: .4byte gLinkState -_080792B0: .4byte gLinkEntity +_080792AC: .4byte gPlayerState +_080792B0: .4byte gPlayerEntity _080792B4: .4byte 0x00000C18 _080792B8: .4byte 0xFECFFEFA thumb_func_start sub_080792BC sub_080792BC: @ 0x080792BC push {r4, lr} - ldr r3, _080792D0 @ =gLinkState + ldr r3, _080792D0 @ =gPlayerState movs r4, #0x13 strb r4, [r3, #0xc] adds r3, #0x38 strb r2, [r3] - ldr r2, _080792D4 @ =gLinkEntity + ldr r2, _080792D4 @ =gPlayerEntity strh r0, [r2, #0x24] strb r1, [r2, #0x15] pop {r4, pc} .align 2, 0 -_080792D0: .4byte gLinkState -_080792D4: .4byte gLinkEntity +_080792D0: .4byte gPlayerState +_080792D4: .4byte gPlayerEntity thumb_func_start sub_080792D8 sub_080792D8: @ 0x080792D8 push {r4, r5, r6, lr} - ldr r5, _08079344 @ =gLinkEntity + ldr r5, _08079344 @ =gPlayerEntity adds r3, r5, #0 adds r3, #0x42 ldrb r0, [r3] @@ -1397,7 +1397,7 @@ sub_080792D8: @ 0x080792D8 ldrb r2, [r5, #0xc] cmp r2, #0xb beq _08079338 - ldr r0, _08079348 @ =gLinkState + ldr r0, _08079348 @ =gPlayerState ldrb r1, [r0, #0x1e] adds r6, r0, #0 cmp r1, #0 @@ -1442,8 +1442,8 @@ _08079338: strb r0, [r1] b _080793E0 .align 2, 0 -_08079344: .4byte gLinkEntity -_08079348: .4byte gLinkState +_08079344: .4byte gPlayerEntity +_08079348: .4byte gPlayerState _0807934C: cmp r2, #0x1d bne _0807935E @@ -1497,7 +1497,7 @@ _08079374: ldrb r0, [r4, #2] cmp r0, #0 bne _080793CA - bl ResetLink + bl ResetPlayer ldr r0, [r4, #0x30] movs r1, #8 ands r0, r1 @@ -1529,23 +1529,23 @@ _080793E0: sub_080793E4: @ 0x080793E4 push {r4, r5, lr} adds r5, r0, #0 - ldr r0, _080793FC @ =gLinkState + ldr r0, _080793FC @ =gPlayerState adds r0, #0x26 ldrb r0, [r0] cmp r0, #0 bne _08079408 ldr r1, _08079400 @ =gUnk_0811C0F8 - ldr r0, _08079404 @ =gLinkEntity + ldr r0, _08079404 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 b _08079410 .align 2, 0 -_080793FC: .4byte gLinkState +_080793FC: .4byte gPlayerState _08079400: .4byte gUnk_0811C0F8 -_08079404: .4byte gLinkEntity +_08079404: .4byte gPlayerEntity _08079408: ldr r1, _08079448 @ =gUnk_0811C0F8 - ldr r0, _0807944C @ =gLinkEntity + ldr r0, _0807944C @ =gPlayerEntity ldrb r0, [r0, #0x15] lsrs r0, r0, #2 _08079410: @@ -1555,7 +1555,7 @@ _08079410: bl sub_08079778 cmp r0, #0 beq _08079454 - ldr r0, _08079450 @ =gLinkState + ldr r0, _08079450 @ =gPlayerState adds r0, #0x90 ldrh r0, [r0] ands r0, r4 @@ -1564,7 +1564,7 @@ _08079410: cmp r5, #0 beq _08079442 bl sub_0807A500 - ldr r1, _0807944C @ =gLinkEntity + ldr r1, _0807944C @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] adds r2, r5, #0 @@ -1576,8 +1576,8 @@ _08079442: b _08079456 .align 2, 0 _08079448: .4byte gUnk_0811C0F8 -_0807944C: .4byte gLinkEntity -_08079450: .4byte gLinkState +_0807944C: .4byte gPlayerEntity +_08079450: .4byte gPlayerState _08079454: movs r0, #0 _08079456: @@ -1586,7 +1586,7 @@ _08079456: thumb_func_start sub_08079458 sub_08079458: @ 0x08079458 push {r4, r5, lr} - ldr r4, _08079498 @ =gLinkEntity + ldr r4, _08079498 @ =gPlayerEntity movs r1, #0 movs r0, #0x19 strb r0, [r4, #0xc] @@ -1596,7 +1596,7 @@ sub_08079458: @ 0x08079458 adds r0, #0x42 strb r1, [r0] bl sub_08078EE4 - ldr r2, _0807949C @ =gLinkState + ldr r2, _0807949C @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #0x80 lsls r0, r0, #0xa @@ -1617,10 +1617,10 @@ sub_08079458: @ 0x08079458 strh r0, [r4, #0x32] b _08079514 .align 2, 0 -_08079498: .4byte gLinkEntity -_0807949C: .4byte gLinkState +_08079498: .4byte gPlayerEntity +_0807949C: .4byte gPlayerState _080794A0: - ldr r2, _080794DC @ =gLinkEntity + ldr r2, _080794DC @ =gPlayerEntity ldr r0, [r4] lsrs r0, r0, #0x1e adds r1, r2, #0 @@ -1650,7 +1650,7 @@ _080794A0: strb r0, [r2, #0x10] b _08079514 .align 2, 0 -_080794DC: .4byte gLinkEntity +_080794DC: .4byte gPlayerEntity _080794E0: .4byte gRoomControls _080794E4: movs r5, #0 @@ -1678,17 +1678,17 @@ _080794F4: cmp r1, r0 bne _080794F4 _08079514: - ldr r0, _0807951C @ =gLinkEntity + ldr r0, _0807951C @ =gPlayerEntity bl UpdateSpriteForCollisionLayer pop {r4, r5, pc} .align 2, 0 -_0807951C: .4byte gLinkEntity +_0807951C: .4byte gPlayerEntity thumb_func_start sub_08079520 sub_08079520: @ 0x08079520 push {lr} adds r1, r0, #0 - ldr r0, _08079538 @ =gLinkState + ldr r0, _08079538 @ =gPlayerState ldrb r0, [r0, #0xd] cmp r0, #0x7f ble _08079532 @@ -1699,19 +1699,19 @@ _08079532: strb r0, [r1, #0x15] pop {pc} .align 2, 0 -_08079538: .4byte gLinkState +_08079538: .4byte gPlayerState thumb_func_start sub_0807953C sub_0807953C: @ 0x0807953C ldr r1, _08079548 @ =0x00000F38 - ldr r0, _0807954C @ =gLinkState + ldr r0, _0807954C @ =gPlayerState adds r0, #0x92 ldrh r0, [r0] ands r0, r1 bx lr .align 2, 0 _08079548: .4byte 0x00000F38 -_0807954C: .4byte gLinkState +_0807954C: .4byte gPlayerState thumb_func_start sub_08079550 sub_08079550: @ 0x08079550 @@ -1725,7 +1725,7 @@ sub_08079550: @ 0x08079550 beq _08079562 b _080796FC _08079562: - ldr r2, _080795AC @ =gLinkState + ldr r2, _080795AC @ =gPlayerState ldrb r0, [r2, #0x1e] cmp r0, #0 beq _08079576 @@ -1739,7 +1739,7 @@ _08079576: adds r0, r2, #0 adds r0, #0x26 ldrb r0, [r0] - ldr r1, _080795B0 @ =gLinkEntity + ldr r1, _080795B0 @ =gPlayerEntity mov r8, r1 cmp r0, #0 bne _080795A0 @@ -1764,15 +1764,15 @@ _080795A0: b _080796FE .align 2, 0 _080795A8: .4byte gUnk_03004030 -_080795AC: .4byte gLinkState -_080795B0: .4byte gLinkEntity +_080795AC: .4byte gPlayerState +_080795B0: .4byte gPlayerEntity _080795B4: bl sub_08079778 cmp r0, #0 bne _080795BE b _080796FC _080795BE: - ldr r3, _08079610 @ =gLinkEntity + ldr r3, _08079610 @ =gPlayerEntity ldrb r2, [r3, #0x14] movs r0, #6 ands r0, r2 @@ -1814,7 +1814,7 @@ _080795BE: orrs r4, r2 b _0807965E .align 2, 0 -_08079610: .4byte gLinkEntity +_08079610: .4byte gPlayerEntity _08079614: .4byte gUnk_0811C100 _08079618: .4byte gRoomControls _0807961C: @@ -1885,7 +1885,7 @@ _0807965E: adds r3, r0, #0 cmp r3, #0 beq _080796FC - ldr r1, _080796F4 @ =gLinkState + ldr r1, _080796F4 @ =gPlayerState ldrb r2, [r1, #6] movs r0, #0x80 orrs r0, r2 @@ -1902,7 +1902,7 @@ _0807965E: cmp r0, #5 bls _080796FC _080796C8: - ldr r0, _080796F8 @ =gLinkEntity + ldr r0, _080796F8 @ =gPlayerEntity subs r1, r3, #1 movs r2, #0 strb r1, [r0, #0x14] @@ -1921,8 +1921,8 @@ _080796C8: .align 2, 0 _080796EC: .4byte gRoomControls _080796F0: .4byte gUnk_0811C1E8 -_080796F4: .4byte gLinkState -_080796F8: .4byte gLinkEntity +_080796F4: .4byte gPlayerState +_080796F8: .4byte gPlayerEntity _080796FC: movs r0, #0 _080796FE: @@ -1935,7 +1935,7 @@ _080796FE: thumb_func_start sub_08079708 sub_08079708: @ 0x08079708 push {r4, lr} - ldr r4, _08079740 @ =gLinkState + ldr r4, _08079740 @ =gPlayerState adds r2, r4, #0 adds r2, #0xa8 movs r3, #0 @@ -1962,7 +1962,7 @@ sub_08079708: @ 0x08079708 _0807973E: pop {r4, pc} .align 2, 0 -_08079740: .4byte gLinkState +_08079740: .4byte gPlayerState thumb_func_start sub_08079744 sub_08079744: @ 0x08079744 @@ -2002,23 +2002,23 @@ _08079774: thumb_func_start sub_08079778 sub_08079778: @ 0x08079778 push {lr} - ldr r0, _08079790 @ =gLinkState + ldr r0, _08079790 @ =gPlayerState adds r0, #0x26 ldrb r0, [r0] cmp r0, #0 bne _0807979C ldr r2, _08079794 @ =gUnk_0811C108 - ldr r1, _08079798 @ =gLinkEntity + ldr r1, _08079798 @ =gPlayerEntity ldrb r0, [r1, #0x14] lsrs r0, r0, #1 b _080797A4 .align 2, 0 -_08079790: .4byte gLinkState +_08079790: .4byte gPlayerState _08079794: .4byte gUnk_0811C108 -_08079798: .4byte gLinkEntity +_08079798: .4byte gPlayerEntity _0807979C: ldr r2, _080797BC @ =gUnk_0811C108 - ldr r1, _080797C0 @ =gLinkEntity + ldr r1, _080797C0 @ =gPlayerEntity ldrb r0, [r1, #0x15] lsrs r0, r0, #2 _080797A4: @@ -2036,13 +2036,13 @@ _080797B6: pop {pc} .align 2, 0 _080797BC: .4byte gUnk_0811C108 -_080797C0: .4byte gLinkEntity +_080797C0: .4byte gPlayerEntity thumb_func_start sub_080797C4 sub_080797C4: @ 0x080797C4 push {lr} ldr r1, _080797E4 @ =gUnk_0811C110 - ldr r2, _080797E8 @ =gLinkEntity + ldr r2, _080797E8 @ =gPlayerEntity ldrb r0, [r2, #0x15] lsrs r0, r0, #3 lsls r0, r0, #1 @@ -2059,12 +2059,12 @@ _080797E0: pop {pc} .align 2, 0 _080797E4: .4byte gUnk_0811C110 -_080797E8: .4byte gLinkEntity +_080797E8: .4byte gPlayerEntity thumb_func_start sub_080797EC sub_080797EC: @ 0x080797EC push {r4, r5, lr} - ldr r4, _08079804 @ =gLinkState + ldr r4, _08079804 @ =gPlayerState ldr r1, [r4, #0x30] movs r0, #8 ands r0, r1 @@ -2076,7 +2076,7 @@ sub_080797EC: @ 0x080797EC ldr r5, _08079808 @ =0x00000934 b _0807991E .align 2, 0 -_08079804: .4byte gLinkState +_08079804: .4byte gPlayerState _08079808: .4byte 0x00000934 _0807980C: ldrb r0, [r4, #3] @@ -2192,7 +2192,7 @@ _080798CE: cmp r0, #0 beq _0807991E bl sub_0807A500 - ldr r1, _080798F8 @ =gLinkEntity + ldr r1, _080798F8 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] bl sub_080002E0 @@ -2206,7 +2206,7 @@ _080798CE: lsls r5, r5, #1 b _0807991E .align 2, 0 -_080798F8: .4byte gLinkEntity +_080798F8: .4byte gPlayerEntity _080798FC: adds r1, r4, #0 adds r1, #0xa8 @@ -2227,23 +2227,23 @@ _0807990A: movs r5, #0xc1 lsls r5, r5, #3 _0807991E: - ldr r0, _08079930 @ =gLinkState + ldr r0, _08079930 @ =gPlayerState strh r5, [r0, #8] ldrb r0, [r0, #3] cmp r0, #0 bne _0807992E - ldr r0, _08079934 @ =gLinkEntity + ldr r0, _08079934 @ =gPlayerEntity bl UpdateAnimationSingleFrame _0807992E: pop {r4, r5, pc} .align 2, 0 -_08079930: .4byte gLinkState -_08079934: .4byte gLinkEntity +_08079930: .4byte gPlayerState +_08079934: .4byte gPlayerEntity thumb_func_start sub_08079938 sub_08079938: @ 0x08079938 push {r4, lr} - ldr r3, _08079954 @ =gLinkState + ldr r3, _08079954 @ =gPlayerState ldr r2, [r3, #0x30] movs r0, #8 ands r0, r2 @@ -2256,7 +2256,7 @@ sub_08079938: @ 0x08079938 ldr r4, _08079958 @ =0x0000092C b _08079AD8 .align 2, 0 -_08079954: .4byte gLinkState +_08079954: .4byte gPlayerState _08079958: .4byte 0x0000092C _0807995C: mov r0, ip @@ -2497,22 +2497,22 @@ _08079AF0: ldrb r3, [r2] cmp r0, r3 bne _08079B10 - ldr r0, _08079B1C @ =gLinkEntity + ldr r0, _08079B1C @ =gPlayerEntity bl UpdateAnimationSingleFrame _08079B10: - ldr r0, _08079B20 @ =gLinkState + ldr r0, _08079B20 @ =gPlayerState strb r4, [r0] _08079B14: pop {r4, pc} .align 2, 0 _08079B18: .4byte gUnk_03000B80 -_08079B1C: .4byte gLinkEntity -_08079B20: .4byte gLinkState +_08079B1C: .4byte gPlayerEntity +_08079B20: .4byte gPlayerState thumb_func_start sub_08079B24 sub_08079B24: @ 0x08079B24 push {r4, r5, lr} - ldr r2, _08079B60 @ =gLinkEntity + ldr r2, _08079B60 @ =gPlayerEntity ldrb r0, [r2, #0xc] cmp r0, #0xa beq _08079BD4 @@ -2521,7 +2521,7 @@ sub_08079B24: @ 0x08079B24 ldrb r3, [r0] cmp r3, #0 bne _08079BD4 - ldr r4, _08079B64 @ =gLinkState + ldr r4, _08079B64 @ =gPlayerState ldr r1, [r4, #0x30] ldr r0, _08079B68 @ =0xFEFFFFFF ands r1, r0 @@ -2540,8 +2540,8 @@ sub_08079B24: @ 0x08079B24 bl sub_08079458 b _08079BC0 .align 2, 0 -_08079B60: .4byte gLinkEntity -_08079B64: .4byte gLinkState +_08079B60: .4byte gPlayerEntity +_08079B64: .4byte gPlayerState _08079B68: .4byte 0xFEFFFFFF _08079B6C: ldrb r0, [r4, #0x14] @@ -2588,7 +2588,7 @@ _08079BA6: strb r0, [r4, #0xa] b _08079BD4 _08079BC0: - ldr r2, _08079BD0 @ =gLinkEntity + ldr r2, _08079BD0 @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x7f ands r0, r1 @@ -2596,7 +2596,7 @@ _08079BC0: movs r0, #0 b _08079BD6 .align 2, 0 -_08079BD0: .4byte gLinkEntity +_08079BD0: .4byte gPlayerEntity _08079BD4: movs r0, #1 _08079BD6: @@ -2605,7 +2605,7 @@ _08079BD6: thumb_func_start sub_08079BD8 sub_08079BD8: @ 0x08079BD8 push {r4, r5, lr} - ldr r4, _08079C2C @ =gLinkEntity + ldr r4, _08079C2C @ =gPlayerEntity ldr r1, [r4, #0x2c] str r1, [r0, #0x2c] ldr r1, [r4, #0x30] @@ -2647,7 +2647,7 @@ sub_08079BD8: @ 0x08079BD8 strb r1, [r0] pop {r4, r5, pc} .align 2, 0 -_08079C2C: .4byte gLinkEntity +_08079C2C: .4byte gPlayerEntity thumb_func_start sub_08079C30 sub_08079C30: @ 0x08079C30 @@ -2655,7 +2655,7 @@ sub_08079C30: @ 0x08079C30 mov r7, r8 push {r7} adds r6, r0, #0 - ldr r0, _08079C68 @ =gLinkState + ldr r0, _08079C68 @ =gPlayerState ldrb r1, [r0, #0x14] adds r7, r0, #0 cmp r1, #0 @@ -2681,7 +2681,7 @@ _08079C44: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08079C68: .4byte gLinkState +_08079C68: .4byte gPlayerState _08079C6C: .4byte _08079C70 _08079C70: @ jump table .4byte _08079D36 @ case 0 @@ -2763,7 +2763,7 @@ _08079D42: thumb_func_start sub_08079D48 sub_08079D48: @ 0x08079D48 push {r4, lr} - ldr r4, _08079D78 @ =gLinkEntity + ldr r4, _08079D78 @ =gPlayerEntity adds r0, r4, #0 bl sub_08079C30 cmp r0, #0 @@ -2783,7 +2783,7 @@ _08079D72: movs r0, #1 b _08079D82 .align 2, 0 -_08079D78: .4byte gLinkEntity +_08079D78: .4byte gPlayerEntity _08079D7C: .4byte gUnk_0811C268 _08079D80: movs r0, #0 @@ -2793,14 +2793,14 @@ _08079D82: thumb_func_start sub_08079D84 sub_08079D84: @ 0x08079D84 push {lr} - ldr r3, _08079DC0 @ =gLinkEntity + ldr r3, _08079DC0 @ =gPlayerEntity ldrb r0, [r3, #0xc] cmp r0, #1 beq _08079D92 cmp r0, #0x18 bne _08079DBE _08079D92: - ldr r2, _08079DC4 @ =gLinkState + ldr r2, _08079DC4 @ =gPlayerState adds r1, r2, #0 adds r1, #0x38 movs r0, #0x9c @@ -2823,18 +2823,18 @@ _08079D92: _08079DBE: pop {pc} .align 2, 0 -_08079DC0: .4byte gLinkEntity -_08079DC4: .4byte gLinkState +_08079DC0: .4byte gPlayerEntity +_08079DC4: .4byte gPlayerState _08079DC8: .4byte 0x00000193 thumb_func_start sub_08079DCC sub_08079DCC: @ 0x08079DCC push {lr} - ldr r0, _08079DFC @ =gLinkEntity + ldr r0, _08079DFC @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #1 bne _08079DF8 - ldr r3, _08079E00 @ =gLinkState + ldr r3, _08079E00 @ =gPlayerState adds r1, r3, #0 adds r1, #0x38 movs r2, #0 @@ -2853,21 +2853,21 @@ sub_08079DCC: @ 0x08079DCC _08079DF8: pop {pc} .align 2, 0 -_08079DFC: .4byte gLinkEntity -_08079E00: .4byte gLinkState +_08079DFC: .4byte gPlayerEntity +_08079E00: .4byte gPlayerState _08079E04: .4byte 0x00000193 thumb_func_start sub_08079E08 sub_08079E08: @ 0x08079E08 push {r4, lr} - ldr r0, _08079E50 @ =gLinkEntity + ldr r0, _08079E50 @ =gPlayerEntity ldrh r2, [r0, #0x24] movs r3, #0x24 ldrsh r1, [r0, r3] adds r4, r0, #0 cmp r1, #0 beq _08079E2E - ldr r0, _08079E54 @ =gLinkState + ldr r0, _08079E54 @ =gPlayerState adds r0, #0x80 ldrh r0, [r0] adds r0, r2, r0 @@ -2894,15 +2894,15 @@ _08079E40: bl sub_0807A5B8 pop {r4, pc} .align 2, 0 -_08079E50: .4byte gLinkEntity -_08079E54: .4byte gLinkState +_08079E50: .4byte gPlayerEntity +_08079E54: .4byte gPlayerState thumb_func_start sub_08079E58 sub_08079E58: @ 0x08079E58 push {r4, r5, r6, lr} adds r6, r0, #0 adds r4, r1, #0 - ldr r5, _08079E8C @ =gLinkEntity + ldr r5, _08079E8C @ =gPlayerEntity ldrb r1, [r5, #0x15] movs r0, #4 ands r0, r1 @@ -2923,7 +2923,7 @@ _08079E70: bl sub_0807A5B8 pop {r4, r5, r6, pc} .align 2, 0 -_08079E8C: .4byte gLinkEntity +_08079E8C: .4byte gPlayerEntity thumb_func_start sub_08079E90 sub_08079E90: @ 0x08079E90 @@ -2932,7 +2932,7 @@ sub_08079E90: @ 0x08079E90 mov r6, r8 push {r6, r7} mov sb, r0 - ldr r1, _08079EBC @ =gLinkEntity + ldr r1, _08079EBC @ =gPlayerEntity ldrb r2, [r1, #0x15] movs r0, #8 ands r0, r2 @@ -2950,7 +2950,7 @@ sub_08079E90: @ 0x08079E90 lsrs r5, r0, #0x10 b _08079EC4 .align 2, 0 -_08079EBC: .4byte gLinkEntity +_08079EBC: .4byte gPlayerEntity _08079EC0: ldr r0, [r7, #0x48] ldrb r5, [r0, #2] @@ -3000,7 +3000,7 @@ _08079F10: lsls r0, r0, #0x10 lsrs r5, r0, #0x10 _08079F18: - ldr r0, _08079F38 @ =gLinkEntity + ldr r0, _08079F38 @ =gPlayerEntity lsls r1, r5, #0x10 asrs r1, r1, #0x10 lsls r2, r4, #0x10 @@ -3014,7 +3014,7 @@ _08079F18: movs r0, #0 b _08079F3E .align 2, 0 -_08079F38: .4byte gLinkEntity +_08079F38: .4byte gPlayerEntity _08079F3C: movs r0, #1 _08079F3E: @@ -3033,13 +3033,13 @@ sub_08079F48: @ 0x08079F48 ldrb r0, [r0] cmp r0, r1 bne _08079F68 - ldr r0, _08079F64 @ =gLinkEntity + ldr r0, _08079F64 @ =gPlayerEntity ldrb r1, [r0, #0x15] adds r1, #4 b _08079F7C .align 2, 0 _08079F60: .4byte gUnk_0811C118 -_08079F64: .4byte gLinkEntity +_08079F64: .4byte gPlayerEntity _08079F68: adds r0, r2, #1 adds r0, r0, r3 @@ -3049,7 +3049,7 @@ _08079F68: movs r0, #0 b _08079F84 _08079F76: - ldr r0, _08079F88 @ =gLinkEntity + ldr r0, _08079F88 @ =gPlayerEntity ldrb r1, [r0, #0x15] subs r1, #4 _08079F7C: @@ -3060,12 +3060,12 @@ _08079F7C: _08079F84: pop {pc} .align 2, 0 -_08079F88: .4byte gLinkEntity +_08079F88: .4byte gPlayerEntity thumb_func_start sub_08079F8C sub_08079F8C: @ 0x08079F8C push {lr} - ldr r2, _08079FB4 @ =gLinkState + ldr r2, _08079FB4 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _08079FB8 @ =0x22189B75 ands r0, r1 @@ -3076,7 +3076,7 @@ sub_08079F8C: @ 0x08079F8C ldrb r0, [r0] cmp r0, #0 bne _08079FB0 - ldr r0, _08079FBC @ =gLinkEntity + ldr r0, _08079FBC @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #3 beq _08079FB0 @@ -3086,9 +3086,9 @@ _08079FB0: movs r0, #0 b _08079FC2 .align 2, 0 -_08079FB4: .4byte gLinkState +_08079FB4: .4byte gPlayerState _08079FB8: .4byte 0x22189B75 -_08079FBC: .4byte gLinkEntity +_08079FBC: .4byte gPlayerEntity _08079FC0: movs r0, #1 _08079FC2: @@ -3098,11 +3098,11 @@ _08079FC2: sub_08079FC4: @ 0x08079FC4 push {lr} adds r1, r0, #0 - ldr r0, _08079FD0 @ =gLinkEntity + ldr r0, _08079FD0 @ =gPlayerEntity bl sub_08079FD4 pop {pc} .align 2, 0 -_08079FD0: .4byte gLinkEntity +_08079FD0: .4byte gPlayerEntity thumb_func_start sub_08079FD4 sub_08079FD4: @ 0x08079FD4 @@ -3173,7 +3173,7 @@ _0807A04C: .4byte gUnk_080082DC thumb_func_start sub_0807A050 sub_0807A050: @ 0x0807A050 push {lr} - ldr r3, _0807A088 @ =gLinkState + ldr r3, _0807A088 @ =gPlayerState ldrb r2, [r3, #0xf] cmp r2, #0 beq _0807A06A @@ -3189,27 +3189,27 @@ _0807A06A: movs r0, #0 bl sub_0807A094 adds r1, r0, #0 - ldr r0, _0807A088 @ =gLinkState + ldr r0, _0807A088 @ =gPlayerState adds r0, #0x83 ldrb r2, [r0] cmp r1, r2 beq _0807A084 strb r1, [r0] - ldr r0, _0807A090 @ =gLinkEntity + ldr r0, _0807A090 @ =gPlayerEntity bl sub_0801D2B4 _0807A084: pop {pc} .align 2, 0 -_0807A088: .4byte gLinkState +_0807A088: .4byte gPlayerState _0807A08C: .4byte gTextBox -_0807A090: .4byte gLinkEntity +_0807A090: .4byte gPlayerEntity thumb_func_start sub_0807A094 sub_0807A094: @ 0x0807A094 push {r4, r5, lr} adds r3, r0, #0 movs r2, #0x16 - ldr r0, _0807A0AC @ =gLinkState + ldr r0, _0807A0AC @ =gPlayerState ldrb r0, [r0, #0xf] cmp r0, #0 beq _0807A0B0 @@ -3219,7 +3219,7 @@ sub_0807A094: @ 0x0807A094 movs r2, #0x1a b _0807A104 .align 2, 0 -_0807A0AC: .4byte gLinkState +_0807A0AC: .4byte gPlayerState _0807A0B0: ldr r0, _0807A0F0 @ =gUnk_02002A40 adds r1, r0, #0 @@ -3279,12 +3279,12 @@ sub_0807A108: @ 0x0807A108 str r0, [r1] str r0, [r1, #4] str r0, [r1, #8] - ldr r2, _0807A14C @ =gLinkState + ldr r2, _0807A14C @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _0807A150 @ =0xFFBFFFFF ands r0, r1 str r0, [r2, #0x30] - ldr r0, _0807A154 @ =gLinkEntity + ldr r0, _0807A154 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0x17 bne _0807A130 @@ -3308,9 +3308,9 @@ _0807A144: pop {pc} .align 2, 0 _0807A148: .4byte gUnk_03004040 -_0807A14C: .4byte gLinkState +_0807A14C: .4byte gPlayerState _0807A150: .4byte 0xFFBFFFFF -_0807A154: .4byte gLinkEntity +_0807A154: .4byte gPlayerEntity thumb_func_start sub_0807A158 sub_0807A158: @ 0x0807A158 @@ -3366,12 +3366,12 @@ _0807A1B4: .4byte 0xFFFC0000 thumb_func_start sub_0807A1B8 sub_0807A1B8: @ 0x0807A1B8 push {r4, lr} - ldr r4, _0807A1DC @ =gLinkEntity + ldr r4, _0807A1DC @ =gPlayerEntity adds r0, r4, #0 movs r1, #0 movs r2, #0 bl sub_0807A1E8 - ldr r1, _0807A1E0 @ =gLinkState + ldr r1, _0807A1E0 @ =gPlayerState strb r0, [r1, #0x12] ldr r2, _0807A1E4 @ =gUnk_0811C120 ldrb r0, [r1, #0x12] @@ -3382,8 +3382,8 @@ sub_0807A1B8: @ 0x0807A1B8 bl _call_via_r1 pop {r4, pc} .align 2, 0 -_0807A1DC: .4byte gLinkEntity -_0807A1E0: .4byte gLinkState +_0807A1DC: .4byte gPlayerEntity +_0807A1E0: .4byte gPlayerState _0807A1E4: .4byte gUnk_0811C120 thumb_func_start sub_0807A1E8 @@ -3412,12 +3412,12 @@ sub_0807A1E8: @ 0x0807A1E8 ands r2, r3 lsls r2, r2, #6 orrs r4, r2 - ldr r2, _0807A28C @ =gLinkEntity + ldr r2, _0807A28C @ =gPlayerEntity adds r2, #0x38 ldrb r2, [r2] bl GetTileTypeByPos adds r2, r0, #0 - ldr r1, _0807A290 @ =gLinkState + ldr r1, _0807A290 @ =gPlayerState ldrh r0, [r1, #0x24] cmp r2, r0 beq _0807A23A @@ -3434,7 +3434,7 @@ _0807A23A: cmp r4, r0 beq _0807A24E _0807A242: - ldr r0, _0807A290 @ =gLinkState + ldr r0, _0807A290 @ =gPlayerState movs r1, #0 strh r4, [r0, #0x22] strh r2, [r0, #0x24] @@ -3471,8 +3471,8 @@ _0807A26A: pop {r4, r5, r6, r7, pc} .align 2, 0 _0807A288: .4byte gRoomControls -_0807A28C: .4byte gLinkEntity -_0807A290: .4byte gLinkState +_0807A28C: .4byte gPlayerEntity +_0807A290: .4byte gPlayerState _0807A294: .4byte gUnk_08007CAC thumb_func_start sub_0807A298 @@ -3483,7 +3483,7 @@ sub_0807A298: @ 0x0807A298 movs r2, #3 orrs r1, r2 strb r1, [r0, #0x18] - ldr r2, _0807A2B4 @ =gLinkState + ldr r2, _0807A2B4 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x41 rsbs r1, r1, #0 @@ -3491,7 +3491,7 @@ sub_0807A298: @ 0x0807A298 str r0, [r2, #0x30] bx lr .align 2, 0 -_0807A2B4: .4byte gLinkState +_0807A2B4: .4byte gPlayerState thumb_func_start sub_0807A2B8 sub_0807A2B8: @ 0x0807A2B8 @@ -3502,13 +3502,13 @@ sub_0807A2B8: @ 0x0807A2B8 movs r0, #1 b _0807A2EC _0807A2C6: - ldr r0, _0807A2F0 @ =gLinkState + ldr r0, _0807A2F0 @ =gPlayerState ldrb r1, [r0, #2] movs r0, #0xc8 ands r0, r1 cmp r0, #0 bne _0807A2EA - ldr r1, _0807A2F4 @ =gLinkEntity + ldr r1, _0807A2F4 @ =gPlayerEntity adds r0, r1, #0 adds r0, #0x38 ldrb r0, [r0] @@ -3524,8 +3524,8 @@ _0807A2EA: _0807A2EC: pop {pc} .align 2, 0 -_0807A2F0: .4byte gLinkState -_0807A2F4: .4byte gLinkEntity +_0807A2F0: .4byte gPlayerState +_0807A2F4: .4byte gPlayerEntity thumb_func_start sub_0807A2F8 sub_0807A2F8: @ 0x0807A2F8 @@ -3549,7 +3549,7 @@ _0807A312: bne _0807A31E b _0807A4F2 _0807A31E: - ldr r7, _0807A368 @ =gLinkEntity + ldr r7, _0807A368 @ =gPlayerEntity ldrb r1, [r7, #0x14] movs r0, #2 ands r0, r1 @@ -3585,7 +3585,7 @@ _0807A31E: b _0807A3A2 .align 2, 0 _0807A364: .4byte gRoomControls -_0807A368: .4byte gLinkEntity +_0807A368: .4byte gPlayerEntity _0807A36C: movs r1, #0x2e ldrsh r3, [r7, r1] @@ -3617,7 +3617,7 @@ _0807A36C: _0807A3A2: movs r0, #0 mov sb, r0 - ldr r1, _0807A3F4 @ =gLinkEntity + ldr r1, _0807A3F4 @ =gPlayerEntity mov sl, r1 _0807A3AA: movs r2, #0 @@ -3653,13 +3653,13 @@ _0807A3AA: beq _0807A468 b _0807A400 .align 2, 0 -_0807A3F4: .4byte gLinkEntity +_0807A3F4: .4byte gPlayerEntity _0807A3F8: .4byte gUnk_0811C1D8 _0807A3FC: movs r0, #1 mov r8, r0 _0807A400: - ldr r5, _0807A444 @ =gLinkEntity + ldr r5, _0807A444 @ =gPlayerEntity adds r0, r5, #0 mov r1, sp adds r2, r6, #0 @@ -3690,7 +3690,7 @@ _0807A400: beq _0807A468 b _0807A450 .align 2, 0 -_0807A444: .4byte gLinkEntity +_0807A444: .4byte gPlayerEntity _0807A448: .4byte gUnk_0811C1D8 _0807A44C: movs r0, #1 @@ -3717,7 +3717,7 @@ _0807A46E: bl CheckIsDungeon cmp r0, #0 beq _0807A4B0 - ldr r4, _0807A4AC @ =gLinkEntity + ldr r4, _0807A4AC @ =gPlayerEntity adds r0, r4, #0 mov r1, sp adds r2, r7, #0 @@ -3741,12 +3741,12 @@ _0807A4A0: beq _0807A4EC b _0807A4F2 .align 2, 0 -_0807A4AC: .4byte gLinkEntity +_0807A4AC: .4byte gPlayerEntity _0807A4B0: mov r0, sb cmp r0, #2 bne _0807A4C2 - ldr r0, _0807A4E8 @ =gLinkEntity + ldr r0, _0807A4E8 @ =gPlayerEntity mov r1, sp adds r2, r7, #0 bl sub_08004202 @@ -3760,7 +3760,7 @@ _0807A4C2: mov r1, sb cmp r1, #2 bne _0807A4E0 - ldr r0, _0807A4E8 @ =gLinkEntity + ldr r0, _0807A4E8 @ =gPlayerEntity mov r1, sp adds r2, r6, #0 bl sub_08004202 @@ -3770,7 +3770,7 @@ _0807A4E0: movs r1, #1 b _0807A4A0 .align 2, 0 -_0807A4E8: .4byte gLinkEntity +_0807A4E8: .4byte gPlayerEntity _0807A4EC: mov r0, sb adds r0, #1 @@ -3788,7 +3788,7 @@ _0807A4F4: thumb_func_start sub_0807A500 sub_0807A500: @ 0x0807A500 push {r4, r5, r6, lr} - ldr r6, _0807A518 @ =gLinkEntity + ldr r6, _0807A518 @ =gPlayerEntity ldrb r0, [r6, #0x14] lsrs r0, r0, #1 cmp r0, #1 @@ -3799,7 +3799,7 @@ sub_0807A500: @ 0x0807A500 beq _0807A526 b _0807A5B4 .align 2, 0 -_0807A518: .4byte gLinkEntity +_0807A518: .4byte gPlayerEntity _0807A51C: cmp r0, #2 beq _0807A554 @@ -3896,7 +3896,7 @@ sub_0807A5B8: @ 0x0807A5B8 mov r6, r8 push {r6, r7} mov sb, r0 - ldr r2, _0807A5F8 @ =gLinkState + ldr r2, _0807A5F8 @ =gPlayerState ldrb r3, [r2, #2] movs r4, #0x80 adds r0, r4, #0 @@ -3926,7 +3926,7 @@ _0807A5EA: ldr r7, _0807A5FC @ =gUnk_0800833C b _0807A63A .align 2, 0 -_0807A5F8: .4byte gLinkState +_0807A5F8: .4byte gPlayerState _0807A5FC: .4byte gUnk_0800833C _0807A600: movs r0, #0x80 @@ -3967,7 +3967,7 @@ _0807A63A: beq _0807A6B8 cmp r0, #0x10 beq _0807A6B8 - ldr r6, _0807A748 @ =gLinkEntity + ldr r6, _0807A748 @ =gPlayerEntity ldr r2, [r6, #0x48] movs r1, #0x2e ldrsh r0, [r6, r1] @@ -4028,7 +4028,7 @@ _0807A6B8: beq _0807A736 cmp r3, #0x18 beq _0807A736 - ldr r6, _0807A748 @ =gLinkEntity + ldr r6, _0807A748 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r6, r0] ldr r2, [r6, #0x48] @@ -4091,7 +4091,7 @@ _0807A736: .align 2, 0 _0807A740: .4byte gUnk_080082DC _0807A744: .4byte gUnk_0800851C -_0807A748: .4byte gLinkEntity +_0807A748: .4byte gPlayerEntity _0807A74C: .4byte gRoomControls thumb_func_start sub_0807A750 @@ -4129,7 +4129,7 @@ _0807A77C: ands r1, r2 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _0807A7A8 @ =gLinkEntity + ldr r1, _0807A7A8 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] bl sub_080002E0 @@ -4144,7 +4144,7 @@ _0807A77C: ldrb r1, [r0] b _0807A7AE .align 2, 0 -_0807A7A8: .4byte gLinkEntity +_0807A7A8: .4byte gPlayerEntity _0807A7AC: movs r1, #0xf _0807A7AE: @@ -4163,7 +4163,7 @@ _0807A7AE: asrs r2, r0 cmp r5, #0 bne _0807A7F4 - ldr r3, _0807A7DC @ =gLinkEntity + ldr r3, _0807A7DC @ =gPlayerEntity cmp r4, #0xe bgt _0807A7F0 lsls r0, r4, #1 @@ -4171,7 +4171,7 @@ _0807A7AE: b _0807A7E8 .align 2, 0 _0807A7D8: .4byte gUnk_0800823C -_0807A7DC: .4byte gLinkEntity +_0807A7DC: .4byte gPlayerEntity _0807A7E0: adds r1, #2 adds r4, #1 @@ -4186,14 +4186,14 @@ _0807A7F0: subs r4, #1 b _0807A816 _0807A7F4: - ldr r3, _0807A800 @ =gLinkEntity + ldr r3, _0807A800 @ =gPlayerEntity cmp r4, #0 ble _0807A814 lsls r0, r4, #1 adds r1, r0, r1 b _0807A80C .align 2, 0 -_0807A800: .4byte gLinkEntity +_0807A800: .4byte gPlayerEntity _0807A804: subs r1, #2 subs r4, #1 @@ -4224,7 +4224,7 @@ _0807A824: bne _0807A85C subs r0, r3, r4 lsrs r2, r0 - ldr r3, _0807A858 @ =gLinkEntity + ldr r3, _0807A858 @ =gPlayerEntity cmp r4, #0 ble _0807A854 ands r5, r2 @@ -4244,17 +4244,17 @@ _0807A854: adds r4, #1 b _0807A882 .align 2, 0 -_0807A858: .4byte gLinkEntity +_0807A858: .4byte gPlayerEntity _0807A85C: lsls r2, r4 - ldr r3, _0807A86C @ =gLinkEntity + ldr r3, _0807A86C @ =gPlayerEntity cmp r4, #0xe bgt _0807A880 movs r1, #0x80 lsls r1, r1, #8 b _0807A878 .align 2, 0 -_0807A86C: .4byte gLinkEntity +_0807A86C: .4byte gPlayerEntity _0807A870: lsls r2, r2, #1 adds r4, #1 @@ -4333,7 +4333,7 @@ sub_0807A8D8: @ 0x0807A8D8 mov r6, r8 push {r6, r7} adds r5, r0, #0 - ldr r0, _0807AA5C @ =gLinkState + ldr r0, _0807AA5C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -4358,7 +4358,7 @@ _0807A8F0: ands r1, r6 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _0807AA64 @ =gLinkEntity + ldr r1, _0807AA64 @ =gPlayerEntity adds r1, #0x38 mov sb, r1 ldrb r1, [r1] @@ -4485,7 +4485,7 @@ _0807A9F6: ands r1, r6 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _0807AA64 @ =gLinkEntity + ldr r1, _0807AA64 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] bl sub_080002EC @@ -4519,9 +4519,9 @@ _0807AA4C: bl sub_0807AABC b _0807AA76 .align 2, 0 -_0807AA5C: .4byte gLinkState +_0807AA5C: .4byte gPlayerState _0807AA60: .4byte gRoomControls -_0807AA64: .4byte gLinkEntity +_0807AA64: .4byte gPlayerEntity _0807AA68: movs r0, #4 ands r0, r4 @@ -4540,7 +4540,7 @@ _0807AA76: sub_0807AA80: @ 0x0807AA80 push {lr} adds r3, r0, #0 - ldr r0, _0807AAB8 @ =gLinkState + ldr r0, _0807AAB8 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x40 ands r0, r1 @@ -4568,13 +4568,13 @@ sub_0807AA80: @ 0x0807AA80 _0807AAB6: pop {pc} .align 2, 0 -_0807AAB8: .4byte gLinkState +_0807AAB8: .4byte gPlayerState thumb_func_start sub_0807AABC sub_0807AABC: @ 0x0807AABC push {lr} adds r3, r0, #0 - ldr r0, _0807AAF4 @ =gLinkState + ldr r0, _0807AAF4 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x40 ands r0, r1 @@ -4602,7 +4602,7 @@ sub_0807AABC: @ 0x0807AABC _0807AAF2: pop {pc} .align 2, 0 -_0807AAF4: .4byte gLinkState +_0807AAF4: .4byte gPlayerState thumb_func_start sub_0807AAF8 sub_0807AAF8: @ 0x0807AAF8 @@ -4619,7 +4619,7 @@ sub_0807AAF8: @ 0x0807AAF8 lsls r0, r0, #0x1e orrs r2, r0 movs r3, #0 - ldr r0, _0807AB40 @ =gLinkState + ldr r0, _0807AB40 @ =gPlayerState ldr r1, [r0, #0x40] adds r4, r0, #0 cmp r1, r2 @@ -4645,7 +4645,7 @@ _0807AB32: _0807AB3C: pop {r4, pc} .align 2, 0 -_0807AB40: .4byte gLinkState +_0807AB40: .4byte gPlayerState thumb_func_start sub_0807AB44 sub_0807AB44: @ 0x0807AB44 @@ -4781,7 +4781,7 @@ _0807AC50: .4byte 0x0000404F sub_0807AC54: @ 0x0807AC54 push {lr} adds r2, r0, #0 - ldr r0, _0807AC74 @ =gLinkState + ldr r0, _0807AC74 @ =gPlayerState ldrb r1, [r0, #0x11] adds r3, r0, #0 cmp r1, #0 @@ -4795,7 +4795,7 @@ sub_0807AC54: @ 0x0807AC54 beq _0807AC82 b _0807ACC6 .align 2, 0 -_0807AC74: .4byte gLinkState +_0807AC74: .4byte gPlayerState _0807AC78: cmp r0, #0x2b beq _0807AC90 @@ -4872,7 +4872,7 @@ _0807ACF4: cmp r1, r0 ble _0807AD18 strh r1, [r4, #0x24] - ldr r0, _0807AD14 @ =gLinkState + ldr r0, _0807AD14 @ =gPlayerState ldrb r1, [r0, #0xd] strb r1, [r4, #0x15] adds r0, #0x26 @@ -4883,13 +4883,13 @@ _0807ACF4: bne _0807ADB4 b _0807AD1E .align 2, 0 -_0807AD14: .4byte gLinkState +_0807AD14: .4byte gPlayerState _0807AD18: ldrh r0, [r4, #0x24] subs r0, #4 strh r0, [r4, #0x24] _0807AD1E: - ldr r2, _0807AD3C @ =gLinkState + ldr r2, _0807AD3C @ =gPlayerState adds r1, r2, #0 adds r1, #0x89 ldrb r0, [r1] @@ -4903,7 +4903,7 @@ _0807AD1E: bl sub_0807AE20 b _0807AD74 .align 2, 0 -_0807AD3C: .4byte gLinkState +_0807AD3C: .4byte gPlayerState _0807AD40: subs r0, #1 strb r0, [r1] @@ -4931,7 +4931,7 @@ _0807AD52: ldr r0, _0807ADA0 @ =0x00000163 bl PlaySFX _0807AD74: - ldr r0, _0807ADA4 @ =gLinkState + ldr r0, _0807ADA4 @ =gPlayerState adds r0, #0x26 ldrb r1, [r0] movs r0, #0x80 @@ -4954,7 +4954,7 @@ _0807AD74: b _0807ADB2 .align 2, 0 _0807ADA0: .4byte 0x00000163 -_0807ADA4: .4byte gLinkState +_0807ADA4: .4byte gPlayerState _0807ADA8: adds r2, r4, #0 adds r2, #0x3c @@ -4971,7 +4971,7 @@ _0807ADB4: sub_0807ADB8: @ 0x0807ADB8 push {r4, lr} adds r2, r0, #0 - ldr r3, _0807ADF4 @ =gLinkState + ldr r3, _0807ADF4 @ =gPlayerState adds r0, r3, #0 adds r0, #0x92 ldrh r1, [r0] @@ -4999,7 +4999,7 @@ sub_0807ADB8: @ 0x0807ADB8 strb r0, [r1] b _0807AE0E .align 2, 0 -_0807ADF4: .4byte gLinkState +_0807ADF4: .4byte gPlayerState _0807ADF8: adds r2, #0x29 ldrb r1, [r2] @@ -5031,7 +5031,7 @@ sub_0807AE20: @ 0x0807AE20 ldrb r0, [r4, #0xc] cmp r0, #0x17 bne _0807AE32 - ldr r0, _0807AE58 @ =gLinkState + ldr r0, _0807AE58 @ =gPlayerState ldrb r0, [r0, #0xa] cmp r0, #0 bne _0807AE74 @@ -5040,7 +5040,7 @@ _0807AE32: ldrh r0, [r0] cmp r0, #0 bne _0807AE74 - ldr r0, _0807AE58 @ =gLinkState + ldr r0, _0807AE58 @ =gPlayerState adds r0, #0x92 ldrh r1, [r0] movs r0, #8 @@ -5055,7 +5055,7 @@ _0807AE32: lsls r0, r0, #1 b _0807AE64 .align 2, 0 -_0807AE58: .4byte gLinkState +_0807AE58: .4byte gPlayerState _0807AE5C: .4byte gRoomControls _0807AE60: movs r0, #0xc0 @@ -5126,7 +5126,7 @@ _0807AEE0: .4byte gScreenTransition thumb_func_start sub_0807AEE4 sub_0807AEE4: @ 0x0807AEE4 push {r4, lr} - ldr r0, _0807AFE4 @ =gLinkState + ldr r0, _0807AFE4 @ =gPlayerState adds r4, r0, #0 adds r4, #0xac movs r0, #0 @@ -5229,7 +5229,7 @@ _0807AFAC: bl GetInventoryValue cmp r0, #1 bne _0807AFC6 - ldr r0, _0807AFE4 @ =gLinkState + ldr r0, _0807AFE4 @ =gPlayerState adds r0, #0xac ldrh r2, [r0] movs r3, #0x80 @@ -5242,7 +5242,7 @@ _0807AFC6: bl GetInventoryValue cmp r0, #1 bne _0807AFE0 - ldr r0, _0807AFE4 @ =gLinkState + ldr r0, _0807AFE4 @ =gPlayerState adds r0, #0xac ldrh r2, [r0] movs r3, #0x80 @@ -5253,13 +5253,13 @@ _0807AFC6: _0807AFE0: pop {r4, pc} .align 2, 0 -_0807AFE4: .4byte gLinkState +_0807AFE4: .4byte gPlayerState thumb_func_start sub_0807AFE8 sub_0807AFE8: @ 0x0807AFE8 push {lr} bl sub_08077B20 - ldr r0, _0807B00C @ =gLinkEntity + ldr r0, _0807B00C @ =gPlayerEntity movs r1, #0x43 movs r2, #0 bl CreateFx @@ -5270,18 +5270,18 @@ sub_0807AFE8: @ 0x0807AFE8 adds r0, #1 strh r0, [r1, #0x32] _0807B004: - ldr r1, _0807B010 @ =gLinkState + ldr r1, _0807B010 @ =gPlayerState movs r0, #9 strb r0, [r1, #0xc] pop {pc} .align 2, 0 -_0807B00C: .4byte gLinkEntity -_0807B010: .4byte gLinkState +_0807B00C: .4byte gPlayerEntity +_0807B010: .4byte gPlayerState thumb_func_start sub_0807B014 sub_0807B014: @ 0x0807B014 push {lr} - ldr r2, _0807B03C @ =gLinkState + ldr r2, _0807B03C @ =gPlayerState adds r0, r2, #0 adds r0, #0xac ldrh r1, [r0] @@ -5300,7 +5300,7 @@ sub_0807B014: @ 0x0807B014 movs r0, #0xf b _0807B066 .align 2, 0 -_0807B03C: .4byte gLinkState +_0807B03C: .4byte gPlayerState _0807B040: .4byte gUnk_02002A40 _0807B044: adds r0, r2, #0 @@ -5327,7 +5327,7 @@ _0807B066: thumb_func_start sub_0807B068 sub_0807B068: @ 0x0807B068 push {lr} - ldr r2, _0807B090 @ =gLinkState + ldr r2, _0807B090 @ =gPlayerState ldrb r1, [r2, #0x1e] ldrb r0, [r2, #4] orrs r0, r1 @@ -5346,7 +5346,7 @@ sub_0807B068: @ 0x0807B068 strh r0, [r2, #8] b _0807B0C2 .align 2, 0 -_0807B090: .4byte gLinkState +_0807B090: .4byte gPlayerState _0807B094: .4byte 0x00000C1C _0807B098: ldr r0, _0807B0A0 @ =0x00000C0C @@ -5380,7 +5380,7 @@ _0807B0C4: .4byte 0x00000C04 thumb_func_start sub_0807B0C8 sub_0807B0C8: @ 0x0807B0C8 push {r4, lr} - ldr r4, _0807B0F8 @ =gLinkEntity + ldr r4, _0807B0F8 @ =gPlayerEntity adds r0, r4, #0 movs r1, #0 movs r2, #0 @@ -5399,7 +5399,7 @@ sub_0807B0C8: @ 0x0807B0C8 bl sub_0806FEBC pop {r4, pc} .align 2, 0 -_0807B0F8: .4byte gLinkEntity +_0807B0F8: .4byte gPlayerEntity thumb_func_start sub_0807B0FC sub_0807B0FC: @ 0x0807B0FC @@ -5418,14 +5418,14 @@ _0807B110: .4byte gUnk_0811C27C sub_0807B114: @ 0x0807B114 movs r1, #1 strb r1, [r0, #0xd] - ldr r1, _0807B124 @ =gLinkState + ldr r1, _0807B124 @ =gPlayerState adds r1, #0x38 ldrb r1, [r1] adds r0, #0x6c strb r1, [r0] bx lr .align 2, 0 -_0807B124: .4byte gLinkState +_0807B124: .4byte gPlayerState thumb_func_start sub_0807B128 sub_0807B128: @ 0x0807B128 @@ -5460,13 +5460,13 @@ sub_0807B144: @ 0x0807B144 movs r1, #0x80 lsls r1, r1, #0xb str r1, [r0, #0x20] - ldr r1, _0807B170 @ =gLinkState + ldr r1, _0807B170 @ =gPlayerState movs r0, #0x81 strb r0, [r1, #2] bl sub_080791BC pop {pc} .align 2, 0 -_0807B170: .4byte gLinkState +_0807B170: .4byte gPlayerState thumb_func_start nullsub_506 nullsub_506: @ 0x0807B174 @@ -5490,13 +5490,13 @@ sub_0807B178: @ 0x0807B178 movs r1, #0x80 lsls r1, r1, #0xb str r1, [r0, #0x20] - ldr r1, _0807B1A4 @ =gLinkState + ldr r1, _0807B1A4 @ =gPlayerState movs r0, #0x81 strb r0, [r1, #2] bl sub_080791BC pop {pc} .align 2, 0 -_0807B1A4: .4byte gLinkState +_0807B1A4: .4byte gPlayerState thumb_func_start sub_0807B1A8 sub_0807B1A8: @ 0x0807B1A8 @@ -5553,13 +5553,13 @@ sub_0807B1EC: @ 0x0807B1EC movs r0, #0x80 lsls r0, r0, #9 str r0, [r2, #0x20] - ldr r1, _0807B214 @ =gLinkState + ldr r1, _0807B214 @ =gPlayerState ldr r0, _0807B218 @ =0x000002C2 strh r0, [r1, #8] _0807B212: pop {pc} .align 2, 0 -_0807B214: .4byte gLinkState +_0807B214: .4byte gPlayerState _0807B218: .4byte 0x000002C2 thumb_func_start sub_0807B21C diff --git a/asm/code_0807B9B8.s b/asm/code_0807B9B8.s index 83800962..17921068 100644 --- a/asm/code_0807B9B8.s +++ b/asm/code_0807B9B8.s @@ -503,7 +503,7 @@ _0807BD90: _0807BD96: strh r0, [r2, #4] _0807BD98: - ldr r2, _0807BDB0 @ =gLinkEntity + ldr r2, _0807BDB0 @ =gPlayerEntity ldrb r1, [r2, #0x11] movs r0, #0x10 rsbs r0, r0, #0 @@ -515,7 +515,7 @@ _0807BD98: movs r0, #1 b _0807BDB6 .align 2, 0 -_0807BDB0: .4byte gLinkEntity +_0807BDB0: .4byte gPlayerEntity _0807BDB4: movs r0, #0 _0807BDB6: @@ -1823,7 +1823,7 @@ sub_0807C810: @ 0x0807C810 push {r4, r5, r6, lr} bl sub_0807BFD0 ldr r2, _0807C850 @ =gUnk_03004030 - ldr r6, _0807C854 @ =gLinkEntity + ldr r6, _0807C854 @ =gPlayerEntity ldr r4, _0807C858 @ =gRoomControls ldr r3, [r2] ldrh r1, [r3, #6] @@ -1852,7 +1852,7 @@ sub_0807C810: @ 0x0807C810 pop {r4, r5, r6, pc} .align 2, 0 _0807C850: .4byte gUnk_03004030 -_0807C854: .4byte gLinkEntity +_0807C854: .4byte gPlayerEntity _0807C858: .4byte gRoomControls _0807C85C: .4byte gUnk_02000070 diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 4ff60f5c..0db4b4d8 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -1619,10 +1619,10 @@ StartPlayerScript: @ 0x0807DB2C movs r1, #0x24 bl _DmaZero str r5, [r4] - ldr r0, _0807DB60 @ =gLinkEntity + ldr r0, _0807DB60 @ =gPlayerEntity adds r0, #0x84 str r4, [r0] - ldr r2, _0807DB64 @ =gLinkState + ldr r2, _0807DB64 @ =gPlayerState movs r1, #0 movs r0, #0x1c strb r0, [r2, #0xc] @@ -1636,8 +1636,8 @@ StartPlayerScript: @ 0x0807DB2C pop {r4, r5, pc} .align 2, 0 _0807DB5C: .4byte gUnk_02022750 -_0807DB60: .4byte gLinkEntity -_0807DB64: .4byte gLinkState +_0807DB60: .4byte gPlayerEntity +_0807DB64: .4byte gPlayerState thumb_func_start sub_0807DB68 sub_0807DB68: @ 0x0807DB68 @@ -2734,13 +2734,13 @@ sub_0807E30C: @ 0x0807E30C ands r0, r1 cmp r0, #0 bne _0807E348 - ldr r0, _0807E374 @ =gLinkState + ldr r0, _0807E374 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 bne _0807E348 - ldr r6, _0807E378 @ =gLinkEntity + ldr r6, _0807E378 @ =gPlayerEntity adds r0, r5, #0 adds r1, r6, #0 movs r2, #0x28 @@ -2767,15 +2767,15 @@ _0807E348: strb r0, [r1] movs r0, #1 str r0, [r4, #0x14] - ldr r1, _0807E378 @ =gLinkEntity + ldr r1, _0807E378 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection bl sub_0806F5B0 strb r0, [r5, #0x14] b _0807E37E .align 2, 0 -_0807E374: .4byte gLinkState -_0807E378: .4byte gLinkEntity +_0807E374: .4byte gPlayerState +_0807E378: .4byte gPlayerEntity _0807E37C: str r0, [r4, #0x14] _0807E37E: @@ -3030,7 +3030,7 @@ sub_0807E538: @ 0x0807E538 adds r4, r1, #0 ldr r0, [r4] bl GetNextScriptCommandWordAfterCommandMetadata - ldr r1, _0807E55C @ =gLinkState + ldr r1, _0807E55C @ =gPlayerState ldr r1, [r1, #0x30] ands r0, r1 rsbs r1, r0, #0 @@ -3044,12 +3044,12 @@ sub_0807E538: @ 0x0807E538 strb r0, [r2, #7] pop {r4, pc} .align 2, 0 -_0807E55C: .4byte gLinkState +_0807E55C: .4byte gPlayerState _0807E560: .4byte gUnk_02033280 thumb_func_start sub_0807E564 sub_0807E564: @ 0x0807E564 - ldr r0, _0807E57C @ =gLinkState + ldr r0, _0807E57C @ =gPlayerState ldr r0, [r0, #0x30] lsrs r0, r0, #7 movs r2, #1 @@ -3062,7 +3062,7 @@ sub_0807E564: @ 0x0807E564 strb r0, [r2, #7] bx lr .align 2, 0 -_0807E57C: .4byte gLinkState +_0807E57C: .4byte gPlayerState _0807E580: .4byte gUnk_02033280 thumb_func_start sub_0807E584 @@ -3087,7 +3087,7 @@ sub_0807E5A0: @ 0x0807E5A0 adds r2, r1, #0 movs r3, #0 ldr r0, [r2] - ldr r1, _0807E5C4 @ =gLinkEntity + ldr r1, _0807E5C4 @ =gPlayerEntity ldrh r0, [r0, #2] ldrb r1, [r1, #0xc] cmp r0, r1 @@ -3102,7 +3102,7 @@ _0807E5B4: strb r0, [r2, #7] pop {pc} .align 2, 0 -_0807E5C4: .4byte gLinkEntity +_0807E5C4: .4byte gPlayerEntity _0807E5C8: .4byte gUnk_02033280 thumb_func_start sub_0807E5CC @@ -3111,7 +3111,7 @@ sub_0807E5CC: @ 0x0807E5CC adds r2, r1, #0 movs r3, #0 ldr r0, [r2] - ldr r1, _0807E5F0 @ =gLinkEntity + ldr r1, _0807E5F0 @ =gPlayerEntity ldrh r0, [r0, #2] ldrb r1, [r1, #0x14] cmp r0, r1 @@ -3126,7 +3126,7 @@ _0807E5E0: strb r0, [r2, #7] pop {pc} .align 2, 0 -_0807E5F0: .4byte gLinkEntity +_0807E5F0: .4byte gPlayerEntity _0807E5F4: .4byte gUnk_02033280 thumb_func_start sub_0807E5F8 @@ -3270,7 +3270,7 @@ _0807E6D8: thumb_func_start sub_0807E6DC sub_0807E6DC: @ 0x0807E6DC push {lr} - ldr r0, _0807E6F0 @ =gLinkEntity + ldr r0, _0807E6F0 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #8 bne _0807E6F8 @@ -3279,7 +3279,7 @@ sub_0807E6DC: @ 0x0807E6DC strb r0, [r1, #6] b _0807E6FC .align 2, 0 -_0807E6F0: .4byte gLinkEntity +_0807E6F0: .4byte gPlayerEntity _0807E6F4: .4byte gUnk_02033280 _0807E6F8: movs r0, #0x2d @@ -3291,7 +3291,7 @@ _0807E6FC: thumb_func_start sub_0807E700 sub_0807E700: @ 0x0807E700 push {lr} - ldr r0, _0807E718 @ =gLinkEntity + ldr r0, _0807E718 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0x17 beq _0807E720 @@ -3302,7 +3302,7 @@ sub_0807E700: @ 0x0807E700 strb r0, [r2, #7] b _0807E726 .align 2, 0 -_0807E718: .4byte gLinkEntity +_0807E718: .4byte gPlayerEntity _0807E71C: .4byte gUnk_02033280 _0807E720: ldr r1, _0807E728 @ =gUnk_02033280 @@ -3497,41 +3497,41 @@ sub_0807E858: @ 0x0807E858 thumb_func_start sub_0807E864 sub_0807E864: @ 0x0807E864 push {lr} - ldr r0, _0807E874 @ =gLinkState + ldr r0, _0807E874 @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] bl sub_08078B48 pop {pc} .align 2, 0 -_0807E874: .4byte gLinkState +_0807E874: .4byte gPlayerState thumb_func_start sub_0807E878 sub_0807E878: @ 0x0807E878 - ldr r0, _0807E884 @ =gLinkState + ldr r0, _0807E884 @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] bx lr .align 2, 0 -_0807E884: .4byte gLinkState +_0807E884: .4byte gPlayerState thumb_func_start sub_0807E888 sub_0807E888: @ 0x0807E888 - ldr r0, _0807E894 @ =gLinkState + ldr r0, _0807E894 @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] bx lr .align 2, 0 -_0807E894: .4byte gLinkState +_0807E894: .4byte gPlayerState thumb_func_start sub_0807E898 sub_0807E898: @ 0x0807E898 push {lr} ldr r0, [r1] bl GetNextScriptCommandWordAfterCommandMetadata - ldr r3, _0807E8C0 @ =gLinkState + ldr r3, _0807E8C0 @ =gPlayerState strb r0, [r3, #0xc] lsrs r2, r0, #8 adds r1, r3, #0 @@ -3547,7 +3547,7 @@ sub_0807E898: @ 0x0807E898 strb r0, [r1] pop {pc} .align 2, 0 -_0807E8C0: .4byte gLinkState +_0807E8C0: .4byte gPlayerState thumb_func_start sub_0807E8C4 sub_0807E8C4: @ 0x0807E8C4 @@ -3560,13 +3560,13 @@ sub_0807E8C4: @ 0x0807E8C4 thumb_func_start sub_0807E8D4 sub_0807E8D4: @ 0x0807E8D4 - ldr r2, _0807E8E0 @ =gLinkState + ldr r2, _0807E8E0 @ =gPlayerState ldr r0, [r1] ldrh r0, [r0, #2] strh r0, [r2, #8] bx lr .align 2, 0 -_0807E8E0: .4byte gLinkState +_0807E8E0: .4byte gPlayerState thumb_func_start sub_0807E8E4 sub_0807E8E4: @ 0x0807E8E4 @@ -3574,7 +3574,7 @@ sub_0807E8E4: @ 0x0807E8E4 ldrh r0, [r0] ldr r2, _0807E900 @ =0x000003FF ands r2, r0 - ldr r3, _0807E904 @ =gLinkEntity + ldr r3, _0807E904 @ =gPlayerEntity ldr r0, [r1] ldrh r0, [r0] subs r0, r0, r2 @@ -3584,7 +3584,7 @@ sub_0807E8E4: @ 0x0807E8E4 .align 2, 0 _0807E8FC: .4byte gUnk_08016984 _0807E900: .4byte 0x000003FF -_0807E904: .4byte gLinkEntity +_0807E904: .4byte gPlayerEntity thumb_func_start sub_0807E908 sub_0807E908: @ 0x0807E908 @@ -3737,7 +3737,7 @@ sub_0807E9F0: @ 0x0807E9F0 beq _0807EA24 cmp r0, #2 bne _0807EA40 - ldr r0, _0807EA1C @ =gLinkState + ldr r0, _0807EA1C @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] @@ -3747,7 +3747,7 @@ sub_0807E9F0: @ 0x0807E9F0 b _0807EA28 .align 2, 0 _0807EA18: .4byte gUnk_02022740 -_0807EA1C: .4byte gLinkState +_0807EA1C: .4byte gPlayerState _0807EA20: .4byte gUnk_02034490 _0807EA24: movs r0, #0 @@ -3756,13 +3756,13 @@ _0807EA28: cmp r2, #0 beq _0807EA40 bl sub_0807919C - ldr r0, _0807EA3C @ =gLinkState + ldr r0, _0807EA3C @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] b _0807EA46 .align 2, 0 -_0807EA3C: .4byte gLinkState +_0807EA3C: .4byte gPlayerState _0807EA40: ldr r1, _0807EA48 @ =gUnk_02033280 movs r0, #0 @@ -3949,19 +3949,19 @@ _0807EB70: .4byte gRoomControls sub_0807EB74: @ 0x0807EB74 push {r4, lr} adds r4, r0, #0 - ldr r1, _0807EB88 @ =gLinkEntity + ldr r1, _0807EB88 @ =gPlayerEntity bl GetFacingDirection bl sub_0806F5B0 strb r0, [r4, #0x14] pop {r4, pc} .align 2, 0 -_0807EB88: .4byte gLinkEntity +_0807EB88: .4byte gPlayerEntity thumb_func_start sub_0807EB8C sub_0807EB8C: @ 0x0807EB8C push {r4, lr} adds r1, r0, #0 - ldr r4, _0807EBA4 @ =gLinkEntity + ldr r4, _0807EBA4 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5B0 @@ -3970,7 +3970,7 @@ sub_0807EB8C: @ 0x0807EB8C strb r0, [r4, #0x14] pop {r4, pc} .align 2, 0 -_0807EBA4: .4byte gLinkEntity +_0807EBA4: .4byte gPlayerEntity thumb_func_start sub_0807EBA8 sub_0807EBA8: @ 0x0807EBA8 @@ -4041,11 +4041,11 @@ sub_0807EBF4: @ 0x0807EBF4 sub_0807EC08: @ 0x0807EC08 push {lr} adds r1, r0, #0 - ldr r0, _0807EC14 @ =gLinkEntity + ldr r0, _0807EC14 @ =gPlayerEntity bl CopyPosition pop {pc} .align 2, 0 -_0807EC14: .4byte gLinkEntity +_0807EC14: .4byte gPlayerEntity thumb_func_start nullsub_509 nullsub_509: @ 0x0807EC18 @@ -4419,7 +4419,7 @@ sub_0807EEB4: @ 0x0807EEB4 bne _0807EED6 movs r0, #1 strb r0, [r4, #0x18] - ldr r0, _0807EEEC @ =gLinkEntity + ldr r0, _0807EEEC @ =gPlayerEntity movs r1, #0x2e ldrsh r2, [r0, r1] movs r1, #0x32 @@ -4439,7 +4439,7 @@ _0807EED6: _0807EEE8: pop {r4, r5, pc} .align 2, 0 -_0807EEEC: .4byte gLinkEntity +_0807EEEC: .4byte gPlayerEntity _0807EEF0: .4byte gUnk_02033280 thumb_func_start sub_0807EEF4 @@ -4698,12 +4698,12 @@ _0807F0A0: .4byte gRoomControls thumb_func_start sub_0807F0A4 sub_0807F0A4: @ 0x0807F0A4 ldr r1, _0807F0AC @ =gRoomControls - ldr r0, _0807F0B0 @ =gLinkEntity + ldr r0, _0807F0B0 @ =gPlayerEntity str r0, [r1, #0x30] bx lr .align 2, 0 _0807F0AC: .4byte gRoomControls -_0807F0B0: .4byte gLinkEntity +_0807F0B0: .4byte gPlayerEntity thumb_func_start sub_0807F0B4 sub_0807F0B4: @ 0x0807F0B4 @@ -4808,7 +4808,7 @@ sub_0807F158: @ 0x0807F158 thumb_func_start sub_0807F168 sub_0807F168: @ 0x0807F168 push {lr} - ldr r0, _0807F17C @ =gLinkEntity + ldr r0, _0807F17C @ =gPlayerEntity adds r2, r0, #0 adds r2, #0x38 movs r1, #1 @@ -4816,7 +4816,7 @@ sub_0807F168: @ 0x0807F168 bl UpdateSpriteForCollisionLayer pop {pc} .align 2, 0 -_0807F17C: .4byte gLinkEntity +_0807F17C: .4byte gPlayerEntity thumb_func_start sub_0807F180 sub_0807F180: @ 0x0807F180 @@ -4841,7 +4841,7 @@ sub_0807F190: @ 0x0807F190 thumb_func_start sub_0807F1A0 sub_0807F1A0: @ 0x0807F1A0 push {r4, lr} - ldr r3, _0807F1BC @ =gLinkEntity + ldr r3, _0807F1BC @ =gPlayerEntity movs r4, #0x2e ldrsh r2, [r3, r4] movs r4, #0x32 @@ -4854,13 +4854,13 @@ sub_0807F1A0: @ 0x0807F1A0 strb r0, [r2, #7] pop {r4, pc} .align 2, 0 -_0807F1BC: .4byte gLinkEntity +_0807F1BC: .4byte gPlayerEntity _0807F1C0: .4byte gUnk_02033280 thumb_func_start sub_0807F1C4 sub_0807F1C4: @ 0x0807F1C4 push {lr} - ldr r2, _0807F1D8 @ =gLinkState + ldr r2, _0807F1D8 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #8 ands r0, r1 @@ -4869,7 +4869,7 @@ sub_0807F1C4: @ 0x0807F1C4 ldr r0, _0807F1DC @ =0x00000459 b _0807F1E4 .align 2, 0 -_0807F1D8: .4byte gLinkState +_0807F1D8: .4byte gPlayerState _0807F1DC: .4byte 0x00000459 _0807F1E0: movs r0, #0xde @@ -4881,7 +4881,7 @@ _0807F1E4: thumb_func_start sub_0807F1E8 sub_0807F1E8: @ 0x0807F1E8 push {lr} - ldr r2, _0807F1FC @ =gLinkState + ldr r2, _0807F1FC @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #8 ands r0, r1 @@ -4890,7 +4890,7 @@ sub_0807F1E8: @ 0x0807F1E8 ldr r0, _0807F200 @ =0x0000045A b _0807F206 .align 2, 0 -_0807F1FC: .4byte gLinkState +_0807F1FC: .4byte gPlayerState _0807F200: .4byte 0x0000045A _0807F204: ldr r0, _0807F20C @ =0x000002BD @@ -4903,7 +4903,7 @@ _0807F20C: .4byte 0x000002BD thumb_func_start sub_0807F210 sub_0807F210: @ 0x0807F210 push {lr} - ldr r2, _0807F224 @ =gLinkState + ldr r2, _0807F224 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #8 ands r0, r1 @@ -4912,7 +4912,7 @@ sub_0807F210: @ 0x0807F210 ldr r0, _0807F228 @ =0x0000041C b _0807F22E .align 2, 0 -_0807F224: .4byte gLinkState +_0807F224: .4byte gPlayerState _0807F228: .4byte 0x0000041C _0807F22C: ldr r0, _0807F234 @ =0x0000080C @@ -4924,12 +4924,12 @@ _0807F234: .4byte 0x0000080C thumb_func_start sub_0807F238 sub_0807F238: @ 0x0807F238 - ldr r2, _0807F240 @ =gLinkState + ldr r2, _0807F240 @ =gPlayerState ldr r0, [r1, #4] strh r0, [r2, #8] bx lr .align 2, 0 -_0807F240: .4byte gLinkState +_0807F240: .4byte gPlayerState thumb_func_start sub_0807F244 sub_0807F244: @ 0x0807F244 @@ -4988,7 +4988,7 @@ sub_0807F29C: @ 0x0807F29C thumb_func_start sub_0807F2A8 sub_0807F2A8: @ 0x0807F2A8 push {lr} - ldr r0, _0807F2C0 @ =gLinkState + ldr r0, _0807F2C0 @ =gPlayerState adds r0, #0x9c ldr r0, [r0] cmp r0, #0 @@ -5000,7 +5000,7 @@ sub_0807F2A8: @ 0x0807F2A8 strb r0, [r2, #7] b _0807F2CE .align 2, 0 -_0807F2C0: .4byte gLinkState +_0807F2C0: .4byte gPlayerState _0807F2C4: .4byte gUnk_02033280 _0807F2C8: ldr r1, _0807F2D0 @ =gUnk_02033280 @@ -5041,7 +5041,7 @@ _0807F300: .4byte gUnk_02033280 thumb_func_start sub_0807F304 sub_0807F304: @ 0x0807F304 push {lr} - ldr r0, _0807F324 @ =gLinkEntity + ldr r0, _0807F324 @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] movs r0, #0x80 @@ -5057,7 +5057,7 @@ sub_0807F304: @ 0x0807F304 strb r0, [r2, #7] b _0807F330 .align 2, 0 -_0807F324: .4byte gLinkEntity +_0807F324: .4byte gPlayerEntity _0807F328: .4byte gUnk_02033280 _0807F32C: ldr r0, _0807F334 @ =gUnk_02033280 @@ -5179,26 +5179,26 @@ sub_0807F3D8: @ 0x0807F3D8 thumb_func_start sub_0807F3F8 sub_0807F3F8: @ 0x0807F3F8 push {lr} - ldr r0, _0807F408 @ =gLinkEntity + ldr r0, _0807F408 @ =gPlayerEntity movs r2, #0x18 rsbs r2, r2, #0 movs r1, #8 bl sub_080A2CFC pop {pc} .align 2, 0 -_0807F408: .4byte gLinkEntity +_0807F408: .4byte gPlayerEntity thumb_func_start sub_0807F40C sub_0807F40C: @ 0x0807F40C push {lr} - ldr r0, _0807F41C @ =gLinkEntity + ldr r0, _0807F41C @ =gPlayerEntity movs r2, #0x18 rsbs r2, r2, #0 movs r1, #8 bl sub_080A2D0C pop {pc} .align 2, 0 -_0807F41C: .4byte gLinkEntity +_0807F41C: .4byte gPlayerEntity thumb_func_start sub_0807F420 sub_0807F420: @ 0x0807F420 @@ -5397,18 +5397,18 @@ _0807F580: .4byte gUnk_02033280 thumb_func_start sub_0807F584 sub_0807F584: @ 0x0807F584 - ldr r0, _0807F590 @ =gLinkEntity + ldr r0, _0807F590 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 str r0, [r1, #4] bx lr .align 2, 0 -_0807F590: .4byte gLinkEntity +_0807F590: .4byte gPlayerEntity thumb_func_start sub_0807F594 sub_0807F594: @ 0x0807F594 push {lr} - ldr r0, _0807F5A8 @ =gLinkState + ldr r0, _0807F5A8 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] cmp r0, #0 @@ -5419,18 +5419,18 @@ sub_0807F594: @ 0x0807F594 _0807F5A6: pop {pc} .align 2, 0 -_0807F5A8: .4byte gLinkState +_0807F5A8: .4byte gPlayerState _0807F5AC: .4byte gUnk_02033280 thumb_func_start sub_0807F5B0 sub_0807F5B0: @ 0x0807F5B0 - ldr r0, _0807F5BC @ =gLinkState + ldr r0, _0807F5BC @ =gPlayerState ldr r1, [r1, #4] adds r0, #0x27 strb r1, [r0] bx lr .align 2, 0 -_0807F5BC: .4byte gLinkState +_0807F5BC: .4byte gPlayerState thumb_func_start sub_0807F5C0 sub_0807F5C0: @ 0x0807F5C0 @@ -5505,13 +5505,13 @@ sub_0807F634: @ 0x0807F634 ldrh r2, [r3, #2] ldrh r3, [r3, #4] bl sub_0801DFB4 - ldr r0, _0807F64C @ =gLinkState + ldr r0, _0807F64C @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] pop {pc} .align 2, 0 -_0807F64C: .4byte gLinkState +_0807F64C: .4byte gPlayerState thumb_func_start sub_0807F650 sub_0807F650: @ 0x0807F650 @@ -5527,21 +5527,21 @@ sub_0807F650: @ 0x0807F650 ldrh r3, [r0, #4] adds r0, r4, #0 bl sub_0801DFB4 - ldr r0, _0807F67C @ =gLinkState + ldr r0, _0807F67C @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] pop {r4, pc} .align 2, 0 _0807F678: .4byte gUnk_08001A7C -_0807F67C: .4byte gLinkState +_0807F67C: .4byte gPlayerState thumb_func_start sub_0807F680 sub_0807F680: @ 0x0807F680 push {lr} adds r2, r1, #0 movs r3, #0 - ldr r0, _0807F6A8 @ =gLinkEntity + ldr r0, _0807F6A8 @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r0, r1] ldr r1, _0807F6AC @ =gRoomControls @@ -5560,7 +5560,7 @@ _0807F69A: strb r0, [r2, #7] pop {pc} .align 2, 0 -_0807F6A8: .4byte gLinkEntity +_0807F6A8: .4byte gPlayerEntity _0807F6AC: .4byte gRoomControls _0807F6B0: .4byte gUnk_02033280 @@ -5569,7 +5569,7 @@ sub_0807F6B4: @ 0x0807F6B4 push {lr} adds r2, r1, #0 movs r3, #0 - ldr r0, _0807F6DC @ =gLinkEntity + ldr r0, _0807F6DC @ =gPlayerEntity movs r1, #0x32 ldrsh r0, [r0, r1] ldr r1, _0807F6E0 @ =gRoomControls @@ -5588,31 +5588,31 @@ _0807F6CE: strb r0, [r2, #7] pop {pc} .align 2, 0 -_0807F6DC: .4byte gLinkEntity +_0807F6DC: .4byte gPlayerEntity _0807F6E0: .4byte gRoomControls _0807F6E4: .4byte gUnk_02033280 thumb_func_start sub_0807F6E8 sub_0807F6E8: @ 0x0807F6E8 - ldr r2, _0807F6F4 @ =gLinkState + ldr r2, _0807F6F4 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, [r1, #4] orrs r0, r1 str r0, [r2, #0x30] bx lr .align 2, 0 -_0807F6F4: .4byte gLinkState +_0807F6F4: .4byte gPlayerState thumb_func_start sub_0807F6F8 sub_0807F6F8: @ 0x0807F6F8 - ldr r2, _0807F704 @ =gLinkState + ldr r2, _0807F704 @ =gPlayerState ldr r1, [r1, #4] ldr r0, [r2, #0x30] bics r0, r1 str r0, [r2, #0x30] bx lr .align 2, 0 -_0807F704: .4byte gLinkState +_0807F704: .4byte gPlayerState thumb_func_start sub_0807F708 sub_0807F708: @ 0x0807F708 @@ -5666,7 +5666,7 @@ _0807F758: .4byte gUnk_08114F34 sub_0807F75C: @ 0x0807F75C push {r4, lr} ldr r2, [r1, #4] - ldr r3, _0807F774 @ =gLinkEntity + ldr r3, _0807F774 @ =gPlayerEntity ldr r1, _0807F778 @ =gRoomControls asrs r0, r2, #0x10 ldrh r4, [r1, #6] @@ -5677,7 +5677,7 @@ sub_0807F75C: @ 0x0807F75C strh r0, [r3, #0x32] pop {r4, pc} .align 2, 0 -_0807F774: .4byte gLinkEntity +_0807F774: .4byte gPlayerEntity _0807F778: .4byte gRoomControls thumb_func_start sub_0807F77C @@ -5996,7 +5996,7 @@ sub_0807F994: @ 0x0807F994 thumb_func_start sub_0807F9A4 sub_0807F9A4: @ 0x0807F9A4 push {lr} - ldr r0, _0807F9BC @ =gLinkState + ldr r0, _0807F9BC @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] subs r0, #5 @@ -6008,7 +6008,7 @@ sub_0807F9A4: @ 0x0807F9A4 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807F9BC: .4byte gLinkState +_0807F9BC: .4byte gPlayerState _0807F9C0: .4byte _0807F9C4 _0807F9C4: @ jump table .4byte _0807FA24 @ case 0 @@ -6056,7 +6056,7 @@ _0807FA3C: .4byte gUnk_02033280 thumb_func_start sub_0807FA40 sub_0807FA40: @ 0x0807FA40 push {lr} - ldr r0, _0807FA58 @ =gLinkState + ldr r0, _0807FA58 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] subs r0, #5 @@ -6068,7 +6068,7 @@ sub_0807FA40: @ 0x0807FA40 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807FA58: .4byte gLinkState +_0807FA58: .4byte gPlayerState _0807FA5C: .4byte _0807FA60 _0807FA60: @ jump table .4byte _0807FAC0 @ case 0 @@ -6192,21 +6192,21 @@ _0807FB60: .4byte gUnk_02033280 thumb_func_start sub_0807FB64 sub_0807FB64: @ 0x0807FB64 - ldr r0, _0807FB70 @ =gLinkEntity + ldr r0, _0807FB70 @ =gPlayerEntity ldr r1, [r1, #4] adds r0, #0x3d strb r1, [r0] bx lr .align 2, 0 -_0807FB70: .4byte gLinkEntity +_0807FB70: .4byte gPlayerEntity thumb_func_start sub_0807FB74 sub_0807FB74: @ 0x0807FB74 - ldr r0, _0807FB8C @ =gLinkState + ldr r0, _0807FB8C @ =gPlayerState adds r0, #0x26 movs r1, #0 strb r1, [r0] - ldr r1, _0807FB90 @ =gLinkEntity + ldr r1, _0807FB90 @ =gPlayerEntity adds r1, #0x3c ldrb r2, [r1] movs r0, #0xfb @@ -6214,8 +6214,8 @@ sub_0807FB74: @ 0x0807FB74 strb r0, [r1] bx lr .align 2, 0 -_0807FB8C: .4byte gLinkState -_0807FB90: .4byte gLinkEntity +_0807FB8C: .4byte gPlayerState +_0807FB90: .4byte gPlayerEntity thumb_func_start sub_0807FB94 sub_0807FB94: @ 0x0807FB94 @@ -6240,14 +6240,14 @@ _0807FBB0: .4byte gRoomControls thumb_func_start sub_0807FBB4 sub_0807FBB4: @ 0x0807FBB4 - ldr r2, _0807FBC0 @ =gLinkState + ldr r2, _0807FBC0 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r0, r1 strb r0, [r2, #0x1a] bx lr .align 2, 0 -_0807FBC0: .4byte gLinkState +_0807FBC0: .4byte gPlayerState thumb_func_start sub_0807FBC4 sub_0807FBC4: @ 0x0807FBC4 @@ -6595,21 +6595,21 @@ _0807FE26: subs r0, #4 strh r0, [r4, #0xc] ldr r1, [r4, #0x30] - ldr r0, _0807FE3C @ =gLinkEntity + ldr r0, _0807FE3C @ =gPlayerEntity cmp r1, r0 bne _0807FE80 ldr r0, [r1, #0x30] ldr r2, _0807FE40 @ =0xFFFFA000 b _0807FE7C .align 2, 0 -_0807FE3C: .4byte gLinkEntity +_0807FE3C: .4byte gPlayerEntity _0807FE40: .4byte 0xFFFFA000 _0807FE44: ldrh r0, [r4, #0xa] adds r0, #4 strh r0, [r4, #0xa] ldr r1, [r4, #0x30] - ldr r0, _0807FE64 @ =gLinkEntity + ldr r0, _0807FE64 @ =gPlayerEntity cmp r1, r0 bne _0807FE5C ldr r0, [r1, #0x2c] @@ -6623,13 +6623,13 @@ _0807FE5C: bne _0807FEB6 b _0807FE86 .align 2, 0 -_0807FE64: .4byte gLinkEntity +_0807FE64: .4byte gPlayerEntity _0807FE68: ldrh r0, [r4, #0xc] adds r0, #4 strh r0, [r4, #0xc] ldr r1, [r4, #0x30] - ldr r0, _0807FE90 @ =gLinkEntity + ldr r0, _0807FE90 @ =gPlayerEntity cmp r1, r0 bne _0807FE80 ldr r0, [r1, #0x30] @@ -6647,13 +6647,13 @@ _0807FE86: bl sub_0807FEC8 b _0807FEB6 .align 2, 0 -_0807FE90: .4byte gLinkEntity +_0807FE90: .4byte gPlayerEntity _0807FE94: ldrh r0, [r4, #0xa] subs r0, #4 strh r0, [r4, #0xa] ldr r1, [r4, #0x30] - ldr r0, _0807FEC0 @ =gLinkEntity + ldr r0, _0807FEC0 @ =gPlayerEntity cmp r1, r0 bne _0807FEAA ldr r0, [r1, #0x2c] @@ -6672,7 +6672,7 @@ _0807FEB6: bl sub_08080BC4 pop {r4, pc} .align 2, 0 -_0807FEC0: .4byte gLinkEntity +_0807FEC0: .4byte gPlayerEntity _0807FEC4: .4byte 0xFFFFC000 thumb_func_start sub_0807FEC8 @@ -6799,28 +6799,28 @@ sub_0807FF6C: @ 0x0807FF6C strh r1, [r0] adds r0, #4 strh r1, [r0] - bl ResetLink + bl ResetPlayer bl sub_080791D0 ldr r0, _0807FFCC @ =gUnk_03004030 ldrb r0, [r0, #8] cmp r0, #0 beq _0807FFD4 - ldr r1, _0807FFD0 @ =gLinkEntity + ldr r1, _0807FFD0 @ =gPlayerEntity movs r0, #4 strb r0, [r1, #0x14] b _0807FFD8 .align 2, 0 _0807FFC8: .4byte gScreen _0807FFCC: .4byte gUnk_03004030 -_0807FFD0: .4byte gLinkEntity +_0807FFD0: .4byte gPlayerEntity _0807FFD4: - ldr r0, _0807FFE0 @ =gLinkEntity + ldr r0, _0807FFE0 @ =gPlayerEntity strb r4, [r0, #0x14] _0807FFD8: bl sub_080809D4 pop {r4, pc} .align 2, 0 -_0807FFE0: .4byte gLinkEntity +_0807FFE0: .4byte gPlayerEntity thumb_func_start sub_0807FFE4 sub_0807FFE4: @ 0x0807FFE4 diff --git a/asm/code_080A29BC.s b/asm/code_080A29BC.s index a7eab04d..6d214977 100644 --- a/asm/code_080A29BC.s +++ b/asm/code_080A29BC.s @@ -222,13 +222,13 @@ _080A2C0E: beq _080A2CBA cmp r6, #0 beq _080A2CBA - ldr r0, _080A2C38 @ =gLinkEntity + ldr r0, _080A2C38 @ =gPlayerEntity lsls r1, r1, #8 movs r2, #0 bl sub_080044AE b _080A2CBA .align 2, 0 -_080A2C38: .4byte gLinkEntity +_080A2C38: .4byte gPlayerEntity _080A2C3C: ldrh r5, [r4, #0x2e] adds r0, r4, #0 @@ -243,13 +243,13 @@ _080A2C3C: beq _080A2CBA cmp r6, #0 beq _080A2CBA - ldr r0, _080A2C64 @ =gLinkEntity + ldr r0, _080A2C64 @ =gPlayerEntity lsls r1, r1, #8 movs r2, #8 bl sub_080044AE b _080A2CBA .align 2, 0 -_080A2C64: .4byte gLinkEntity +_080A2C64: .4byte gPlayerEntity _080A2C68: ldrh r5, [r4, #0x32] adds r0, r4, #0 @@ -264,13 +264,13 @@ _080A2C68: beq _080A2CBA cmp r6, #0 beq _080A2CBA - ldr r0, _080A2C90 @ =gLinkEntity + ldr r0, _080A2C90 @ =gPlayerEntity lsls r1, r1, #8 movs r2, #0x10 bl sub_080044AE b _080A2CBA .align 2, 0 -_080A2C90: .4byte gLinkEntity +_080A2C90: .4byte gPlayerEntity _080A2C94: ldrh r5, [r4, #0x2e] adds r0, r4, #0 @@ -285,14 +285,14 @@ _080A2C94: beq _080A2CBA cmp r6, #0 beq _080A2CBA - ldr r0, _080A2CBC @ =gLinkEntity + ldr r0, _080A2CBC @ =gPlayerEntity lsls r1, r1, #8 movs r2, #0x18 bl sub_080044AE _080A2CBA: pop {r4, r5, r6, pc} .align 2, 0 -_080A2CBC: .4byte gLinkEntity +_080A2CBC: .4byte gPlayerEntity thumb_func_start sub_080A2CC0 sub_080A2CC0: @ 0x080A2CC0 @@ -422,7 +422,7 @@ _080A2D94: .4byte gUnk_081271D4 sub_080A2D98: @ 0x080A2D98 push {r4, lr} adds r4, r0, #0 - ldr r0, _080A2DD0 @ =gLinkState + ldr r0, _080A2DD0 @ =gPlayerState str r4, [r0, #0x2c] movs r2, #0 movs r0, #1 @@ -449,12 +449,12 @@ sub_080A2D98: @ 0x080A2D98 str r1, [r4, #0x7c] b _080A2DDA .align 2, 0 -_080A2DD0: .4byte gLinkState +_080A2DD0: .4byte gPlayerState _080A2DD4: .4byte gUnk_081271DC _080A2DD8: str r2, [r4, #0x70] _080A2DDA: - ldr r0, _080A2DFC @ =gLinkEntity + ldr r0, _080A2DFC @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r0, #0xe ands r0, r1 @@ -469,13 +469,13 @@ _080A2DDA: bl sub_080A2E00 pop {r4, pc} .align 2, 0 -_080A2DFC: .4byte gLinkEntity +_080A2DFC: .4byte gPlayerEntity thumb_func_start sub_080A2E00 sub_080A2E00: @ 0x080A2E00 push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r0, _080A2E90 @ =gLinkEntity + ldr r0, _080A2E90 @ =gPlayerEntity mov ip, r0 mov r1, ip adds r1, #0x3d @@ -507,7 +507,7 @@ _080A2E1A: strb r2, [r3] strb r2, [r5] _080A2E40: - ldr r0, _080A2E94 @ =gLinkState + ldr r0, _080A2E94 @ =gPlayerState ldrb r3, [r0, #3] adds r7, r0, #0 cmp r3, #0 @@ -527,7 +527,7 @@ _080A2E40: adds r0, r0, r1 ldr r0, [r0] str r0, [r4, #0x48] - ldr r0, _080A2E90 @ =gLinkEntity + ldr r0, _080A2E90 @ =gPlayerEntity adds r0, #0x3c ldrb r0, [r0] adds r0, #1 @@ -547,8 +547,8 @@ _080A2E40: bl sub_080176E4 b _080A2F30 .align 2, 0 -_080A2E90: .4byte gLinkEntity -_080A2E94: .4byte gLinkState +_080A2E90: .4byte gPlayerEntity +_080A2E94: .4byte gPlayerState _080A2E98: .4byte gUnk_08127240 _080A2E9C: adds r0, r4, #0 @@ -626,7 +626,7 @@ _080A2F20: _080A2F2C: bl DeleteThisEntity _080A2F30: - ldr r6, _080A301C @ =gLinkEntity + ldr r6, _080A301C @ =gPlayerEntity ldrh r0, [r6, #0x12] cmp r0, #1 beq _080A2F3E @@ -689,7 +689,7 @@ _080A2FA2: ldrb r0, [r5] cmp r0, #0xe bne _080A303E - ldr r0, _080A301C @ =gLinkEntity + ldr r0, _080A301C @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] movs r0, #0x7f @@ -708,7 +708,7 @@ _080A2FA2: ldr r1, [r4, #0x7c] adds r2, r1, r0 ldrb r0, [r2] - ldr r7, _080A3020 @ =gLinkState + ldr r7, _080A3020 @ =gPlayerState cmp r0, #0xff bne _080A2FEC ldrb r1, [r7, #3] @@ -735,7 +735,7 @@ _080A2FEC: ands r0, r1 cmp r0, #0 beq _080A3028 - ldr r0, _080A301C @ =gLinkEntity + ldr r0, _080A301C @ =gPlayerEntity adds r0, #0x5a ldrb r0, [r0] movs r1, #0x7f @@ -748,11 +748,11 @@ _080A2FEC: bl sub_080042D0 b _080A303E .align 2, 0 -_080A301C: .4byte gLinkEntity -_080A3020: .4byte gLinkState +_080A301C: .4byte gPlayerEntity +_080A3020: .4byte gPlayerState _080A3024: .4byte gUnk_081271DC _080A3028: - ldr r0, _080A3060 @ =gLinkEntity + ldr r0, _080A3060 @ =gPlayerEntity adds r0, #0x5a ldrb r0, [r0] movs r1, #0x7f @@ -763,7 +763,7 @@ _080A3028: adds r0, r4, #0 bl sub_080042D0 _080A303E: - ldr r1, _080A3060 @ =gLinkEntity + ldr r1, _080A3060 @ =gPlayerEntity adds r0, r1, #0 adds r0, #0x5a ldrb r0, [r0] @@ -779,7 +779,7 @@ _080A303E: bl sub_08078E84 b _080A3068 .align 2, 0 -_080A3060: .4byte gLinkEntity +_080A3060: .4byte gPlayerEntity _080A3064: movs r0, #0xff strb r0, [r4, #0x1e] @@ -819,7 +819,7 @@ sub_080A3084: @ 0x080A3084 ldrb r0, [r4, #0xa] cmp r0, #0 bne _080A30F8 - ldr r0, _080A30EC @ =gLinkEntity + ldr r0, _080A30EC @ =gPlayerEntity adds r0, #0x3c ldrb r0, [r0] adds r0, #1 @@ -851,7 +851,7 @@ _080A30CC: bl PlaySFX b _080A30FC .align 2, 0 -_080A30EC: .4byte gLinkEntity +_080A30EC: .4byte gPlayerEntity _080A30F0: .4byte gUnk_08127278 _080A30F4: .4byte 0x0000013F _080A30F8: @@ -920,7 +920,7 @@ _080A315C: ands r1, r3 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _080A31F4 @ =gLinkEntity + ldr r1, _080A31F4 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] movs r2, #0x80 @@ -974,7 +974,7 @@ _080A31D6: b _080A3200 .align 2, 0 _080A31F0: .4byte gRoomControls -_080A31F4: .4byte gLinkEntity +_080A31F4: .4byte gPlayerEntity _080A31F8: .4byte gUnk_08003E44 _080A31FC: bl DeleteThisEntity diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index e6f6a7cc..c49c5872 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -1835,7 +1835,7 @@ _080A6392: bl __divsi3 adds r0, #0xc strh r0, [r5, #2] - ldr r0, _080A642C @ =gLinkState + ldr r0, _080A642C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #8 ands r0, r1 @@ -1875,7 +1875,7 @@ _080A63EA: _080A6420: .4byte gMenu _080A6424: .4byte gUnk_03001010 _080A6428: .4byte gScreenTransition -_080A642C: .4byte gLinkState +_080A642C: .4byte gPlayerState _080A6430: .4byte 0x000001FB _080A6434: .4byte gUnk_08128DE8 @@ -2459,7 +2459,7 @@ _080A68D0: .4byte gUnk_02019EE0 thumb_func_start sub_080A68D4 sub_080A68D4: @ 0x080A68D4 push {r4, r5, r6, lr} - ldr r0, _080A690C @ =gLinkState + ldr r0, _080A690C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #8 ands r0, r1 @@ -2485,7 +2485,7 @@ _080A68E6: movs r5, #0 b _080A693A .align 2, 0 -_080A690C: .4byte gLinkState +_080A690C: .4byte gPlayerState _080A6910: .4byte gScreenTransition _080A6914: .4byte 0x000001FB _080A6918: .4byte gUnk_02002A40 @@ -2791,7 +2791,7 @@ sub_080A6B04: @ 0x080A6B04 movs r2, #0x80 lsls r2, r2, #5 bl _DmaFill16 - ldr r0, _080A6C0C @ =gLinkState + ldr r0, _080A6C0C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #8 ands r0, r1 @@ -2858,7 +2858,7 @@ _080A6BFC: .4byte gMenu _080A6C00: .4byte 0x0000475F _080A6C04: .4byte 0x00005001 _080A6C08: .4byte gUnk_02001A40 -_080A6C0C: .4byte gLinkState +_080A6C0C: .4byte gPlayerState _080A6C10: .4byte gScreenTransition _080A6C14: .4byte 0x000001FB _080A6C18: .4byte gUnk_08128E94 @@ -3128,7 +3128,7 @@ sub_080A6DF8: @ 0x080A6DF8 _080A6E14: .4byte gMenu _080A6E18: bl sub_080791D0 - ldr r0, _080A6E3C @ =gLinkEntity + ldr r0, _080A6E3C @ =gPlayerEntity adds r1, r0, #0 adds r1, #0x58 ldrb r1, [r1] @@ -3143,7 +3143,7 @@ _080A6E18: _080A6E3A: pop {pc} .align 2, 0 -_080A6E3C: .4byte gLinkEntity +_080A6E3C: .4byte gPlayerEntity _080A6E40: .4byte gUnk_02034490 thumb_func_start sub_080A6E44 @@ -3722,7 +3722,7 @@ sub_080A7250: @ 0x080A7250 adds r0, #0x2f ldrb r0, [r0] strb r0, [r1, #0xd] - ldr r0, _080A7318 @ =gLinkState + ldr r0, _080A7318 @ =gPlayerState adds r0, #0x8b ldrb r0, [r0] strb r0, [r1, #0xc] @@ -3752,7 +3752,7 @@ _080A7308: .4byte gRoomControls _080A730C: .4byte gUnk_03000420 _080A7310: .4byte gUnk_02033280 _080A7314: .4byte gScreenTransition -_080A7318: .4byte gLinkState +_080A7318: .4byte gPlayerState _080A731C: .4byte gUnk_02017654 _080A7320: .4byte gUnk_02025EB0 _080A7324: .4byte gUnk_0200B650 @@ -3823,7 +3823,7 @@ _080A73B4: ldr r5, _080A7470 @ =gUnk_02032EC0 ldr r0, [r5, #0x10] str r0, [r1] - ldr r0, _080A7474 @ =gLinkState + ldr r0, _080A7474 @ =gPlayerState ldrb r1, [r5, #0xc] adds r0, #0x8b strb r1, [r0] @@ -3896,7 +3896,7 @@ _080A73B4: _080A7468: .4byte gUnk_03000FD0 _080A746C: .4byte gUnk_02017654 _080A7470: .4byte gUnk_02032EC0 -_080A7474: .4byte gLinkState +_080A7474: .4byte gPlayerState _080A7478: .4byte gUnk_02025EB0 _080A747C: .4byte gUnk_0200B650 _080A7480: .4byte gUnk_02033280 @@ -3996,7 +3996,7 @@ sub_080A7544: @ 0x080A7544 ldrb r0, [r4, #0xa] cmp r0, #0 bne _080A7582 - ldr r1, _080A7588 @ =gLinkEntity + ldr r1, _080A7588 @ =gPlayerEntity adds r0, r4, #0 bl sub_08078E84 ldr r1, [r4, #0x48] @@ -4017,7 +4017,7 @@ _080A7582: pop {r4, pc} .align 2, 0 _080A7584: .4byte gUnk_0812905C -_080A7588: .4byte gLinkEntity +_080A7588: .4byte gPlayerEntity thumb_func_start sub_080A758C sub_080A758C: @ 0x080A758C @@ -4026,7 +4026,7 @@ sub_080A758C: @ 0x080A758C ldrb r0, [r5, #0xa] cmp r0, #0 bne _080A75AC - ldr r1, _080A7654 @ =gLinkState + ldr r1, _080A7654 @ =gPlayerState ldrb r0, [r1, #4] cmp r0, #0 bne _080A75AC @@ -4047,7 +4047,7 @@ _080A75BA: movs r1, #1 movs r2, #3 bl sub_080AE008 - ldr r1, _080A7658 @ =gLinkEntity + ldr r1, _080A7658 @ =gPlayerEntity adds r0, r1, #0 adds r0, #0x3c ldrb r0, [r0] @@ -4087,7 +4087,7 @@ _080A75BA: ldrb r0, [r5, #0xa] cmp r0, #0 bne _080A76BC - ldr r2, _080A7654 @ =gLinkState + ldr r2, _080A7654 @ =gPlayerState ldrb r1, [r2, #2] movs r0, #0x20 ands r0, r1 @@ -4119,8 +4119,8 @@ _080A75BA: movs r0, #0x1a b _080A766A .align 2, 0 -_080A7654: .4byte gLinkState -_080A7658: .4byte gLinkEntity +_080A7654: .4byte gPlayerState +_080A7658: .4byte gPlayerEntity _080A765C: adds r1, r5, #0 adds r1, #0x40 @@ -4151,7 +4151,7 @@ _080A767A: adds r0, r5, #0 bl sub_080A76CC _080A7692: - ldr r0, _080A76B0 @ =gLinkState + ldr r0, _080A76B0 @ =gPlayerState str r5, [r0, #0x2c] adds r0, r5, #0 bl sub_08079BD8 @@ -4164,7 +4164,7 @@ _080A7692: bl PlaySFX b _080A76C2 .align 2, 0 -_080A76B0: .4byte gLinkState +_080A76B0: .4byte gPlayerState _080A76B4: .4byte gUnk_0812906C _080A76B8: .4byte gUnk_08129068 _080A76BC: @@ -4185,7 +4185,7 @@ sub_080A76CC: @ 0x080A76CC beq _080A76D8 b _080A77DC _080A76D8: - ldr r5, _080A771C @ =gLinkState + ldr r5, _080A771C @ =gPlayerState ldr r0, [r5, #0x2c] cmp r0, r4 beq _080A76E4 @@ -4219,7 +4219,7 @@ _080A76F2: movs r0, #0xa b _080A7726 .align 2, 0 -_080A771C: .4byte gLinkState +_080A771C: .4byte gPlayerState _080A7720: movs r0, #8 b _080A7726 @@ -4228,7 +4228,7 @@ _080A7724: _080A7726: strb r0, [r1] _080A7728: - ldr r0, _080A7740 @ =gLinkEntity + ldr r0, _080A7740 @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] movs r0, #0x20 @@ -4240,7 +4240,7 @@ _080A7728: bl PlaySFX b _080A77C4 .align 2, 0 -_080A7740: .4byte gLinkEntity +_080A7740: .4byte gPlayerEntity _080A7744: ldr r0, [r5, #0x30] movs r1, #0x80 @@ -4264,14 +4264,14 @@ _080A7762: _080A7768: strb r0, [r1] _080A776A: - ldr r0, _080A77D0 @ =gLinkState + ldr r0, _080A77D0 @ =gPlayerState adds r0, #0x3e ldrb r0, [r0] movs r2, #3 ands r2, r0 cmp r2, #0 beq _080A77C4 - ldr r0, _080A77D4 @ =gLinkEntity + ldr r0, _080A77D4 @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] movs r0, #0x40 @@ -4311,16 +4311,16 @@ _080A77BE: adds r0, r0, r1 strh r0, [r2, #0x2e] _080A77C4: - ldr r1, _080A77D4 @ =gLinkEntity + ldr r1, _080A77D4 @ =gPlayerEntity adds r0, r4, #0 bl sub_080A78B8 b _080A7806 .align 2, 0 -_080A77D0: .4byte gLinkState -_080A77D4: .4byte gLinkEntity +_080A77D0: .4byte gPlayerState +_080A77D4: .4byte gPlayerEntity _080A77D8: .4byte gUnk_081292E2 _080A77DC: - ldr r1, _080A7810 @ =gLinkState + ldr r1, _080A7810 @ =gPlayerState ldrb r0, [r1, #4] cmp r0, #0 beq _080A7814 @@ -4345,7 +4345,7 @@ _080A7806: bl sub_080A7A84 b _080A7820 .align 2, 0 -_080A7810: .4byte gLinkState +_080A7810: .4byte gPlayerState _080A7814: movs r0, #0xff strb r0, [r4, #0x1e] @@ -4361,7 +4361,7 @@ _080A7820: sub_080A7824: @ 0x080A7824 push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r5, _080A7860 @ =gLinkState + ldr r5, _080A7860 @ =gPlayerState ldr r0, [r5, #0x2c] cmp r0, r4 beq _080A7834 @@ -4376,7 +4376,7 @@ _080A7834: str r0, [r5, #0x2c] bl DeleteThisEntity _080A7846: - ldr r2, _080A7864 @ =gLinkEntity + ldr r2, _080A7864 @ =gPlayerEntity adds r6, r2, #0 adds r6, #0x5a ldrb r1, [r6] @@ -4389,8 +4389,8 @@ _080A7846: bl DeleteThisEntity b _080A78B4 .align 2, 0 -_080A7860: .4byte gLinkState -_080A7864: .4byte gLinkEntity +_080A7860: .4byte gPlayerState +_080A7864: .4byte gPlayerEntity _080A7868: adds r0, r4, #0 adds r1, r2, #0 @@ -4441,7 +4441,7 @@ sub_080A78B8: @ 0x080A78B8 push {r7} adds r4, r0, #0 adds r6, r1, #0 - ldr r0, _080A78E8 @ =gLinkState + ldr r0, _080A78E8 @ =gPlayerState ldrb r1, [r0, #0x1b] movs r0, #0x20 ands r0, r1 @@ -4461,7 +4461,7 @@ sub_080A78B8: @ 0x080A78B8 adds r1, #0xb1 b _080A78F2 .align 2, 0 -_080A78E8: .4byte gLinkState +_080A78E8: .4byte gPlayerState _080A78EC: .4byte gScreenTransition _080A78F0: ldrb r1, [r4, #0x1e] @@ -4482,7 +4482,7 @@ _080A78FC: adds r0, r4, #0 bl sub_080042D0 _080A7912: - ldr r2, _080A792C @ =gLinkState + ldr r2, _080A792C @ =gPlayerState ldrb r1, [r2, #0x1b] movs r0, #0x40 ands r0, r1 @@ -4495,7 +4495,7 @@ _080A7912: ands r0, r1 b _080A7958 .align 2, 0 -_080A792C: .4byte gLinkState +_080A792C: .4byte gPlayerState _080A7930: ldrb r1, [r6, #0x14] movs r0, #2 @@ -4657,7 +4657,7 @@ _080A7A4C: thumb_func_start sub_080A7A54 sub_080A7A54: @ 0x080A7A54 - ldr r1, _080A7A7C @ =gLinkEntity + ldr r1, _080A7A7C @ =gPlayerEntity ldrb r1, [r1, #0x1e] subs r1, #0x6a lsls r1, r1, #2 @@ -4677,14 +4677,14 @@ sub_080A7A54: @ 0x080A7A54 strb r0, [r2, #7] bx lr .align 2, 0 -_080A7A7C: .4byte gLinkEntity +_080A7A7C: .4byte gPlayerEntity _080A7A80: .4byte gUnk_08129096 thumb_func_start sub_080A7A84 sub_080A7A84: @ 0x080A7A84 push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r6, _080A7AE0 @ =gLinkEntity + ldr r6, _080A7AE0 @ =gPlayerEntity adds r0, r6, #0 adds r0, #0x5a ldrb r0, [r0] @@ -4702,7 +4702,7 @@ sub_080A7A84: @ 0x080A7A84 adds r0, r0, r2 movs r5, #0 ldrsb r5, [r0, r5] - ldr r2, _080A7AE8 @ =gLinkState + ldr r2, _080A7AE8 @ =gPlayerState ldrb r1, [r2, #0x1b] movs r0, #0xc0 ands r0, r1 @@ -4729,9 +4729,9 @@ _080A7AC4: bl sub_08008796 b _080A7B8C .align 2, 0 -_080A7AE0: .4byte gLinkEntity +_080A7AE0: .4byte gPlayerEntity _080A7AE4: .4byte gUnk_08129072 -_080A7AE8: .4byte gLinkState +_080A7AE8: .4byte gPlayerState _080A7AEC: ldr r0, [r4, #0x34] cmp r0, #0 @@ -4769,15 +4769,15 @@ _080A7AEC: bl sub_080002B4 cmp r0, #0x2e bne _080A7B4C - ldr r0, _080A7B44 @ =gLinkEntity + ldr r0, _080A7B44 @ =gPlayerEntity ldr r1, _080A7B48 @ =0x00000119 bl sub_0800449C b _080A7B54 .align 2, 0 -_080A7B44: .4byte gLinkEntity +_080A7B44: .4byte gPlayerEntity _080A7B48: .4byte 0x00000119 _080A7B4C: - ldr r0, _080A7B90 @ =gLinkEntity + ldr r0, _080A7B90 @ =gPlayerEntity movs r1, #0x74 bl sub_0800449C _080A7B54: @@ -4811,7 +4811,7 @@ _080A7B54: _080A7B8C: pop {r4, r5, r6, r7, pc} .align 2, 0 -_080A7B90: .4byte gLinkEntity +_080A7B90: .4byte gPlayerEntity _080A7B94: .4byte gUnk_0812908E thumb_func_start sub_080A7B98 @@ -4822,7 +4822,7 @@ sub_080A7B98: @ 0x080A7B98 mov r5, r8 push {r5, r6, r7} adds r6, r0, #0 - ldr r0, _080A7BFC @ =gLinkState + ldr r0, _080A7BFC @ =gPlayerState adds r0, #0xac ldrh r1, [r0] movs r0, #8 @@ -4868,7 +4868,7 @@ _080A7BCE: mov sl, r5 pop {r4, r5, r6, r7, pc} .align 2, 0 -_080A7BFC: .4byte gLinkState +_080A7BFC: .4byte gPlayerState thumb_func_start CreateItemEntity CreateItemEntity: @ 0x080A7C00 @@ -4891,7 +4891,7 @@ sub_080A7C18: @ 0x080A7C18 adds r2, r0, #0 cmp r2, #0 beq _080A7C32 - ldr r0, _080A7C34 @ =gLinkEntity + ldr r0, _080A7C34 @ =gPlayerEntity str r0, [r2, #0x50] ldrb r1, [r2, #0xa] adds r0, r2, #0 @@ -4900,7 +4900,7 @@ sub_080A7C18: @ 0x080A7C18 _080A7C32: pop {pc} .align 2, 0 -_080A7C34: .4byte gLinkEntity +_080A7C34: .4byte gPlayerEntity thumb_func_start GiveItemWithCutscene GiveItemWithCutscene: @ 0x080A7C38 @@ -5331,7 +5331,7 @@ _080A7F38: cmp r0, #0 beq _080A7F56 ldr r1, [r4, #0x4c] - ldr r0, _080A7F7C @ =gLinkEntity + ldr r0, _080A7F7C @ =gPlayerEntity cmp r1, r0 bne _080A7F56 adds r1, r4, #0 @@ -5357,7 +5357,7 @@ _080A7F56: _080A7F7A: pop {r4, pc} .align 2, 0 -_080A7F7C: .4byte gLinkEntity +_080A7F7C: .4byte gPlayerEntity thumb_func_start sub_080A7F80 sub_080A7F80: @ 0x080A7F80 @@ -6393,7 +6393,7 @@ _080A8700: ands r0, r1 cmp r0, #3 bne _080A8768 - ldr r0, _080A875C @ =gLinkState + ldr r0, _080A875C @ =gPlayerState ldrb r0, [r0, #0xf] cmp r0, #0 beq _080A876E @@ -6412,7 +6412,7 @@ _080A8700: ands r1, r3 lsls r1, r1, #6 orrs r0, r1 - ldr r1, _080A8764 @ =gLinkEntity + ldr r1, _080A8764 @ =gPlayerEntity adds r1, #0x38 ldrb r1, [r1] bl sub_080002E0 @@ -6430,9 +6430,9 @@ _080A8700: bl DeleteThisEntity b _080A876E .align 2, 0 -_080A875C: .4byte gLinkState +_080A875C: .4byte gPlayerState _080A8760: .4byte gRoomControls -_080A8764: .4byte gLinkEntity +_080A8764: .4byte gPlayerEntity _080A8768: adds r0, r4, #0 bl DeleteEntity @@ -6549,7 +6549,7 @@ sub_080A881C: @ 0x080A881C ldrb r0, [r0] cmp r0, #0x80 bne _080A884A - ldr r0, _080A8850 @ =gLinkState + ldr r0, _080A8850 @ =gPlayerState movs r1, #0xf0 strb r1, [r0, #0xf] movs r0, #2 @@ -6559,7 +6559,7 @@ _080A884A: bl DeleteThisEntity b _080A8866 .align 2, 0 -_080A8850: .4byte gLinkState +_080A8850: .4byte gPlayerState _080A8854: ldrb r0, [r1, #0xc] cmp r0, #1 @@ -6713,7 +6713,7 @@ _080A8962: ldrh r0, [r4, #0x36] adds r0, #0xe strh r0, [r4, #0x36] - ldr r1, _080A8984 @ =gLinkEntity + ldr r1, _080A8984 @ =gPlayerEntity adds r0, r4, #0 movs r2, #0xe movs r3, #0xe @@ -6728,7 +6728,7 @@ _080A8962: _080A8982: pop {r4, r5, r6, pc} .align 2, 0 -_080A8984: .4byte gLinkEntity +_080A8984: .4byte gPlayerEntity thumb_func_start sub_080A8988 sub_080A8988: @ 0x080A8988 @@ -7403,7 +7403,7 @@ _080A8E88: bge _080A8E8E b _080A8FAE _080A8E8E: - ldr r0, _080A8EC0 @ =gLinkEntity + ldr r0, _080A8EC0 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r3, #0x32 @@ -7426,7 +7426,7 @@ _080A8E8E: adds r4, r4, r2 b _080A8ECE .align 2, 0 -_080A8EC0: .4byte gLinkEntity +_080A8EC0: .4byte gPlayerEntity _080A8EC4: .4byte 0x000001FF _080A8EC8: .4byte gScreenTransition _080A8ECC: @@ -7582,7 +7582,7 @@ _080A8FE8: bne _080A901C movs r0, #0x1e strb r0, [r4, #0xf] - ldr r1, _080A9048 @ =gLinkEntity + ldr r1, _080A9048 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r1, r0, #0 @@ -7608,7 +7608,7 @@ _080A901C: bl InitializeAnimation b _080A9054 .align 2, 0 -_080A9048: .4byte gLinkEntity +_080A9048: .4byte gPlayerEntity _080A904C: adds r0, r4, #0 movs r1, #0x52 @@ -7781,7 +7781,7 @@ _080A917C: cmp r0, #0 beq _080A9198 ldr r1, [r5, #0x4c] - ldr r0, _080A91A0 @ =gLinkEntity + ldr r0, _080A91A0 @ =gPlayerEntity cmp r1, r0 bne _080A9198 adds r0, r5, #0 @@ -7791,7 +7791,7 @@ _080A9198: bl DeleteEntity b _080A91D8 .align 2, 0 -_080A91A0: .4byte gLinkEntity +_080A91A0: .4byte gPlayerEntity _080A91A4: ldr r1, _080A91DC @ =gUnk_08129998 ldrb r0, [r4, #0x14] @@ -8513,7 +8513,7 @@ _080A96F8: bl InitializeAnimation b _080A9756 _080A9718: - ldr r0, _080A9760 @ =gLinkEntity + ldr r0, _080A9760 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition ldr r0, _080A9764 @ =0xFF600000 @@ -8544,7 +8544,7 @@ _080A9756: bl PlaySFX pop {r4, r5, pc} .align 2, 0 -_080A9760: .4byte gLinkEntity +_080A9760: .4byte gPlayerEntity _080A9764: .4byte 0xFF600000 _080A9768: .4byte 0x000001B5 @@ -9374,7 +9374,7 @@ sub_080A9D2C: @ 0x080A9D2C movs r0, #2 rsbs r0, r0, #0 bl ModHealth - ldr r0, _080A9D68 @ =gLinkEntity + ldr r0, _080A9D68 @ =gPlayerEntity movs r1, #0x7a bl sub_0800449C bl sub_08079D84 @@ -9387,7 +9387,7 @@ _080A9D56: _080A9D64: pop {r4, pc} .align 2, 0 -_080A9D68: .4byte gLinkEntity +_080A9D68: .4byte gPlayerEntity thumb_func_start sub_080A9D6C sub_080A9D6C: @ 0x080A9D6C @@ -10728,7 +10728,7 @@ sub_080AA78C: @ 0x080AA78C ldrb r0, [r4, #0xd] cmp r0, #0 bne _080AA7DA - ldr r0, _080AA7C8 @ =gLinkEntity + ldr r0, _080AA7C8 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r2, r0, #1 ldrb r0, [r4, #0xa] @@ -10753,7 +10753,7 @@ sub_080AA78C: @ 0x080AA78C bl sub_080AA6C0 b _080AA832 .align 2, 0 -_080AA7C8: .4byte gLinkEntity +_080AA7C8: .4byte gPlayerEntity _080AA7CC: movs r0, #1 strb r0, [r4, #0xd] @@ -10881,7 +10881,7 @@ _080AA8B4: .4byte gUnk_0812A05C sub_080AA8B8: @ 0x080AA8B8 push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r7, _080AA99C @ =gLinkEntity + ldr r7, _080AA99C @ =gPlayerEntity adds r0, #0x84 ldrb r0, [r0] cmp r0, #0 @@ -10936,7 +10936,7 @@ _080AA920: ldrb r2, [r4, #0xa] cmp r0, r2 bne _080AA99A - ldr r1, _080AA9A4 @ =gLinkState + ldr r1, _080AA9A4 @ =gPlayerState adds r0, r1, #0 adds r0, #0xa8 ldrb r0, [r0] @@ -10948,7 +10948,7 @@ _080AA920: ands r0, r1 cmp r0, #0 beq _080AA99A - ldr r0, _080AA99C @ =gLinkEntity + ldr r0, _080AA99C @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] adds r0, r2, #0 @@ -10993,9 +10993,9 @@ _080AA920: _080AA99A: pop {r4, r5, r6, r7, pc} .align 2, 0 -_080AA99C: .4byte gLinkEntity +_080AA99C: .4byte gPlayerEntity _080AA9A0: .4byte gUnk_0812A064 -_080AA9A4: .4byte gLinkState +_080AA9A4: .4byte gPlayerState _080AA9A8: .4byte gUnk_0812A06C thumb_func_start sub_080AA9AC @@ -11037,16 +11037,16 @@ sub_080AA9E0: @ 0x080AA9E0 ands r0, r1 cmp r0, #0 beq _080AAA00 - ldr r0, _080AA9FC @ =gLinkEntity + ldr r0, _080AA9FC @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r2, #0x2e ldrsh r0, [r5, r2] b _080AAA0A .align 2, 0 -_080AA9FC: .4byte gLinkEntity +_080AA9FC: .4byte gPlayerEntity _080AAA00: - ldr r0, _080AAA24 @ =gLinkEntity + ldr r0, _080AAA24 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r0, r2] movs r2, #0x32 @@ -11065,7 +11065,7 @@ _080AAA0A: beq _080AAA30 b _080AAA40 .align 2, 0 -_080AAA24: .4byte gLinkEntity +_080AAA24: .4byte gPlayerEntity _080AAA28: .4byte gUnk_0812A074 _080AAA2C: cmp r2, #3 @@ -11381,19 +11381,19 @@ sub_080AAC44: @ 0x080AAC44 ldrb r0, [r4, #0xa] cmp r0, #0 bne _080AAC84 - ldr r0, _080AAC80 @ =gLinkEntity + ldr r0, _080AAC80 @ =gPlayerEntity adds r1, r4, #0 bl ResolveEntityOnTop b _080AAC8C .align 2, 0 -_080AAC80: .4byte gLinkEntity +_080AAC80: .4byte gPlayerEntity _080AAC84: ldr r0, [r4, #0x50] adds r1, r4, #0 bl ResolveEntityOnTop _080AAC8C: - bl ResetLink - ldr r2, _080AACB4 @ =gLinkState + bl ResetPlayer + ldr r2, _080AACB4 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r1, r0 @@ -11402,7 +11402,7 @@ _080AAC8C: orrs r0, r1 strb r0, [r2, #0xa] _080AACA0: - ldr r0, _080AACB8 @ =gLinkEntity + ldr r0, _080AACB8 @ =gPlayerEntity adds r0, #0x45 ldrb r1, [r0] cmp r1, #0 @@ -11412,8 +11412,8 @@ _080AACA0: strb r1, [r0] b _080AACCA .align 2, 0 -_080AACB4: .4byte gLinkState -_080AACB8: .4byte gLinkEntity +_080AACB4: .4byte gPlayerState +_080AACB8: .4byte gPlayerEntity _080AACBC: ldr r0, _080AACDC @ =0x00000119 bl PlaySFX @@ -11620,7 +11620,7 @@ _080AADE0: ands r0, r1 orrs r0, r3 strb r0, [r2] - ldr r1, _080AAE60 @ =gLinkEntity + ldr r1, _080AAE60 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection strb r0, [r5, #0x15] @@ -11644,7 +11644,7 @@ _080AADE0: str r5, [r1, #0x50] b _080AAE7C .align 2, 0 -_080AAE60: .4byte gLinkEntity +_080AAE60: .4byte gPlayerEntity _080AAE64: ldr r0, [r5, #0x50] adds r1, r5, #0 @@ -11688,7 +11688,7 @@ _080AAEA2: bne _080AAEC2 movs r0, #4 strb r0, [r4, #0xf] - ldr r1, _080AAECC @ =gLinkEntity + ldr r1, _080AAECC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r1, r0, #0 @@ -11699,7 +11699,7 @@ _080AAEC2: bl sub_0806F69C b _080AAEF6 .align 2, 0 -_080AAECC: .4byte gLinkEntity +_080AAECC: .4byte gPlayerEntity _080AAED0: ldr r0, [r4, #0x50] cmp r0, #0 @@ -11816,7 +11816,7 @@ _080AAF94: bne _080AAFCC movs r0, #0x1e strb r0, [r5, #0xe] - ldr r4, _080AAFFC @ =gLinkEntity + ldr r4, _080AAFFC @ =gPlayerEntity adds r1, r4, #0 adds r1, #0x3d movs r0, #8 @@ -11849,22 +11849,22 @@ _080AAFE0: movs r0, #1 strb r0, [r5, #0xc] strb r2, [r1] - ldr r0, _080AAFFC @ =gLinkEntity + ldr r0, _080AAFFC @ =gPlayerEntity adds r0, #0x3d movs r1, #0xf0 strb r1, [r0] - ldr r0, _080AB000 @ =gLinkState + ldr r0, _080AB000 @ =gPlayerState strb r2, [r0, #0x1a] adds r0, r5, #0 adds r0, #0x45 strb r2, [r0] b _080AB028 .align 2, 0 -_080AAFFC: .4byte gLinkEntity -_080AB000: .4byte gLinkState +_080AAFFC: .4byte gPlayerEntity +_080AB000: .4byte gPlayerState _080AB004: - bl ResetLink - ldr r2, _080AB02C @ =gLinkState + bl ResetPlayer + ldr r2, _080AB02C @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r1, r0 @@ -11872,7 +11872,7 @@ _080AB004: ldrb r1, [r2, #0xa] orrs r0, r1 strb r0, [r2, #0xa] - ldr r4, _080AB030 @ =gLinkEntity + ldr r4, _080AB030 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 bl CopyPosition @@ -11882,8 +11882,8 @@ _080AB004: _080AB028: pop {r4, r5, pc} .align 2, 0 -_080AB02C: .4byte gLinkState -_080AB030: .4byte gLinkEntity +_080AB02C: .4byte gPlayerState +_080AB030: .4byte gPlayerEntity thumb_func_start sub_080AB034 sub_080AB034: @ 0x080AB034 @@ -13568,7 +13568,7 @@ sub_080ABC90: @ 0x080ABC90 movs r0, #2 rsbs r0, r0, #0 bl ModHealth - ldr r0, _080ABCC0 @ =gLinkEntity + ldr r0, _080ABCC0 @ =gPlayerEntity movs r1, #0x7a bl sub_0800449C bl sub_08079D84 @@ -13580,7 +13580,7 @@ sub_080ABC90: @ 0x080ABC90 _080ABCBE: pop {r4, pc} .align 2, 0 -_080ABCC0: .4byte gLinkEntity +_080ABCC0: .4byte gPlayerEntity thumb_func_start sub_080ABCC4 sub_080ABCC4: @ 0x080ABCC4 @@ -13906,7 +13906,7 @@ sub_080ABF40: @ 0x080ABF40 bne _080ABF66 movs r0, #1 strb r0, [r4, #0xc] - ldr r1, _080ABFA0 @ =gLinkEntity + ldr r1, _080ABFA0 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -13943,7 +13943,7 @@ _080ABF88: _080ABF9C: pop {r4, pc} .align 2, 0 -_080ABFA0: .4byte gLinkEntity +_080ABFA0: .4byte gPlayerEntity _080ABFA4: .4byte 0x00000199 thumb_func_start sub_080ABFA8 @@ -14102,7 +14102,7 @@ _080AC0B2: bne _080AC0F0 movs r0, #2 strb r0, [r4, #0xc] - ldr r1, _080AC0EC @ =gLinkEntity + ldr r1, _080AC0EC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -14114,7 +14114,7 @@ _080AC0B2: b _080AC0F8 .align 2, 0 _080AC0E8: .4byte 0x00000149 -_080AC0EC: .4byte gLinkEntity +_080AC0EC: .4byte gPlayerEntity _080AC0F0: movs r0, #3 strb r0, [r4, #0xc] @@ -14167,7 +14167,7 @@ _080AC13A: ands r0, r1 cmp r0, #0 bne _080AC160 - ldr r1, _080AC164 @ =gLinkEntity + ldr r1, _080AC164 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r1, r0, #0 @@ -14176,7 +14176,7 @@ _080AC13A: _080AC160: pop {r4, pc} .align 2, 0 -_080AC164: .4byte gLinkEntity +_080AC164: .4byte gPlayerEntity thumb_func_start sub_080AC168 sub_080AC168: @ 0x080AC168 @@ -14205,7 +14205,7 @@ sub_080AC168: @ 0x080AC168 adds r0, r5, r0 ldrb r0, [r0] strb r0, [r4, #0xf] - ldr r1, _080AC1C8 @ =gLinkEntity + ldr r1, _080AC1C8 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r1, r0, #0 @@ -14223,7 +14223,7 @@ sub_080AC168: @ 0x080AC168 .align 2, 0 _080AC1C0: .4byte 0xFFFF8000 _080AC1C4: .4byte gUnk_0812A982 -_080AC1C8: .4byte gLinkEntity +_080AC1C8: .4byte gPlayerEntity _080AC1CC: .4byte gUnk_0812A98A _080AC1D0: cmp r0, #2 @@ -15295,7 +15295,7 @@ _080AC964: movs r1, #0x80 orrs r0, r1 strb r0, [r5, #0x10] - ldr r1, _080AC9C8 @ =gLinkEntity + ldr r1, _080AC9C8 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection strb r0, [r5, #0x15] @@ -15306,7 +15306,7 @@ _080AC9C0: pop {r4, r5, pc} .align 2, 0 _080AC9C4: .4byte gSineTable -_080AC9C8: .4byte gLinkEntity +_080AC9C8: .4byte gPlayerEntity thumb_func_start sub_080AC9CC sub_080AC9CC: @ 0x080AC9CC @@ -15586,7 +15586,7 @@ _080ACBC8: .4byte 0x00000119 sub_080ACBCC: @ 0x080ACBCC push {r4, lr} adds r4, r0, #0 - ldr r0, _080ACBFC @ =gLinkState + ldr r0, _080ACBFC @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0x7f ands r0, r1 @@ -15607,7 +15607,7 @@ _080ACBE0: strb r0, [r1] pop {r4, pc} .align 2, 0 -_080ACBFC: .4byte gLinkState +_080ACBFC: .4byte gPlayerState _080ACC00: .4byte gUnk_0812AA80 thumb_func_start sub_080ACC04 @@ -15616,7 +15616,7 @@ sub_080ACC04: @ 0x080ACC04 adds r4, r0, #0 movs r0, #1 strb r0, [r4, #0xc] - ldr r0, _080ACC54 @ =gLinkEntity + ldr r0, _080ACC54 @ =gPlayerEntity adds r0, #0x3b ldrb r0, [r0] adds r1, r4, #0 @@ -15650,7 +15650,7 @@ sub_080ACC04: @ 0x080ACC04 bl sub_0801766C pop {r4, pc} .align 2, 0 -_080ACC54: .4byte gLinkEntity +_080ACC54: .4byte gPlayerEntity _080ACC58: .4byte gUnk_0812AAD8 thumb_func_start sub_080ACC5C @@ -15844,7 +15844,7 @@ sub_080ACDB0: @ 0x080ACDB0 ldrb r0, [r4, #0xa] cmp r0, #0 bne _080ACDE8 - ldr r2, _080ACDE0 @ =gLinkEntity + ldr r2, _080ACDE0 @ =gPlayerEntity ldr r1, _080ACDE4 @ =gUnk_08126EE4 ldrb r0, [r4, #0x14] adds r0, r0, r1 @@ -15864,7 +15864,7 @@ sub_080ACDB0: @ 0x080ACDB0 adds r0, r0, r2 b _080ACEB4 .align 2, 0 -_080ACDE0: .4byte gLinkEntity +_080ACDE0: .4byte gPlayerEntity _080ACDE4: .4byte gUnk_08126EE4 _080ACDE8: ldrb r2, [r4, #0x14] @@ -15977,7 +15977,7 @@ _080ACEB0: _080ACEB4: strh r0, [r4, #0x32] _080ACEB6: - ldr r0, _080ACEC8 @ =gLinkEntity + ldr r0, _080ACEC8 @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] adds r0, r4, #0 @@ -15986,7 +15986,7 @@ _080ACEB6: movs r0, #0 pop {r4, r5, r6, r7, pc} .align 2, 0 -_080ACEC8: .4byte gLinkEntity +_080ACEC8: .4byte gPlayerEntity thumb_func_start sub_080ACECC sub_080ACECC: @ 0x080ACECC @@ -16145,11 +16145,11 @@ _080ACFE8: bl DeleteThisEntity b _080AD03C _080ACFF8: - ldr r0, _080AD02C @ =gLinkState + ldr r0, _080AD02C @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 beq _080AD00E - ldr r0, _080AD030 @ =gLinkEntity + ldr r0, _080AD030 @ =gPlayerEntity adds r0, #0x79 ldrb r1, [r0] movs r0, #0x7f @@ -16172,8 +16172,8 @@ _080AD00E: str r2, [r4, #0x20] b _080AD03C .align 2, 0 -_080AD02C: .4byte gLinkState -_080AD030: .4byte gLinkEntity +_080AD02C: .4byte gPlayerState +_080AD030: .4byte gPlayerEntity _080AD034: bl sub_08079184 bl DeleteThisEntity @@ -16430,7 +16430,7 @@ _080AD202: strb r0, [r5, #0x15] b _080AD26E _080AD220: - ldr r1, _080AD240 @ =gLinkEntity + ldr r1, _080AD240 @ =gPlayerEntity adds r0, r1, #0 adds r0, #0x5a ldrb r0, [r0] @@ -16444,9 +16444,9 @@ _080AD220: bl sub_080AD27C b _080AD26E .align 2, 0 -_080AD240: .4byte gLinkEntity +_080AD240: .4byte gPlayerEntity _080AD244: - ldr r0, _080AD270 @ =gLinkState + ldr r0, _080AD270 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 beq _080AD25A @@ -16470,7 +16470,7 @@ _080AD25A: _080AD26E: pop {r4, r5, pc} .align 2, 0 -_080AD270: .4byte gLinkState +_080AD270: .4byte gPlayerState thumb_func_start sub_080AD274 sub_080AD274: @ 0x080AD274 @@ -16483,7 +16483,7 @@ sub_080AD27C: @ 0x080AD27C push {r4, r5, lr} adds r3, r0, #0 ldr r4, [r3, #0x54] - ldr r1, _080AD2AC @ =gLinkEntity + ldr r1, _080AD2AC @ =gPlayerEntity movs r0, #0 str r0, [r1, #0x74] adds r0, r3, #0 @@ -16505,7 +16505,7 @@ sub_080AD27C: @ 0x080AD27C strb r0, [r4, #0xd] b _080AD2C2 .align 2, 0 -_080AD2AC: .4byte gLinkEntity +_080AD2AC: .4byte gPlayerEntity _080AD2B0: adds r2, r3, #0 adds r2, #0x29 diff --git a/asm/code_080AD90C.s b/asm/code_080AD90C.s index 4e859ff6..2a9b905b 100644 --- a/asm/code_080AD90C.s +++ b/asm/code_080AD90C.s @@ -160,7 +160,7 @@ _080ADA2C: .4byte gUnk_03001010 sub_080ADA30: @ 0x080ADA30 push {r4, lr} adds r4, r0, #0 - ldr r1, _080ADA60 @ =gLinkState + ldr r1, _080ADA60 @ =gPlayerState ldr r0, [r1, #0x2c] cmp r0, r4 bne _080ADA42 @@ -177,14 +177,14 @@ _080ADA46: ldr r1, [r0] adds r0, r4, #0 bl _call_via_r1 - ldr r1, _080ADA68 @ =gLinkEntity + ldr r1, _080ADA68 @ =gPlayerEntity adds r0, r4, #0 bl sub_08078E84 pop {r4, pc} .align 2, 0 -_080ADA60: .4byte gLinkState +_080ADA60: .4byte gPlayerState _080ADA64: .4byte gUnk_08132700 -_080ADA68: .4byte gLinkEntity +_080ADA68: .4byte gPlayerEntity thumb_func_start sub_080ADA6C sub_080ADA6C: @ 0x080ADA6C @@ -244,7 +244,7 @@ _080ADAD2: sub_080ADAD4: @ 0x080ADAD4 push {r4, r5, lr} adds r4, r0, #0 - ldr r3, _080ADAF4 @ =gLinkState + ldr r3, _080ADAF4 @ =gPlayerState ldrb r1, [r3, #0x1c] adds r0, r1, #0 cmp r0, #3 @@ -252,20 +252,20 @@ sub_080ADAD4: @ 0x080ADAD4 ldrb r0, [r4, #0xc] adds r0, #1 strb r0, [r4, #0xc] - ldr r0, _080ADAF8 @ =gLinkEntity + ldr r0, _080ADAF8 @ =gPlayerEntity ldrb r1, [r0, #0x14] lsrs r1, r1, #1 adds r1, #8 b _080ADB0C .align 2, 0 -_080ADAF4: .4byte gLinkState -_080ADAF8: .4byte gLinkEntity +_080ADAF4: .4byte gPlayerState +_080ADAF8: .4byte gPlayerEntity _080ADAFC: cmp r0, #6 bne _080ADB18 movs r0, #4 strb r0, [r4, #0xc] - ldr r0, _080ADB14 @ =gLinkEntity + ldr r0, _080ADB14 @ =gPlayerEntity ldrb r1, [r0, #0x14] lsrs r1, r1, #1 adds r1, #4 @@ -274,7 +274,7 @@ _080ADB0C: bl InitAnimationForceUpdate b _080ADC08 .align 2, 0 -_080ADB14: .4byte gLinkEntity +_080ADB14: .4byte gPlayerEntity _080ADB18: movs r5, #0 ldrb r0, [r4, #0xa] @@ -366,7 +366,7 @@ _080ADBB0: movs r2, #1 movs r5, #0xe7 _080ADBCA: - ldr r0, _080ADC0C @ =gLinkState + ldr r0, _080ADC0C @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -391,7 +391,7 @@ _080ADBF2: movs r0, #0xf strb r0, [r4, #0xf] _080ADBF6: - ldr r2, _080ADC10 @ =gLinkEntity + ldr r2, _080ADC10 @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x5a ldrb r0, [r0] @@ -403,14 +403,14 @@ _080ADBF6: _080ADC08: pop {r4, r5, pc} .align 2, 0 -_080ADC0C: .4byte gLinkState -_080ADC10: .4byte gLinkEntity +_080ADC0C: .4byte gPlayerState +_080ADC10: .4byte gPlayerEntity thumb_func_start sub_080ADC14 sub_080ADC14: @ 0x080ADC14 push {r4, lr} adds r4, r0, #0 - ldr r0, _080ADC40 @ =gLinkState + ldr r0, _080ADC40 @ =gPlayerState ldrb r0, [r0, #0x1c] movs r1, #0xf ands r1, r0 @@ -421,7 +421,7 @@ sub_080ADC14: @ 0x080ADC14 ldrb r0, [r4, #0xc] adds r0, #1 strb r0, [r4, #0xc] - ldr r0, _080ADC44 @ =gLinkEntity + ldr r0, _080ADC44 @ =gPlayerEntity ldrb r1, [r0, #0x14] lsrs r1, r1, #1 adds r1, #4 @@ -429,8 +429,8 @@ sub_080ADC14: @ 0x080ADC14 bl InitAnimationForceUpdate b _080ADC5C .align 2, 0 -_080ADC40: .4byte gLinkState -_080ADC44: .4byte gLinkEntity +_080ADC40: .4byte gPlayerState +_080ADC44: .4byte gPlayerEntity _080ADC48: adds r0, r4, #0 movs r1, #0 @@ -469,7 +469,7 @@ _080ADC82: thumb_func_start sub_080ADC84 sub_080ADC84: @ 0x080ADC84 - ldr r1, _080ADC9C @ =gLinkEntity + ldr r1, _080ADC9C @ =gPlayerEntity ldrb r1, [r1, #0x18] movs r2, #0x40 ands r2, r1 @@ -481,13 +481,13 @@ sub_080ADC84: @ 0x080ADC84 strb r1, [r0, #0x18] bx lr .align 2, 0 -_080ADC9C: .4byte gLinkEntity +_080ADC9C: .4byte gPlayerEntity thumb_func_start sub_080ADCA0 sub_080ADCA0: @ 0x080ADCA0 push {r4, lr} ldr r3, _080ADCD4 @ =gUnk_08132714 - ldr r2, _080ADCD8 @ =gLinkEntity + ldr r2, _080ADCD8 @ =gPlayerEntity ldrb r2, [r2, #0x14] lsrs r2, r2, #1 adds r1, r1, r2 @@ -512,7 +512,7 @@ sub_080ADCA0: @ 0x080ADCA0 pop {r4, pc} .align 2, 0 _080ADCD4: .4byte gUnk_08132714 -_080ADCD8: .4byte gLinkEntity +_080ADCD8: .4byte gPlayerEntity thumb_func_start sub_080ADCDC sub_080ADCDC: @ 0x080ADCDC @@ -1253,7 +1253,7 @@ sub_080AE218: @ 0x080AE218 movs r4, #0 ldr r6, _080AE310 @ =gUnk_020000C0 mov sb, r6 - ldr r0, _080AE314 @ =gLinkEntity + ldr r0, _080AE314 @ =gPlayerEntity adds r2, r0, #0 adds r2, #0x26 adds r5, r0, #0 @@ -1359,7 +1359,7 @@ _080AE2F8: .align 2, 0 _080AE30C: .4byte gUnk_02024490 _080AE310: .4byte gUnk_020000C0 -_080AE314: .4byte gLinkEntity +_080AE314: .4byte gPlayerEntity _080AE318: .4byte 0xFFFFFC00 _080AE31C: .4byte gUnk_03000000 _080AE320: .4byte 0x000003FF diff --git a/asm/createBowEntity.s b/asm/createBowEntity.s index e8f41fb8..554d68a7 100644 --- a/asm/createBowEntity.s +++ b/asm/createBowEntity.s @@ -63,7 +63,7 @@ _0801902A: ldrb r0, [r4, #0x14] lsls r0, r0, #2 strb r0, [r4, #0x15] - ldr r2, _0801905C @ =gLinkEntity + ldr r2, _0801905C @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x3c ldrb r0, [r0] @@ -85,7 +85,7 @@ _0801902A: movs r0, #1 b _08019062 .align 2, 0 -_0801905C: .4byte gLinkEntity +_0801905C: .4byte gPlayerEntity _08019060: movs r0, #0 _08019062: @@ -190,7 +190,7 @@ _080190FC: ands r0, r2 orrs r0, r1 strb r0, [r4, #0x18] - ldr r0, _0801916C @ =gLinkState + ldr r0, _0801916C @ =gPlayerState str r4, [r0, #0x2c] adds r0, r4, #0 movs r1, #1 @@ -217,7 +217,7 @@ _080190FC: b _08019172 .align 2, 0 _08019168: .4byte gUnk_080B3E40 -_0801916C: .4byte gLinkState +_0801916C: .4byte gPlayerState _08019170: str r5, [r4, #0x78] _08019172: diff --git a/asm/crenalBeanSprout.s b/asm/crenalBeanSprout.s index 491ebe62..df8bfdc6 100644 --- a/asm/crenalBeanSprout.s +++ b/asm/crenalBeanSprout.s @@ -60,7 +60,7 @@ _08096368: bl CheckGlobalFlag cmp r0, #0 bne _080963A4 - ldr r0, _0809639C @ =gLinkEntity + ldr r0, _0809639C @ =gPlayerEntity movs r3, #0x80 lsls r3, r3, #9 adds r1, r5, #0 @@ -74,7 +74,7 @@ _08096368: bl SetTile b _0809650A .align 2, 0 -_0809639C: .4byte gLinkEntity +_0809639C: .4byte gPlayerEntity _080963A0: .4byte 0x00004022 _080963A4: ldrb r0, [r5, #0xb] @@ -127,7 +127,7 @@ _080963FC: bl CheckGlobalFlag cmp r0, #0 bne _0809644C - ldr r0, _08096444 @ =gLinkEntity + ldr r0, _08096444 @ =gPlayerEntity adds r1, r0, #0 adds r1, #0x29 ldrb r2, [r1] @@ -153,7 +153,7 @@ _080963FC: bl PositionRelative b _08096450 .align 2, 0 -_08096444: .4byte gLinkEntity +_08096444: .4byte gPlayerEntity _08096448: .4byte 0xFFE80000 _0809644C: bl DeleteThisEntity @@ -289,7 +289,7 @@ _0809653C: _0809655C: .4byte 0xFFE40000 _08096560: .4byte 0xFFD80000 _08096564: - ldr r0, _0809657C @ =gLinkState + ldr r0, _0809657C @ =gPlayerState ldrb r1, [r0, #0xd] movs r0, #0x80 ands r0, r1 @@ -301,7 +301,7 @@ _08096570: bl InitializeAnimation b _08096586 .align 2, 0 -_0809657C: .4byte gLinkState +_0809657C: .4byte gPlayerState _08096580: adds r0, r6, #0 bl GetNextFrame @@ -347,7 +347,7 @@ _080965C8: bl sub_0805EC9C b _080966F6 _080965D6: - ldr r1, _080965FC @ =gLinkState + ldr r1, _080965FC @ =gPlayerState ldrb r2, [r1, #0x1a] movs r0, #0x80 orrs r0, r2 @@ -366,12 +366,12 @@ _080965D6: bl InitializeAnimation b _08096606 .align 2, 0 -_080965FC: .4byte gLinkState +_080965FC: .4byte gPlayerState _08096600: adds r0, r6, #0 bl GetNextFrame _08096606: - ldr r0, _08096664 @ =gLinkEntity + ldr r0, _08096664 @ =gPlayerEntity ldrb r0, [r0, #0x14] movs r1, #6 ands r1, r0 @@ -417,7 +417,7 @@ _08096606: strb r1, [r0] b _08096676 .align 2, 0 -_08096664: .4byte gLinkEntity +_08096664: .4byte gPlayerEntity _08096668: .4byte gUnk_08123184 _0809666C: .4byte gUnk_0200AF00 _08096670: @@ -425,7 +425,7 @@ _08096670: adds r0, #0x2f strb r7, [r0] _08096676: - ldr r0, _080966FC @ =gLinkEntity + ldr r0, _080966FC @ =gPlayerEntity movs r3, #0x80 lsls r3, r3, #9 adds r1, r6, #0 @@ -441,7 +441,7 @@ _08096676: adds r0, r6, #0 bl sub_08096A78 _0809669C: - ldr r2, _08096700 @ =gLinkState + ldr r2, _08096700 @ =gPlayerState adds r0, r2, #0 adds r0, #0x92 ldrh r1, [r0] @@ -488,8 +488,8 @@ _080966F6: pop {r4, r5, r6, r7, pc} .align 2, 0 _080966F8: .4byte gUnk_0200AF00 -_080966FC: .4byte gLinkEntity -_08096700: .4byte gLinkState +_080966FC: .4byte gPlayerEntity +_08096700: .4byte gPlayerState thumb_func_start sub_08096704 sub_08096704: @ 0x08096704 @@ -581,7 +581,7 @@ sub_08096780: @ 0x08096780 bne _080967DC adds r0, r5, #0 bl GetNextFrame - ldr r2, _080967D8 @ =gLinkState + ldr r2, _080967D8 @ =gPlayerState ldrb r0, [r2, #0xb] movs r1, #0x80 orrs r0, r1 @@ -607,7 +607,7 @@ sub_08096780: @ 0x08096780 b _080967E0 .align 2, 0 _080967D4: .4byte gUnk_0812319C -_080967D8: .4byte gLinkState +_080967D8: .4byte gPlayerState _080967DC: movs r0, #0xc0 strb r0, [r5, #0xe] @@ -807,7 +807,7 @@ sub_08096904: @ 0x08096904 ldrb r1, [r5, #0xf] cmp r0, r1 bne _08096980 - ldr r2, _0809697C @ =gLinkState + ldr r2, _0809697C @ =gPlayerState ldrb r1, [r2, #0xb] movs r0, #0x7f ands r0, r1 @@ -820,7 +820,7 @@ sub_08096904: @ 0x08096904 .align 2, 0 _08096974: .4byte gUnk_081231AE _08096978: .4byte gRoomControls -_0809697C: .4byte gLinkState +_0809697C: .4byte gPlayerState _08096980: movs r0, #0xf _08096982: diff --git a/asm/cucco.s b/asm/cucco.s index 768555e7..bd176a46 100644 --- a/asm/cucco.s +++ b/asm/cucco.s @@ -241,7 +241,7 @@ sub_0806E65C: @ 0x0806E65C ldrsb r2, [r0, r2] cmp r2, #0 beq _0806E6A6 - ldr r0, _0806E688 @ =gLinkState + ldr r0, _0806E688 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -255,7 +255,7 @@ sub_0806E65C: @ 0x0806E65C bl sub_0806F118 b _0806E698 .align 2, 0 -_0806E688: .4byte gLinkState +_0806E688: .4byte gPlayerState _0806E68C: adds r0, r4, #0 bl sub_0806E6A8 diff --git a/asm/cuccoAggr.s b/asm/cuccoAggr.s index d7161fa4..acf5bcf4 100644 --- a/asm/cuccoAggr.s +++ b/asm/cuccoAggr.s @@ -355,7 +355,7 @@ _08038F42: sub_08038F44: @ 0x08038F44 push {r4, lr} adds r4, r0, #0 - ldr r0, _08038F8C @ =gLinkEntity + ldr r0, _08038F8C @ =gPlayerEntity adds r1, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -383,7 +383,7 @@ sub_08038F44: @ 0x08038F44 bl sub_08039120 b _08038F9E .align 2, 0 -_08038F8C: .4byte gLinkEntity +_08038F8C: .4byte gPlayerEntity _08038F90: movs r0, #0x1f ands r2, r0 @@ -420,7 +420,7 @@ _08038FB8: ands r0, r1 cmp r0, #0 bne _08038FE0 - ldr r1, _08038FF8 @ =gLinkEntity + ldr r1, _08038FF8 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r1, r0, #0 @@ -436,7 +436,7 @@ _08038FE0: b _08039018 .align 2, 0 _08038FF4: .4byte 0x0000FFFF -_08038FF8: .4byte gLinkEntity +_08038FF8: .4byte gPlayerEntity _08038FFC: adds r0, r4, #0 bl sub_0806F69C @@ -612,7 +612,7 @@ sub_08039140: @ 0x08039140 strb r0, [r4, #0xc] bl Random strb r0, [r4, #0xe] - ldr r1, _08039174 @ =gLinkEntity + ldr r1, _08039174 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -629,7 +629,7 @@ sub_08039140: @ 0x08039140 bl InitializeAnimation pop {r4, pc} .align 2, 0 -_08039174: .4byte gLinkEntity +_08039174: .4byte gPlayerEntity _08039178: .4byte 0x0000FFFC thumb_func_start sub_0803917C diff --git a/asm/cuccoChick.s b/asm/cuccoChick.s index 8d9f090a..23386b60 100644 --- a/asm/cuccoChick.s +++ b/asm/cuccoChick.s @@ -170,7 +170,7 @@ sub_0806E838: @ 0x0806E838 ldrsb r2, [r0, r2] cmp r2, #0 beq _0806E882 - ldr r0, _0806E864 @ =gLinkState + ldr r0, _0806E864 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -184,7 +184,7 @@ sub_0806E838: @ 0x0806E838 bl sub_0806F118 b _0806E874 .align 2, 0 -_0806E864: .4byte gLinkState +_0806E864: .4byte gPlayerState _0806E868: adds r0, r4, #0 bl sub_0806E884 diff --git a/asm/cuccoChickAggr.s b/asm/cuccoChickAggr.s index a581af08..458b4346 100644 --- a/asm/cuccoChickAggr.s +++ b/asm/cuccoChickAggr.s @@ -297,14 +297,14 @@ sub_08022B20: @ 0x08022B20 bl sub_08049DF4 cmp r0, #0 beq _08022B40 - ldr r1, _08022B3C @ =gLinkEntity + ldr r1, _08022B3C @ =gPlayerEntity adds r0, r4, #0 movs r2, #0x24 movs r3, #0x24 bl sub_080041A0 b _08022B42 .align 2, 0 -_08022B3C: .4byte gLinkEntity +_08022B3C: .4byte gPlayerEntity _08022B40: movs r0, #0 _08022B42: @@ -317,7 +317,7 @@ sub_08022B44: @ 0x08022B44 movs r0, #0xc0 lsls r0, r0, #8 str r0, [r4, #0x20] - ldr r1, _08022B84 @ =gLinkEntity + ldr r1, _08022B84 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r1, r0, #0 @@ -343,4 +343,4 @@ _08022B7A: bl sub_08004488 pop {r4, pc} .align 2, 0 -_08022B84: .4byte gLinkEntity +_08022B84: .4byte gPlayerEntity diff --git a/asm/din.s b/asm/din.s index 533ab213..14dfe55b 100644 --- a/asm/din.s +++ b/asm/din.s @@ -52,7 +52,7 @@ _080647C2: ldrb r1, [r0] adds r0, #0x10 strb r1, [r0] - ldr r1, _080647FC @ =gLinkEntity + ldr r1, _080647FC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -61,7 +61,7 @@ _080647C2: bl InitAnimationForceUpdate b _08064824 .align 2, 0 -_080647FC: .4byte gLinkEntity +_080647FC: .4byte gPlayerEntity _08064800: adds r0, r4, #0 movs r1, #0 diff --git a/asm/dog.s b/asm/dog.s index 7afc6af2..c62ec6df 100644 --- a/asm/dog.s +++ b/asm/dog.s @@ -100,7 +100,7 @@ _08069BD2: ldrb r0, [r5, #0xa] cmp r0, #0 bne _08069BF2 - ldr r0, _08069C34 @ =gLinkState + ldr r0, _08069C34 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -145,7 +145,7 @@ _08069BF2: _08069C30: pop {r4, r5, r6, pc} .align 2, 0 -_08069C34: .4byte gLinkState +_08069C34: .4byte gPlayerState _08069C38: .4byte 0x00004072 _08069C3C: .4byte gRoomControls @@ -158,7 +158,7 @@ sub_08069C40: @ 0x08069C40 bl sub_08069F90 cmp r0, #0 beq _08069C80 - ldr r0, _08069C68 @ =gLinkState + ldr r0, _08069C68 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -168,7 +168,7 @@ sub_08069C40: @ 0x08069C40 bl sub_08069CB8 b _08069C7A .align 2, 0 -_08069C68: .4byte gLinkState +_08069C68: .4byte gPlayerState _08069C6C: adds r0, r4, #0 bl GetAnimationState @@ -211,7 +211,7 @@ _08069CB4: .4byte gUnk_08111DA8 sub_08069CB8: @ 0x08069CB8 push {r4, r5, lr} adds r4, r0, #0 - ldr r1, _08069CF8 @ =gLinkEntity + ldr r1, _08069CF8 @ =gPlayerEntity bl GetFacingDirection ldr r2, _08069CFC @ =gUnk_08111DB0 ldrb r1, [r4, #0x14] @@ -240,7 +240,7 @@ sub_08069CB8: @ 0x08069CB8 _08069CF6: pop {r4, r5, pc} .align 2, 0 -_08069CF8: .4byte gLinkEntity +_08069CF8: .4byte gPlayerEntity _08069CFC: .4byte gUnk_08111DB0 thumb_func_start sub_08069D00 @@ -605,7 +605,7 @@ sub_08069F90: @ 0x08069F90 movs r0, #1 b _08069FB4 _08069FA8: - ldr r1, _08069FB8 @ =gLinkEntity + ldr r1, _08069FB8 @ =gPlayerEntity adds r0, r4, #0 movs r2, #0x14 movs r3, #0x14 @@ -613,13 +613,13 @@ _08069FA8: _08069FB4: pop {r4, pc} .align 2, 0 -_08069FB8: .4byte gLinkEntity +_08069FB8: .4byte gPlayerEntity thumb_func_start sub_08069FBC sub_08069FBC: @ 0x08069FBC push {lr} adds r2, r0, #0 - ldr r0, _08069FE4 @ =gLinkState + ldr r0, _08069FE4 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -640,13 +640,13 @@ _08069FDA: _08069FE0: pop {pc} .align 2, 0 -_08069FE4: .4byte gLinkState +_08069FE4: .4byte gPlayerState thumb_func_start sub_08069FE8 sub_08069FE8: @ 0x08069FE8 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _0806A010 @ =gLinkState + ldr r0, _0806A010 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -663,7 +663,7 @@ sub_08069FE8: @ 0x08069FE8 bl sub_08078778 b _0806A020 .align 2, 0 -_0806A010: .4byte gLinkState +_0806A010: .4byte gPlayerState _0806A014: adds r0, r4, #0 adds r0, #0x74 @@ -685,7 +685,7 @@ sub_0806A028: @ 0x0806A028 ldrsb r2, [r0, r2] cmp r2, #0 beq _0806A07E - ldr r0, _0806A054 @ =gLinkState + ldr r0, _0806A054 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -699,7 +699,7 @@ sub_0806A028: @ 0x0806A028 bl sub_0806F118 b _0806A076 .align 2, 0 -_0806A054: .4byte gLinkState +_0806A054: .4byte gPlayerState _0806A058: adds r0, r4, #0 bl sub_0806A080 @@ -743,7 +743,7 @@ _0806A0A0: .4byte gUnk_08111E34 sub_0806A0A4: @ 0x0806A0A4 push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r0, _0806A0F8 @ =gLinkState + ldr r0, _0806A0F8 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -780,7 +780,7 @@ sub_0806A0A4: @ 0x0806A0A4 bl sub_0807BA8C b _0806A120 .align 2, 0 -_0806A0F8: .4byte gLinkState +_0806A0F8: .4byte gPlayerState _0806A0FC: .4byte gRoomControls _0806A100: movs r5, #2 @@ -818,7 +818,7 @@ sub_0806A144: @ 0x0806A144 push {r4, r5, lr} adds r5, r0, #0 movs r4, #4 - ldr r0, _0806A18C @ =gLinkState + ldr r0, _0806A18C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -848,7 +848,7 @@ _0806A17A: bl TextboxNoOverlap pop {r4, r5, pc} .align 2, 0 -_0806A18C: .4byte gLinkState +_0806A18C: .4byte gPlayerState _0806A190: .4byte gUnk_08111FD8 thumb_func_start Dog_Fusion diff --git a/asm/dust.s b/asm/dust.s index 9ca3ee56..c56c75fb 100644 --- a/asm/dust.s +++ b/asm/dust.s @@ -282,7 +282,7 @@ sub_08044310: @ 0x08044310 adds r5, r0, #0 movs r4, #0xff movs r6, #0xff - ldr r0, _08044334 @ =gLinkEntity + ldr r0, _08044334 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r1, r0, #1 movs r0, #3 @@ -295,7 +295,7 @@ sub_08044310: @ 0x08044310 beq _08044342 b _080443EA .align 2, 0 -_08044334: .4byte gLinkEntity +_08044334: .4byte gPlayerEntity _08044338: cmp r1, #2 beq _08044392 @@ -492,7 +492,7 @@ _08044492: sub_08044498: @ 0x08044498 push {r4, r5, r6, lr} mov ip, r0 - ldr r6, _08044538 @ =gLinkEntity + ldr r6, _08044538 @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r6, r1] ldr r3, _0804453C @ =gRoomControls @@ -509,7 +509,7 @@ sub_08044498: @ 0x08044498 ands r0, r2 lsls r0, r0, #6 orrs r4, r0 - ldr r0, _08044540 @ =gLinkState + ldr r0, _08044540 @ =gPlayerState adds r0, #0x92 ldrh r0, [r0] movs r1, #0xf0 @@ -567,13 +567,13 @@ _0804450C: adds r1, r0, #0 cmp r1, #0 beq _0804454C - ldr r0, _08044538 @ =gLinkEntity + ldr r0, _08044538 @ =gPlayerEntity bl CopyPosition b _0804454C .align 2, 0 -_08044538: .4byte gLinkEntity +_08044538: .4byte gPlayerEntity _0804453C: .4byte gRoomControls -_08044540: .4byte gLinkState +_08044540: .4byte gPlayerState _08044544: adds r2, #5 adds r3, #1 @@ -587,7 +587,7 @@ _0804454C: sub_08044550: @ 0x08044550 push {r4, r5, r6, r7, lr} adds r6, r0, #0 - ldr r0, _080445A8 @ =gLinkState + ldr r0, _080445A8 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -602,7 +602,7 @@ sub_08044550: @ 0x08044550 adds r0, #0x10 strh r0, [r6, #0x24] _08044570: - ldr r5, _080445AC @ =gLinkEntity + ldr r5, _080445AC @ =gPlayerEntity ldrb r0, [r5, #0x14] movs r4, #0xe ands r4, r0 @@ -629,8 +629,8 @@ _08044570: bl sub_0806F69C b _080445BE .align 2, 0 -_080445A8: .4byte gLinkState -_080445AC: .4byte gLinkEntity +_080445A8: .4byte gPlayerState +_080445AC: .4byte gPlayerEntity _080445B0: .4byte gUnk_08126EE4 _080445B4: adds r0, r6, #0 diff --git a/asm/enemy50.s b/asm/enemy50.s index 93b54bc7..436b55ec 100644 --- a/asm/enemy50.s +++ b/asm/enemy50.s @@ -352,14 +352,14 @@ sub_08040DC8: @ 0x08040DC8 strb r1, [r0, #0xd] movs r1, #0x3c strb r1, [r0, #0x1d] - ldr r1, _08040DE0 @ =gLinkEntity + ldr r1, _08040DE0 @ =gPlayerEntity ldrb r1, [r1, #0x14] lsrs r1, r1, #2 adds r1, #5 bl InitializeAnimation pop {pc} .align 2, 0 -_08040DE0: .4byte gLinkEntity +_08040DE0: .4byte gPlayerEntity thumb_func_start sub_08040DE4 sub_08040DE4: @ 0x08040DE4 @@ -723,7 +723,7 @@ _08041094: adds r0, #8 strh r0, [r1] _080410A6: - ldr r2, _08041100 @ =gLinkEntity + ldr r2, _08041100 @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x45 ldrb r0, [r0] @@ -768,7 +768,7 @@ _080410B6: bl sub_0803F6EC b _0804110A .align 2, 0 -_08041100: .4byte gLinkEntity +_08041100: .4byte gPlayerEntity _08041104: adds r0, r4, #0 bl sub_0803F738 @@ -912,7 +912,7 @@ _08041200: movs r0, #1 b _08041224 _08041204: - ldr r0, _08041214 @ =gLinkState + ldr r0, _08041214 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #0x10 @@ -921,7 +921,7 @@ _08041204: beq _08041222 b _08041200 .align 2, 0 -_08041214: .4byte gLinkState +_08041214: .4byte gPlayerState _08041218: ldr r0, _08041228 @ =gArea movs r1, #0xa diff --git a/asm/enemy64.s b/asm/enemy64.s index 5131a1fa..83499cc1 100644 --- a/asm/enemy64.s +++ b/asm/enemy64.s @@ -881,7 +881,7 @@ sub_080496EC: @ 0x080496EC bl sub_08079F8C cmp r0, #0 beq _08049720 - ldr r0, _0804971C @ =gLinkEntity + ldr r0, _0804971C @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r0, r1] cmp r0, #0 @@ -894,7 +894,7 @@ sub_080496EC: @ 0x080496EC strb r0, [r4, #0xe] b _08049724 .align 2, 0 -_0804971C: .4byte gLinkEntity +_0804971C: .4byte gPlayerEntity _08049720: movs r0, #1 strb r0, [r4, #0xd] @@ -910,7 +910,7 @@ sub_0804972C: @ 0x0804972C bl sub_08079F8C cmp r0, #0 beq _08049750 - ldr r0, _08049758 @ =gLinkEntity + ldr r0, _08049758 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r0, r1] cmp r0, #0 @@ -926,7 +926,7 @@ _08049750: bl sub_08049944 pop {r4, pc} .align 2, 0 -_08049758: .4byte gLinkEntity +_08049758: .4byte gPlayerEntity thumb_func_start sub_0804975C sub_0804975C: @ 0x0804975C @@ -1060,7 +1060,7 @@ sub_08049804: @ 0x08049804 ldrb r0, [r4, #0x18] ands r3, r0 strb r3, [r4, #0x18] - ldr r4, _08049880 @ =gLinkEntity + ldr r4, _08049880 @ =gPlayerEntity ldr r1, _08049884 @ =gRoomControls ldrh r0, [r1, #6] adds r0, #0xa8 @@ -1078,7 +1078,7 @@ _08049878: pop {r4, pc} .align 2, 0 _0804987C: .4byte gUnk_03000FD0 -_08049880: .4byte gLinkEntity +_08049880: .4byte gPlayerEntity _08049884: .4byte gRoomControls thumb_func_start sub_08049888 @@ -1189,7 +1189,7 @@ sub_08049944: @ 0x08049944 ands r1, r3 orrs r2, r1 strb r2, [r4] - ldr r5, _08049990 @ =gLinkEntity + ldr r5, _08049990 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r5, r2] movs r3, #0x32 @@ -1198,7 +1198,7 @@ sub_08049944: @ 0x08049944 bl sub_0806FCB8 cmp r0, #0 beq _0804998C - ldr r2, _08049994 @ =gLinkState + ldr r2, _08049994 @ =gPlayerState movs r0, #1 strb r0, [r2, #0x14] movs r1, #0x36 @@ -1216,8 +1216,8 @@ sub_08049944: @ 0x08049944 _0804998C: pop {r4, r5, pc} .align 2, 0 -_08049990: .4byte gLinkEntity -_08049994: .4byte gLinkState +_08049990: .4byte gPlayerEntity +_08049994: .4byte gPlayerState thumb_func_start sub_08049998 sub_08049998: @ 0x08049998 @@ -1247,7 +1247,7 @@ sub_08049998: @ 0x08049998 bl sub_08079F8C cmp r0, #0 beq _080499EA - ldr r0, _080499EC @ =gLinkEntity + ldr r0, _080499EC @ =gPlayerEntity ldrh r1, [r5, #0x2e] subs r1, r1, r4 ldrh r2, [r0, #0x2e] @@ -1261,7 +1261,7 @@ sub_08049998: @ 0x08049998 _080499EA: pop {r4, r5, r6, pc} .align 2, 0 -_080499EC: .4byte gLinkEntity +_080499EC: .4byte gPlayerEntity thumb_func_start sub_080499F0 sub_080499F0: @ 0x080499F0 @@ -1270,7 +1270,7 @@ sub_080499F0: @ 0x080499F0 ldrb r0, [r4, #0xc] cmp r0, #0 beq _08049A82 - ldr r5, _08049A84 @ =gLinkEntity + ldr r5, _08049A84 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r5, r1] cmp r0, #0 @@ -1339,7 +1339,7 @@ _08049A7E: _08049A82: pop {r4, r5, r6, pc} .align 2, 0 -_08049A84: .4byte gLinkEntity +_08049A84: .4byte gPlayerEntity _08049A88: .4byte gSineTable thumb_func_start sub_08049A8C @@ -1444,7 +1444,7 @@ sub_08049B20: @ 0x08049B20 bl sub_08079F8C cmp r0, #0 beq _08049B68 - ldr r0, _08049B6C @ =gLinkEntity + ldr r0, _08049B6C @ =gPlayerEntity ldrh r1, [r4, #0x2e] subs r1, r1, r5 ldrh r2, [r0, #0x2e] @@ -1458,4 +1458,4 @@ sub_08049B20: @ 0x08049B20 _08049B68: pop {r4, r5, r6, pc} .align 2, 0 -_08049B6C: .4byte gLinkEntity +_08049B6C: .4byte gPlayerEntity diff --git a/asm/evilSpirit.s b/asm/evilSpirit.s index 8e61772f..79a69521 100644 --- a/asm/evilSpirit.s +++ b/asm/evilSpirit.s @@ -168,7 +168,7 @@ _080863B6: movs r0, #0xc0 lsls r0, r0, #3 strh r0, [r6, #0x24] - ldr r2, _080863E8 @ =gLinkEntity + ldr r2, _080863E8 @ =gPlayerEntity ldr r0, [r2, #0x2c] ldr r1, [r6, #0x2c] subs r0, r0, r1 @@ -190,13 +190,13 @@ _080863B6: adds r0, r2, #3 b _080863EE .align 2, 0 -_080863E8: .4byte gLinkEntity +_080863E8: .4byte gPlayerEntity _080863EC: subs r0, r2, #3 _080863EE: strb r0, [r6, #0x15] _080863F0: - ldr r0, _0808640C @ =gLinkEntity + ldr r0, _0808640C @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r0, #2 ands r0, r1 @@ -210,7 +210,7 @@ _080863F0: adds r1, #0x76 b _08086426 .align 2, 0 -_0808640C: .4byte gLinkEntity +_0808640C: .4byte gPlayerEntity _08086410: adds r0, r6, #0 adds r0, #0x7c @@ -255,7 +255,7 @@ _08086440: adds r2, #0x7f movs r0, #1 strb r0, [r2] - ldr r0, _08086480 @ =gLinkEntity + ldr r0, _08086480 @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r0, #2 ands r0, r1 @@ -271,7 +271,7 @@ _08086440: strh r0, [r1] b _080864BC .align 2, 0 -_08086480: .4byte gLinkEntity +_08086480: .4byte gPlayerEntity _08086484: adds r1, r6, #0 adds r1, #0x7c @@ -447,7 +447,7 @@ sub_08086594: @ 0x08086594 adds r2, #0x7f movs r0, #1 strb r0, [r2] - ldr r0, _080865EC @ =gLinkEntity + ldr r0, _080865EC @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r0, #2 ands r0, r1 @@ -461,7 +461,7 @@ sub_08086594: @ 0x08086594 adds r1, #0x76 b _0808662A .align 2, 0 -_080865EC: .4byte gLinkEntity +_080865EC: .4byte gPlayerEntity _080865F0: adds r0, r7, #0 adds r0, #0x7c diff --git a/asm/ezloCap.s b/asm/ezloCap.s index 13ef9565..46510577 100644 --- a/asm/ezloCap.s +++ b/asm/ezloCap.s @@ -52,7 +52,7 @@ sub_0806D8A0: @ 0x0806D8A0 bge _0806D8C2 rsbs r2, r2, #0 _0806D8C2: - ldr r1, _0806D900 @ =gLinkEntity + ldr r1, _0806D900 @ =gPlayerEntity movs r5, #0x2e ldrsh r0, [r1, r5] adds r2, r2, r0 @@ -82,7 +82,7 @@ _0806D8C2: strb r1, [r4, #0x14] pop {r4, r5, pc} .align 2, 0 -_0806D900: .4byte gLinkEntity +_0806D900: .4byte gPlayerEntity _0806D904: .4byte gUnk_08114134 thumb_func_start sub_0806D908 @@ -93,7 +93,7 @@ sub_0806D908: @ 0x0806D908 ldrsh r0, [r4, r1] movs r2, #0x32 ldrsh r1, [r4, r2] - ldr r3, _0806D93C @ =gLinkEntity + ldr r3, _0806D93C @ =gPlayerEntity movs r5, #0x2e ldrsh r2, [r3, r5] movs r5, #0x32 @@ -112,7 +112,7 @@ sub_0806D908: @ 0x0806D908 strb r1, [r4, #0x14] pop {r4, r5, pc} .align 2, 0 -_0806D93C: .4byte gLinkEntity +_0806D93C: .4byte gPlayerEntity _0806D940: .4byte gUnk_08114144 thumb_func_start sub_0806D944 @@ -124,7 +124,7 @@ sub_0806D944: @ 0x0806D944 rsbs r3, r3, #0 ands r3, r0 strb r3, [r2, #0x18] - ldr r0, _0806D968 @ =gLinkEntity + ldr r0, _0806D968 @ =gPlayerEntity ldr r1, [r2, #0x2c] ldr r0, [r0, #0x2c] cmp r1, r0 @@ -136,7 +136,7 @@ sub_0806D944: @ 0x0806D944 _0806D964: pop {pc} .align 2, 0 -_0806D968: .4byte gLinkEntity +_0806D968: .4byte gPlayerEntity thumb_func_start sub_0806D96C sub_0806D96C: @ 0x0806D96C @@ -170,7 +170,7 @@ _0806D9A0: .4byte 0xFFE80000 thumb_func_start sub_0806D9A4 sub_0806D9A4: @ 0x0806D9A4 push {lr} - ldr r1, _0806D9BC @ =gLinkEntity + ldr r1, _0806D9BC @ =gPlayerEntity ldr r2, [r0, #0x2c] ldr r0, [r1, #0x2c] adds r3, r1, #0 @@ -182,7 +182,7 @@ sub_0806D9A4: @ 0x0806D9A4 ands r0, r1 b _0806D9C6 .align 2, 0 -_0806D9BC: .4byte gLinkEntity +_0806D9BC: .4byte gPlayerEntity _0806D9C0: ldrb r0, [r3, #0x18] movs r1, #0x40 diff --git a/asm/fairy.s b/asm/fairy.s index 5f73a9ff..a6841668 100644 --- a/asm/fairy.s +++ b/asm/fairy.s @@ -390,7 +390,7 @@ _0808D972: ldrh r0, [r4, #0x36] subs r0, #1 strh r0, [r4, #0x36] - ldr r1, _0808D994 @ =gLinkEntity + ldr r1, _0808D994 @ =gPlayerEntity adds r0, r4, #0 bl sub_080177A0 cmp r0, #0 @@ -400,7 +400,7 @@ _0808D972: _0808D992: pop {r4, pc} .align 2, 0 -_0808D994: .4byte gLinkEntity +_0808D994: .4byte gPlayerEntity thumb_func_start sub_0808D998 sub_0808D998: @ 0x0808D998 @@ -611,13 +611,13 @@ _0808DAE0: adds r1, #0x63 movs r0, #0xfb strb r0, [r1] - ldr r0, _0808DB28 @ =gLinkEntity + ldr r0, _0808DB28 @ =gPlayerEntity str r0, [r4, #0x54] adds r1, r4, #0 bl CopyPosition pop {r4, pc} .align 2, 0 -_0808DB28: .4byte gLinkEntity +_0808DB28: .4byte gPlayerEntity thumb_func_start sub_0808DB2C sub_0808DB2C: @ 0x0808DB2C @@ -635,8 +635,8 @@ sub_0808DB2C: @ 0x0808DB2C adds r2, #0x3b movs r0, #1 strb r0, [r2] - ldr r0, _0808DB50 @ =gLinkEntity + ldr r0, _0808DB50 @ =gPlayerEntity bl CopyPosition pop {pc} .align 2, 0 -_0808DB50: .4byte gLinkEntity +_0808DB50: .4byte gPlayerEntity diff --git a/asm/fallingBoulder.s b/asm/fallingBoulder.s index 78842d96..801c45c0 100644 --- a/asm/fallingBoulder.s +++ b/asm/fallingBoulder.s @@ -166,7 +166,7 @@ sub_0802C334: @ 0x0802C334 bne _0802C36A ldr r0, _0802C3C4 @ =gRoomControls ldrh r1, [r0, #8] - ldr r2, _0802C3C8 @ =gLinkEntity + ldr r2, _0802C3C8 @ =gPlayerEntity cmp r2, #0 bne _0802C34E b _0802C4AA @@ -230,7 +230,7 @@ _0802C36A: b _0802C48C .align 2, 0 _0802C3C4: .4byte gRoomControls -_0802C3C8: .4byte gLinkEntity +_0802C3C8: .4byte gPlayerEntity _0802C3CC: adds r0, r4, #0 adds r0, #0x7a diff --git a/asm/fan.s b/asm/fan.s index a3db90a6..2442e630 100644 --- a/asm/fan.s +++ b/asm/fan.s @@ -23,7 +23,7 @@ sub_0809EE44: @ 0x0809EE44 bne _0809EE60 b _0809EF74 _0809EE60: - ldr r4, _0809EEA4 @ =gLinkEntity + ldr r4, _0809EEA4 @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 bl sub_0809EF78 @@ -56,7 +56,7 @@ _0809EE88: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809EEA4: .4byte gLinkEntity +_0809EEA4: .4byte gPlayerEntity _0809EEA8: .4byte gUnk_03003D80 _0809EEAC: .4byte _0809EEB0 _0809EEB0: @ jump table @@ -98,7 +98,7 @@ _0809EF1E: beq _0809EF52 b _0809EF56 _0809EF26: - ldr r2, _0809EF44 @ =gLinkEntity + ldr r2, _0809EF44 @ =gPlayerEntity movs r7, #0x2e ldrsh r1, [r4, r7] movs r7, #0x2e @@ -113,7 +113,7 @@ _0809EF26: beq _0809EF52 b _0809EF56 .align 2, 0 -_0809EF44: .4byte gLinkEntity +_0809EF44: .4byte gPlayerEntity _0809EF48: ldrb r0, [r5, #0xf] cmp r0, #0 diff --git a/asm/farore.s b/asm/farore.s index b543e4ea..792a2384 100644 --- a/asm/farore.s +++ b/asm/farore.s @@ -52,7 +52,7 @@ _080649C2: ldrb r1, [r0] adds r0, #0x10 strb r1, [r0] - ldr r1, _080649FC @ =gLinkEntity + ldr r1, _080649FC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -61,7 +61,7 @@ _080649C2: bl InitAnimationForceUpdate b _08064A24 .align 2, 0 -_080649FC: .4byte gLinkEntity +_080649FC: .4byte gPlayerEntity _08064A00: adds r0, r4, #0 movs r1, #0 diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index 130eb951..31bf1057 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -1216,7 +1216,7 @@ _080884D2: movs r0, #5 str r0, [r1, #0x10] _080884EA: - ldr r1, _08088500 @ =gLinkEntity + ldr r1, _08088500 @ =gPlayerEntity movs r0, #6 strb r0, [r1, #0x14] pop {r4, pc} @@ -1224,7 +1224,7 @@ _080884EA: _080884F4: .4byte 0x00004328 _080884F8: .4byte 0x00004327 _080884FC: .4byte gTextBox -_08088500: .4byte gLinkEntity +_08088500: .4byte gPlayerEntity thumb_func_start sub_08088504 sub_08088504: @ 0x08088504 @@ -1374,7 +1374,7 @@ sub_0808861C: @ 0x0808861C movs r3, #8 bl CheckPlayerInRegion str r0, [r4, #0x14] - ldr r1, _08088650 @ =gLinkEntity + ldr r1, _08088650 @ =gPlayerEntity ldrb r0, [r1, #0x14] cmp r0, #0 bne _0808863E @@ -1393,7 +1393,7 @@ _08088642: strb r0, [r2, #7] pop {r4, pc} .align 2, 0 -_08088650: .4byte gLinkEntity +_08088650: .4byte gPlayerEntity _08088654: .4byte gUnk_02033280 thumb_func_start sub_08088658 @@ -1406,7 +1406,7 @@ sub_08088658: @ 0x08088658 movs r3, #8 bl CheckPlayerInRegion str r0, [r4, #0x14] - ldr r0, _08088684 @ =gLinkEntity + ldr r0, _08088684 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r0, r1] cmp r0, #0 @@ -1421,5 +1421,5 @@ _08088678: strb r0, [r2, #7] pop {r4, pc} .align 2, 0 -_08088684: .4byte gLinkEntity +_08088684: .4byte gPlayerEntity _08088688: .4byte gUnk_02033280 diff --git a/asm/floatingPlatform.s b/asm/floatingPlatform.s index 7d1c24eb..917a653e 100644 --- a/asm/floatingPlatform.s +++ b/asm/floatingPlatform.s @@ -103,7 +103,7 @@ sub_08086168: @ 0x08086168 lsls r1, r1, #1 ldr r2, _0808619C @ =gUnk_08120658 adds r1, r1, r2 - ldr r4, _080861A0 @ =gLinkEntity + ldr r4, _080861A0 @ =gPlayerEntity ldrb r2, [r1] ldrb r3, [r1, #1] adds r1, r4, #0 @@ -113,7 +113,7 @@ sub_08086168: @ 0x08086168 bl sub_08079F8C cmp r0, #0 beq _080861A8 - ldr r0, _080861A4 @ =gLinkState + ldr r0, _080861A4 @ =gPlayerState movs r1, #1 strb r1, [r0, #0x14] movs r1, #0x36 @@ -124,8 +124,8 @@ sub_08086168: @ 0x08086168 b _080861AA .align 2, 0 _0808619C: .4byte gUnk_08120658 -_080861A0: .4byte gLinkEntity -_080861A4: .4byte gLinkState +_080861A0: .4byte gPlayerEntity +_080861A4: .4byte gPlayerState _080861A8: movs r0, #0 _080861AA: diff --git a/asm/flyingPot.s b/asm/flyingPot.s index 98601cbc..7c45e106 100644 --- a/asm/flyingPot.s +++ b/asm/flyingPot.s @@ -231,7 +231,7 @@ _080371F6: sub_080371F8: @ 0x080371F8 push {lr} adds r2, r0, #0 - ldr r0, _08037210 @ =gLinkState + ldr r0, _08037210 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -242,7 +242,7 @@ sub_080371F8: @ 0x080371F8 _0803720E: pop {pc} .align 2, 0 -_08037210: .4byte gLinkState +_08037210: .4byte gPlayerState thumb_func_start nullsub_161 nullsub_161: @ 0x08037214 @@ -446,7 +446,7 @@ sub_0803737C: @ 0x0803737C strb r0, [r4, #0xc] movs r0, #0xa strb r0, [r4, #0xe] - ldr r1, _080373AC @ =gLinkEntity + ldr r1, _080373AC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -454,7 +454,7 @@ _080373A6: pop {r4, pc} .align 2, 0 _080373A8: .4byte 0xFFFF0000 -_080373AC: .4byte gLinkEntity +_080373AC: .4byte gPlayerEntity thumb_func_start sub_080373B0 sub_080373B0: @ 0x080373B0 diff --git a/asm/flyingSkull.s b/asm/flyingSkull.s index 3f75b1ca..d0ae76c4 100644 --- a/asm/flyingSkull.s +++ b/asm/flyingSkull.s @@ -230,7 +230,7 @@ _08039D4A: sub_08039D4C: @ 0x08039D4C push {lr} adds r2, r0, #0 - ldr r0, _08039D64 @ =gLinkState + ldr r0, _08039D64 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -241,7 +241,7 @@ sub_08039D4C: @ 0x08039D4C _08039D62: pop {pc} .align 2, 0 -_08039D64: .4byte gLinkState +_08039D64: .4byte gPlayerState thumb_func_start nullsub_166 nullsub_166: @ 0x08039D68 @@ -349,13 +349,13 @@ _08039E28: _08039E30: .4byte 0x00004073 _08039E34: .4byte gRoomControls _08039E38: - ldr r0, _08039E6C @ =gLinkState + ldr r0, _08039E6C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 bne _08039EC6 - ldr r2, _08039E70 @ =gLinkEntity + ldr r2, _08039E70 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r2, r0] movs r6, #0x32 @@ -374,8 +374,8 @@ _08039E38: strb r0, [r5, #0xe] b _08039EC6 .align 2, 0 -_08039E6C: .4byte gLinkState -_08039E70: .4byte gLinkEntity +_08039E6C: .4byte gPlayerState +_08039E70: .4byte gPlayerEntity _08039E74: ldrb r1, [r5, #0xa] subs r1, #2 @@ -448,7 +448,7 @@ sub_08039EE4: @ 0x08039EE4 strh r2, [r3, #0x2a] ldr r0, _08039F40 @ =gUnk_080FD340 str r0, [r3, #0x48] - ldr r0, _08039F44 @ =gLinkEntity + ldr r0, _08039F44 @ =gPlayerEntity ldrb r0, [r0, #0x14] mov r1, ip adds r1, #0x76 @@ -480,14 +480,14 @@ sub_08039EE4: @ 0x08039EE4 pop {r4, r5, r6, pc} .align 2, 0 _08039F40: .4byte gUnk_080FD340 -_08039F44: .4byte gLinkEntity +_08039F44: .4byte gPlayerEntity _08039F48: .4byte gRoomControls thumb_func_start sub_08039F4C sub_08039F4C: @ 0x08039F4C push {lr} adds r3, r0, #0 - ldr r0, _08039F74 @ =gLinkEntity + ldr r0, _08039F74 @ =gPlayerEntity movs r1, #0x76 adds r1, r1, r3 mov ip, r1 @@ -506,7 +506,7 @@ sub_08039F4C: @ 0x08039F4C _08039F70: pop {pc} .align 2, 0 -_08039F74: .4byte gLinkEntity +_08039F74: .4byte gPlayerEntity thumb_func_start sub_08039F78 sub_08039F78: @ 0x08039F78 @@ -637,7 +637,7 @@ sub_0803A048: @ 0x0803A048 strb r0, [r4, #0xc] movs r0, #0xa strb r0, [r4, #0xe] - ldr r1, _0803A07C @ =gLinkEntity + ldr r1, _0803A07C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -645,7 +645,7 @@ _0803A076: pop {r4, pc} .align 2, 0 _0803A078: .4byte 0xFFFF0000 -_0803A07C: .4byte gLinkEntity +_0803A07C: .4byte gPlayerEntity thumb_func_start sub_0803A080 sub_0803A080: @ 0x0803A080 diff --git a/asm/fourElements.s b/asm/fourElements.s index 1e93c487..aee5a5f2 100644 --- a/asm/fourElements.s +++ b/asm/fourElements.s @@ -214,12 +214,12 @@ sub_080A034C: @ 0x080A034C lsls r0, r0, #0x18 cmp r0, #0 bne _080A038C - ldr r0, _080A0374 @ =gLinkEntity + ldr r0, _080A0374 @ =gPlayerEntity movs r1, #0 bl sub_0805E3A0 b _080A038C .align 2, 0 -_080A0374: .4byte gLinkEntity +_080A0374: .4byte gPlayerEntity _080A0378: movs r0, #0 movs r1, #0x3c @@ -295,7 +295,7 @@ sub_080A03E8: @ 0x080A03E8 bne _080A041A movs r0, #0x5a bl sub_0805E510 - ldr r0, _080A0420 @ =gLinkState + ldr r0, _080A0420 @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] @@ -307,7 +307,7 @@ _080A041A: pop {pc} .align 2, 0 _080A041C: .4byte gTextBox -_080A0420: .4byte gLinkState +_080A0420: .4byte gPlayerState thumb_func_start sub_080A0424 sub_080A0424: @ 0x080A0424 diff --git a/asm/furniture.s b/asm/furniture.s index 43187642..88a5b769 100644 --- a/asm/furniture.s +++ b/asm/furniture.s @@ -520,7 +520,7 @@ _08090A08: beq _08090AB0 b _08090B60 _08090A12: - ldr r2, _08090A34 @ =gLinkEntity + ldr r2, _08090A34 @ =gPlayerEntity movs r0, #0x32 ldrsh r1, [r2, r0] movs r3, #0x32 @@ -539,7 +539,7 @@ _08090A26: strb r1, [r5, #0x19] b _08090B60 .align 2, 0 -_08090A34: .4byte gLinkEntity +_08090A34: .4byte gPlayerEntity _08090A38: ldrb r0, [r5, #0x19] movs r1, #0xc0 @@ -604,7 +604,7 @@ _08090A8C: strb r0, [r5, #0x1e] b _08090B60 _08090AB0: - ldr r2, _08090B00 @ =gLinkEntity + ldr r2, _08090B00 @ =gPlayerEntity movs r3, #0x32 ldrsh r1, [r2, r3] movs r3, #0x32 @@ -612,7 +612,7 @@ _08090AB0: adds r0, #8 cmp r1, r0 bge _08090B14 - ldr r0, _08090B04 @ =gLinkState + ldr r0, _08090B04 @ =gPlayerState ldrb r0, [r0, #0x12] cmp r0, #0x1e beq _08090B60 @@ -641,8 +641,8 @@ _08090AB0: bl SetTile b _08090B60 .align 2, 0 -_08090B00: .4byte gLinkEntity -_08090B04: .4byte gLinkState +_08090B00: .4byte gPlayerEntity +_08090B04: .4byte gPlayerState _08090B08: .4byte 0x00004017 _08090B0C: .4byte 0x00004026 _08090B10: .4byte 0x0000403D diff --git a/asm/getEmptyEntity.s b/asm/getEmptyEntity.s index f78962f8..f3b43342 100644 --- a/asm/getEmptyEntity.s +++ b/asm/getEmptyEntity.s @@ -32,7 +32,7 @@ _0805E6A0: cmp r4, r1 blo _0805E68E _0805E6A6: - ldr r4, _0805E6CC @ =gLinkEntity + ldr r4, _0805E6CC @ =gPlayerEntity _0805E6A8: ldr r0, [r4] cmp r0, #0 @@ -51,7 +51,7 @@ _0805E6A8: adds r0, r4, #0 b _0805E730 .align 2, 0 -_0805E6CC: .4byte gLinkEntity +_0805E6CC: .4byte gPlayerEntity _0805E6D0: .4byte gUnk_03003DD0 _0805E6D4: adds r4, #0x88 diff --git a/asm/ghini.s b/asm/ghini.s index f8dd37b6..1a7136c0 100644 --- a/asm/ghini.s +++ b/asm/ghini.s @@ -273,14 +273,14 @@ sub_0803F1E0: @ 0x0803F1E0 strb r1, [r0, #0xd] movs r1, #0x3c strb r1, [r0, #0x1d] - ldr r1, _0803F1F8 @ =gLinkEntity + ldr r1, _0803F1F8 @ =gPlayerEntity ldrb r1, [r1, #0x14] lsrs r1, r1, #2 adds r1, #5 bl InitializeAnimation pop {pc} .align 2, 0 -_0803F1F8: .4byte gLinkEntity +_0803F1F8: .4byte gPlayerEntity thumb_func_start sub_0803F1FC sub_0803F1FC: @ 0x0803F1FC @@ -631,7 +631,7 @@ _0803F494: adds r0, #0xc strh r0, [r1] _0803F4A6: - ldr r2, _0803F500 @ =gLinkEntity + ldr r2, _0803F500 @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x45 ldrb r0, [r0] @@ -676,7 +676,7 @@ _0803F4B6: bl sub_0803F6EC b _0803F50A .align 2, 0 -_0803F500: .4byte gLinkEntity +_0803F500: .4byte gPlayerEntity _0803F504: adds r0, r4, #0 bl sub_0803F738 @@ -928,7 +928,7 @@ sub_0803F6C0: @ 0x0803F6C0 movs r1, #0xfe ands r1, r2 strb r1, [r0] - ldr r4, _0803F6E8 @ =gLinkEntity + ldr r4, _0803F6E8 @ =gPlayerEntity adds r1, r4, #0 adds r1, #0x3d movs r0, #0xc @@ -940,16 +940,16 @@ sub_0803F6C0: @ 0x0803F6C0 bl sub_0800449C pop {r4, pc} .align 2, 0 -_0803F6E8: .4byte gLinkEntity +_0803F6E8: .4byte gPlayerEntity thumb_func_start sub_0803F6EC sub_0803F6EC: @ 0x0803F6EC push {lr} - ldr r2, _0803F72C @ =gLinkEntity + ldr r2, _0803F72C @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x45 ldrb r0, [r0] - ldr r3, _0803F730 @ =gLinkState + ldr r3, _0803F730 @ =gPlayerState cmp r0, #0 beq _0803F720 ldrb r1, [r2, #0x10] @@ -978,16 +978,16 @@ _0803F720: str r0, [r3, #0x30] pop {pc} .align 2, 0 -_0803F72C: .4byte gLinkEntity -_0803F730: .4byte gLinkState +_0803F72C: .4byte gPlayerEntity +_0803F730: .4byte gPlayerState _0803F734: .4byte 0x0000FFFE thumb_func_start sub_0803F738 sub_0803F738: @ 0x0803F738 push {r4, lr} adds r4, r0, #0 - bl ResetLink - ldr r2, _0803F768 @ =gLinkState + bl ResetPlayer + ldr r2, _0803F768 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r1, r0 @@ -995,7 +995,7 @@ sub_0803F738: @ 0x0803F738 ldrb r1, [r2, #0xa] orrs r0, r1 strb r0, [r2, #0xa] - ldr r0, _0803F76C @ =gLinkEntity + ldr r0, _0803F76C @ =gPlayerEntity adds r1, r4, #0 movs r2, #0 movs r3, #1 @@ -1006,5 +1006,5 @@ sub_0803F738: @ 0x0803F738 strb r0, [r4] pop {r4, pc} .align 2, 0 -_0803F768: .4byte gLinkState -_0803F76C: .4byte gLinkEntity +_0803F768: .4byte gPlayerState +_0803F76C: .4byte gPlayerEntity diff --git a/asm/ghostBrothers.s b/asm/ghostBrothers.s index 0e393338..a30a4062 100644 --- a/asm/ghostBrothers.s +++ b/asm/ghostBrothers.s @@ -102,7 +102,7 @@ _08065C42: movs r0, #0 strb r1, [r4, #0xc] strb r0, [r2] - ldr r1, _08065C70 @ =gLinkEntity + ldr r1, _08065C70 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -113,7 +113,7 @@ _08065C42: bl sub_0806F118 b _08065CCA .align 2, 0 -_08065C70: .4byte gLinkEntity +_08065C70: .4byte gPlayerEntity _08065C74: adds r0, r4, #0 movs r1, #0 diff --git a/asm/giantTwig.s b/asm/giantTwig.s index dab04e84..c4ddf8e7 100644 --- a/asm/giantTwig.s +++ b/asm/giantTwig.s @@ -170,7 +170,7 @@ sub_08093884: @ 0x08093884 ldrb r0, [r2, #0xa] cmp r0, #0 bne _080938B8 - ldr r0, _080938A8 @ =gLinkEntity + ldr r0, _080938A8 @ =gPlayerEntity movs r3, #0x32 ldrsh r1, [r0, r3] movs r3, #0x32 @@ -184,7 +184,7 @@ sub_08093884: @ 0x08093884 movs r0, #0x40 b _080938B4 .align 2, 0 -_080938A8: .4byte gLinkEntity +_080938A8: .4byte gPlayerEntity _080938AC: ldrb r0, [r2, #0x19] movs r1, #0x3f @@ -655,7 +655,7 @@ sub_08093C70: @ 0x08093C70 ldrh r0, [r3] cmp r0, #0 beq _08093CE8 - ldr r0, _08093CE0 @ =gLinkState + ldr r0, _08093CE0 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 beq _08093D5C @@ -699,10 +699,10 @@ sub_08093C70: @ 0x08093C70 bl SetTile b _08093D5C .align 2, 0 -_08093CE0: .4byte gLinkState +_08093CE0: .4byte gPlayerState _08093CE4: .4byte 0x00004022 _08093CE8: - ldr r0, _08093D60 @ =gLinkState + ldr r0, _08093D60 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _08093D5C @@ -757,7 +757,7 @@ _08093CE8: _08093D5C: pop {r4, r5, r6, pc} .align 2, 0 -_08093D60: .4byte gLinkState +_08093D60: .4byte gPlayerState _08093D64: .4byte 0x0000403D _08093D68: .4byte 0x00004027 _08093D6C: .4byte 0x00004029 diff --git a/asm/gibdo.s b/asm/gibdo.s index 7581fab4..555d040c 100644 --- a/asm/gibdo.s +++ b/asm/gibdo.s @@ -328,8 +328,8 @@ sub_080376D0: @ 0x080376D0 bl sub_080379EC cmp r0, #0 bne _0803773A - bl ResetLink - ldr r2, _08037724 @ =gLinkState + bl ResetPlayer + ldr r2, _08037724 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r1, r0 @@ -337,7 +337,7 @@ sub_080376D0: @ 0x080376D0 ldrb r1, [r2, #0xa] orrs r0, r1 strb r0, [r2, #0xa] - ldr r0, _08037728 @ =gLinkEntity + ldr r0, _08037728 @ =gPlayerEntity adds r1, r4, #0 bl CopyPositionAndSpriteOffset adds r0, r4, #0 @@ -361,8 +361,8 @@ sub_080376D0: @ 0x080376D0 bl sub_08037A58 b _0803773A .align 2, 0 -_08037724: .4byte gLinkState -_08037728: .4byte gLinkEntity +_08037724: .4byte gPlayerState +_08037728: .4byte gPlayerEntity _0803772C: ldrb r0, [r2] movs r1, #1 @@ -849,12 +849,12 @@ _08037A84: thumb_func_start sub_08037ACC sub_08037ACC: @ 0x08037ACC - ldr r3, _08037B04 @ =gLinkState + ldr r3, _08037B04 @ =gPlayerState ldr r1, [r3, #0x30] ldr r2, _08037B08 @ =0xFFFFFEFF ands r1, r2 str r1, [r3, #0x30] - ldr r3, _08037B0C @ =gLinkEntity + ldr r3, _08037B0C @ =gPlayerEntity ldrb r2, [r3, #0x10] movs r1, #0x80 orrs r1, r2 @@ -877,15 +877,15 @@ sub_08037ACC: @ 0x08037ACC strh r0, [r1] bx lr .align 2, 0 -_08037B04: .4byte gLinkState +_08037B04: .4byte gPlayerState _08037B08: .4byte 0xFFFFFEFF -_08037B0C: .4byte gLinkEntity +_08037B0C: .4byte gPlayerEntity thumb_func_start sub_08037B10 sub_08037B10: @ 0x08037B10 push {r4, r5, r6, lr} adds r6, r0, #0 - ldr r5, _08037B44 @ =gLinkEntity + ldr r5, _08037B44 @ =gPlayerEntity adds r1, r5, #0 adds r1, #0x3d movs r0, #0xc @@ -907,7 +907,7 @@ sub_08037B10: @ 0x08037B10 _08037B40: pop {r4, r5, r6, pc} .align 2, 0 -_08037B44: .4byte gLinkEntity +_08037B44: .4byte gPlayerEntity thumb_func_start sub_08037B48 sub_08037B48: @ 0x08037B48 diff --git a/asm/gina.s b/asm/gina.s index 16be23ce..f6471f82 100644 --- a/asm/gina.s +++ b/asm/gina.s @@ -53,7 +53,7 @@ _0806C182: movs r0, #0 strb r1, [r4, #0xc] strb r0, [r2] - ldr r1, _0806C1B0 @ =gLinkEntity + ldr r1, _0806C1B0 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -64,7 +64,7 @@ _0806C182: bl sub_0806F118 b _0806C1D2 .align 2, 0 -_0806C1B0: .4byte gLinkEntity +_0806C1B0: .4byte gPlayerEntity _0806C1B4: adds r0, r4, #0 movs r1, #0 diff --git a/asm/gleerok.s b/asm/gleerok.s index 02f3d5b2..d9ff5716 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -96,7 +96,7 @@ _0802D090: lsls r0, r0, #5 cmp r1, r0 bne _0802D0D2 - ldr r0, _0802D0F0 @ =gLinkEntity + ldr r0, _0802D0F0 @ =gPlayerEntity bl sub_0807AABC bl DeleteThisEntity _0802D0D2: @@ -113,7 +113,7 @@ _0802D0D2: b _0802D148 .align 2, 0 _0802D0EC: .4byte gScreen -_0802D0F0: .4byte gLinkEntity +_0802D0F0: .4byte gPlayerEntity _0802D0F4: movs r0, #0x94 lsls r0, r0, #1 @@ -122,10 +122,10 @@ _0802D0F4: bl sub_0804A7D4 b _0802D148 _0802D104: - ldr r5, _0802D14C @ =gLinkState + ldr r5, _0802D14C @ =gPlayerState movs r0, #1 strb r0, [r5, #0x14] - ldr r1, _0802D150 @ =gLinkEntity + ldr r1, _0802D150 @ =gPlayerEntity adds r0, r4, #0 adds r0, #0x5a ldrb r0, [r0] @@ -156,8 +156,8 @@ _0802D128: _0802D148: pop {r4, r5, pc} .align 2, 0 -_0802D14C: .4byte gLinkState -_0802D150: .4byte gLinkEntity +_0802D14C: .4byte gPlayerState +_0802D150: .4byte gPlayerEntity _0802D154: .4byte gUnk_080CD75C thumb_func_start sub_0802D158 @@ -204,7 +204,7 @@ sub_0802D170: @ 0x0802D170 bne _0802D216 movs r0, #2 strb r0, [r5, #0xc] - ldr r2, _0802D1F4 @ =gLinkEntity + ldr r2, _0802D1F4 @ =gPlayerEntity ldr r4, _0802D1F8 @ =gRoomControls ldrh r0, [r4, #6] adds r0, #0x98 @@ -238,7 +238,7 @@ sub_0802D170: @ 0x0802D170 b _0802D216 .align 2, 0 _0802D1F0: .4byte gUnk_03000FD0 -_0802D1F4: .4byte gLinkEntity +_0802D1F4: .4byte gPlayerEntity _0802D1F8: .4byte gRoomControls _0802D1FC: movs r0, #3 @@ -487,7 +487,7 @@ sub_0802D3B8: @ 0x0802D3B8 ldr r0, _0802D3F8 @ =0x0000FDFF ands r0, r1 strh r0, [r2] - ldr r0, _0802D3FC @ =gLinkEntity + ldr r0, _0802D3FC @ =gPlayerEntity bl sub_0807AABC bl DeleteThisEntity _0802D3DE: @@ -506,7 +506,7 @@ _0802D3EA: .align 2, 0 _0802D3F4: .4byte gScreen _0802D3F8: .4byte 0x0000FDFF -_0802D3FC: .4byte gLinkEntity +_0802D3FC: .4byte gPlayerEntity _0802D400: .4byte _0802D404 _0802D404: @ jump table .4byte _0802D420 @ case 0 @@ -650,7 +650,7 @@ _0802D4D6: adds r0, #8 strb r3, [r0] _0802D52E: - ldr r0, _0802D540 @ =gLinkState + ldr r0, _0802D540 @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] @@ -659,7 +659,7 @@ _0802D52E: bl InitializeAnimation b _0802D63C .align 2, 0 -_0802D540: .4byte gLinkState +_0802D540: .4byte gPlayerState _0802D544: ldrb r0, [r4, #0xb] cmp r0, #1 @@ -818,7 +818,7 @@ sub_0802D674: @ 0x0802D674 ldr r0, _0802D6B4 @ =gUnk_02034490 movs r7, #1 strb r7, [r0] - ldr r5, _0802D6B8 @ =gLinkEntity + ldr r5, _0802D6B8 @ =gPlayerEntity ldr r6, [r5, #0x34] cmp r6, #0 bne _0802D6EC @@ -845,7 +845,7 @@ _0802D692: b _0802D6EC .align 2, 0 _0802D6B4: .4byte gUnk_02034490 -_0802D6B8: .4byte gLinkEntity +_0802D6B8: .4byte gPlayerEntity _0802D6BC: .4byte 0x00000127 _0802D6C0: .4byte gRoomControls _0802D6C4: @@ -1010,9 +1010,9 @@ sub_0802D7B4: @ 0x0802D7B4 movs r0, #0x18 strb r0, [r1, #0xe] ldr r1, _0802D800 @ =gRoomControls - ldr r0, _0802D804 @ =gLinkEntity + ldr r0, _0802D804 @ =gPlayerEntity str r0, [r1, #0x30] - ldr r0, _0802D808 @ =gLinkState + ldr r0, _0802D808 @ =gPlayerState adds r0, #0x8b strb r2, [r0] ldr r0, _0802D80C @ =gUnk_02034490 @@ -1023,8 +1023,8 @@ sub_0802D7B4: @ 0x0802D7B4 .align 2, 0 _0802D7FC: .4byte gUnk_080CD7F8 _0802D800: .4byte gRoomControls -_0802D804: .4byte gLinkEntity -_0802D808: .4byte gLinkState +_0802D804: .4byte gPlayerEntity +_0802D808: .4byte gPlayerState _0802D80C: .4byte gUnk_02034490 _0802D810: strb r1, [r5, #0xe] @@ -1167,7 +1167,7 @@ _0802D918: bne _0802D924 b _0802DB7E _0802D924: - ldr r1, _0802D944 @ =gLinkEntity + ldr r1, _0802D944 @ =gPlayerEntity adds r0, r4, #0 movs r2, #8 movs r3, #8 @@ -1176,7 +1176,7 @@ _0802D924: bne _0802D936 b _0802DB7E _0802D936: - ldr r0, _0802D948 @ =gLinkState + ldr r0, _0802D948 @ =gPlayerState movs r1, #1 strb r1, [r0, #0x14] adds r0, #0x3f @@ -1184,8 +1184,8 @@ _0802D936: strb r1, [r0] b _0802DB7E .align 2, 0 -_0802D944: .4byte gLinkEntity -_0802D948: .4byte gLinkState +_0802D944: .4byte gPlayerEntity +_0802D948: .4byte gPlayerState _0802D94C: adds r0, r4, #0 adds r0, #0x5a @@ -1477,7 +1477,7 @@ _0802DB80: .4byte gUnk_080CD810 sub_0802DB84: @ 0x0802DB84 push {r4, r5, lr} adds r5, r0, #0 - ldr r1, _0802DBB0 @ =gLinkEntity + ldr r1, _0802DBB0 @ =gPlayerEntity bl GetFacingDirection strb r0, [r5, #0x15] adds r1, r5, #0 @@ -1496,7 +1496,7 @@ sub_0802DB84: @ 0x0802DB84 strb r0, [r1] b _0802DC1A .align 2, 0 -_0802DBB0: .4byte gLinkEntity +_0802DBB0: .4byte gPlayerEntity _0802DBB4: ldrb r0, [r2, #1] ldrb r1, [r5, #0x15] @@ -1560,7 +1560,7 @@ _0802DC1A: sub_0802DC1C: @ 0x0802DC1C push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r1, _0802DC40 @ =gLinkEntity + ldr r1, _0802DC40 @ =gPlayerEntity bl GetFacingDirection adds r3, r0, #0 adds r1, r5, #0 @@ -1576,7 +1576,7 @@ sub_0802DC1C: @ 0x0802DC1C bhi _0802DC54 b _0802DC48 .align 2, 0 -_0802DC40: .4byte gLinkEntity +_0802DC40: .4byte gPlayerEntity _0802DC44: cmp r3, #2 bls _0802DC54 @@ -1670,7 +1670,7 @@ sub_0802DCE0: @ 0x0802DCE0 ldrb r0, [r1, #0xe] cmp r0, #0xc beq _0802DD44 - ldr r1, _0802DD1C @ =gLinkEntity + ldr r1, _0802DD1C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -1691,7 +1691,7 @@ sub_0802DCE0: @ 0x0802DCE0 strb r0, [r4, #0xf] b _0802DDD0 .align 2, 0 -_0802DD1C: .4byte gLinkEntity +_0802DD1C: .4byte gPlayerEntity _0802DD20: ldrb r0, [r2, #0x15] ldrb r1, [r4, #0x15] @@ -2194,12 +2194,12 @@ sub_0802E0B8: @ 0x0802E0B8 ands r2, r0 cmp r2, #0 beq _0802E0F4 - ldr r1, _0802E128 @ =gLinkEntity + ldr r1, _0802E128 @ =gPlayerEntity adds r0, r4, #0 bl sub_0806FC80 cmp r0, #0 beq _0802E0F4 - ldr r0, _0802E12C @ =gLinkState + ldr r0, _0802E12C @ =gPlayerState movs r1, #1 strb r1, [r0, #0x14] adds r0, #0x3f @@ -2231,8 +2231,8 @@ _0802E0F4: bl PlaySFX b _0802E1CA .align 2, 0 -_0802E128: .4byte gLinkEntity -_0802E12C: .4byte gLinkState +_0802E128: .4byte gPlayerEntity +_0802E12C: .4byte gPlayerState _0802E130: .4byte gUnk_080CD844 _0802E134: ldrb r1, [r4, #0x10] @@ -2341,12 +2341,12 @@ _0802E1F6: ands r2, r0 cmp r2, #0 beq _0802E218 - ldr r1, _0802E280 @ =gLinkEntity + ldr r1, _0802E280 @ =gPlayerEntity adds r0, r5, #0 bl sub_0806FC80 cmp r0, #0 beq _0802E218 - ldr r0, _0802E284 @ =gLinkState + ldr r0, _0802E284 @ =gPlayerState movs r1, #1 strb r1, [r0, #0x14] adds r0, #0x3f @@ -2404,8 +2404,8 @@ _0802E23A: bl sub_08080964 b _0802E2E4 .align 2, 0 -_0802E280: .4byte gLinkEntity -_0802E284: .4byte gLinkState +_0802E280: .4byte gPlayerEntity +_0802E284: .4byte gPlayerState _0802E288: .4byte gScreen _0802E28C: adds r4, r7, #0 @@ -2563,7 +2563,7 @@ _0802E3A4: adds r0, r4, #0 adds r0, #0x84 ldr r5, [r0] - ldr r1, _0802E408 @ =gLinkEntity + ldr r1, _0802E408 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -2605,7 +2605,7 @@ _0802E400: strb r0, [r1, #0xe] b _0802E422 .align 2, 0 -_0802E408: .4byte gLinkEntity +_0802E408: .4byte gPlayerEntity _0802E40C: ldr r0, _0802E42C @ =gScreenTransition ldr r0, [r0] @@ -3369,7 +3369,7 @@ _0802E9A4: sub_0802E9B0: @ 0x0802E9B0 push {r4, lr} adds r4, r0, #0 - ldr r0, _0802E9D0 @ =gLinkEntity + ldr r0, _0802E9D0 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r3, #0x32 @@ -3382,7 +3382,7 @@ sub_0802E9B0: @ 0x0802E9B0 movs r2, #0xa b _0802E9EA .align 2, 0 -_0802E9D0: .4byte gLinkEntity +_0802E9D0: .4byte gPlayerEntity _0802E9D4: adds r1, r2, #0 subs r1, #0x60 diff --git a/asm/greatFairy.s b/asm/greatFairy.s index 0ffcae96..d4d0764a 100644 --- a/asm/greatFairy.s +++ b/asm/greatFairy.s @@ -175,7 +175,7 @@ sub_08087424: @ 0x08087424 adds r4, r0, #0 cmp r4, #0 beq _0808744E - ldr r0, _0808745C @ =gLinkEntity + ldr r0, _0808745C @ =gPlayerEntity str r0, [r4, #0x50] adds r1, r4, #0 bl CopyPosition @@ -190,7 +190,7 @@ _0808744E: beq _0808746C b _08087474 .align 2, 0 -_0808745C: .4byte gLinkEntity +_0808745C: .4byte gPlayerEntity _08087460: ldr r0, _08087468 @ =gUnk_02002A40 adds r0, #0xad diff --git a/asm/gregal.s b/asm/gregal.s index 274d9323..9bd9bd63 100644 --- a/asm/gregal.s +++ b/asm/gregal.s @@ -203,7 +203,7 @@ _0806CC40: adds r1, r4, #0 adds r1, #0x69 strb r0, [r1] - ldr r1, _0806CC7C @ =gLinkEntity + ldr r1, _0806CC7C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -215,7 +215,7 @@ _0806CC40: bl sub_0806F118 b _0806CCB0 .align 2, 0 -_0806CC7C: .4byte gLinkEntity +_0806CC7C: .4byte gPlayerEntity _0806CC80: adds r0, r4, #0 movs r1, #0 diff --git a/asm/guardWithSpear.s b/asm/guardWithSpear.s index 0c8417d3..710a6b81 100644 --- a/asm/guardWithSpear.s +++ b/asm/guardWithSpear.s @@ -175,7 +175,7 @@ sub_08064198: @ 0x08064198 subs r0, r1, #1 strb r0, [r4] _080641AE: - ldr r0, _080641D8 @ =gLinkEntity + ldr r0, _080641D8 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r0, r2] movs r2, #0x32 @@ -199,7 +199,7 @@ _080641CA: movs r0, #0x10 b _080641DE .align 2, 0 -_080641D8: .4byte gLinkEntity +_080641D8: .4byte gPlayerEntity _080641DC: movs r0, #0 _080641DE: @@ -220,7 +220,7 @@ _080641E6: adds r6, #0x71 cmp r4, r0 beq _08064256 - ldr r0, _080642B0 @ =gLinkEntity + ldr r0, _080642B0 @ =gPlayerEntity movs r2, #0x24 ldrsh r1, [r0, r2] movs r0, #0xa0 @@ -265,7 +265,7 @@ _08064256: ldrsb r0, [r6, r0] cmp r0, #0 bne _0806428C - ldr r1, _080642B0 @ =gLinkEntity + ldr r1, _080642B0 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection bl sub_0806F5B0 @@ -290,7 +290,7 @@ _0806428C: bl sub_0806ED78 movs r0, #0x36 ldrsh r4, [r5, r0] - ldr r0, _080642B0 @ =gLinkEntity + ldr r0, _080642B0 @ =gPlayerEntity ldrh r0, [r0, #0x36] strh r0, [r5, #0x36] cmp r4, #0 @@ -303,7 +303,7 @@ _0806428C: _080642AC: pop {r4, r5, r6, pc} .align 2, 0 -_080642B0: .4byte gLinkEntity +_080642B0: .4byte gPlayerEntity _080642B4: .4byte gScreenTransition thumb_func_start sub_080642B8 @@ -320,7 +320,7 @@ sub_080642B8: @ 0x080642B8 subs r0, r1, #1 strb r0, [r4] _080642CE: - ldr r0, _080642F8 @ =gLinkEntity + ldr r0, _080642F8 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r2, #0x2e @@ -344,7 +344,7 @@ _080642EA: movs r0, #8 b _080642FE .align 2, 0 -_080642F8: .4byte gLinkEntity +_080642F8: .4byte gPlayerEntity _080642FC: movs r0, #0x18 _080642FE: @@ -365,7 +365,7 @@ _08064306: adds r6, #0x71 cmp r4, r0 beq _08064376 - ldr r0, _080643D0 @ =gLinkEntity + ldr r0, _080643D0 @ =gPlayerEntity movs r2, #0x24 ldrsh r1, [r0, r2] movs r0, #0xa0 @@ -410,7 +410,7 @@ _08064376: ldrsb r0, [r6, r0] cmp r0, #0 bne _080643AC - ldr r1, _080643D0 @ =gLinkEntity + ldr r1, _080643D0 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection bl sub_0806F5B0 @@ -435,7 +435,7 @@ _080643AC: bl sub_0806ED78 movs r0, #0x36 ldrsh r4, [r5, r0] - ldr r0, _080643D0 @ =gLinkEntity + ldr r0, _080643D0 @ =gPlayerEntity ldrh r0, [r0, #0x36] strh r0, [r5, #0x36] cmp r4, #0 @@ -448,7 +448,7 @@ _080643AC: _080643CC: pop {r4, r5, r6, pc} .align 2, 0 -_080643D0: .4byte gLinkEntity +_080643D0: .4byte gPlayerEntity _080643D4: .4byte gScreenTransition thumb_func_start sub_080643D8 @@ -533,7 +533,7 @@ _0806446C: .4byte gUnk_0810D0A4 thumb_func_start sub_08064470 sub_08064470: @ 0x08064470 push {lr} - ldr r0, _08064484 @ =gLinkState + ldr r0, _08064484 @ =gPlayerState adds r0, #0xab ldrb r0, [r0] cmp r0, #1 @@ -543,12 +543,12 @@ _0806447E: str r0, [r1, #0x14] pop {pc} .align 2, 0 -_08064484: .4byte gLinkState +_08064484: .4byte gPlayerState thumb_func_start sub_08064488 sub_08064488: @ 0x08064488 push {lr} - ldr r1, _080644A0 @ =gLinkState + ldr r1, _080644A0 @ =gPlayerState adds r0, r1, #0 adds r0, #0xa8 ldrb r0, [r0] @@ -560,17 +560,17 @@ sub_08064488: @ 0x08064488 _0806449C: pop {pc} .align 2, 0 -_080644A0: .4byte gLinkState +_080644A0: .4byte gPlayerState thumb_func_start sub_080644A4 sub_080644A4: @ 0x080644A4 - ldr r0, _080644B0 @ =gLinkState + ldr r0, _080644B0 @ =gPlayerState adds r0, #0xab movs r1, #0 strb r1, [r0] bx lr .align 2, 0 -_080644B0: .4byte gLinkState +_080644B0: .4byte gPlayerState thumb_func_start sub_080644B4 sub_080644B4: @ 0x080644B4 diff --git a/asm/gyorgChild.s b/asm/gyorgChild.s index 9850cc4c..87995eb8 100644 --- a/asm/gyorgChild.s +++ b/asm/gyorgChild.s @@ -339,7 +339,7 @@ _080488AA: cmp r0, #2 bne _080488D0 _080488AE: - ldr r1, _080488C8 @ =gLinkEntity + ldr r1, _080488C8 @ =gPlayerEntity adds r0, r4, #0 adds r0, #0x74 ldrh r0, [r0] @@ -353,7 +353,7 @@ _080488AE: ldrh r1, [r1, #0xc] b _080488E8 .align 2, 0 -_080488C8: .4byte gLinkEntity +_080488C8: .4byte gPlayerEntity _080488CC: .4byte gRoomControls _080488D0: ldr r1, _080488FC @ =gRoomControls @@ -363,7 +363,7 @@ _080488D0: ldrh r1, [r1, #0xa] adds r0, r0, r1 strh r0, [r4, #0x2e] - ldr r1, _08048900 @ =gLinkEntity + ldr r1, _08048900 @ =gPlayerEntity adds r0, r4, #0 adds r0, #0x76 ldrh r0, [r0] @@ -381,7 +381,7 @@ _080488FA: pop {r4, pc} .align 2, 0 _080488FC: .4byte gRoomControls -_08048900: .4byte gLinkEntity +_08048900: .4byte gPlayerEntity thumb_func_start sub_08048904 sub_08048904: @ 0x08048904 diff --git a/asm/gyorgFemale.s b/asm/gyorgFemale.s index cae9b128..7523b997 100644 --- a/asm/gyorgFemale.s +++ b/asm/gyorgFemale.s @@ -121,7 +121,7 @@ sub_0804614C: @ 0x0804614C bl sub_0804660C adds r0, r6, #0 bl sub_080464C0 - ldr r0, _08046254 @ =gLinkEntity + ldr r0, _08046254 @ =gPlayerEntity adds r1, r0, #0 adds r1, #0x38 strb r5, [r1] @@ -136,7 +136,7 @@ _08046244: _08046248: .4byte gUnk_03003DBC _0804624C: .4byte gUnk_02019EE0 _08046250: .4byte gUnk_02002F00 -_08046254: .4byte gLinkEntity +_08046254: .4byte gPlayerEntity _08046258: .4byte sub_08046498 thumb_func_start sub_0804625C @@ -586,7 +586,7 @@ _080465C4: .4byte gUnk_080B3E80 thumb_func_start sub_080465C8 sub_080465C8: @ 0x080465C8 push {r4, lr} - ldr r3, _080465FC @ =gLinkEntity + ldr r3, _080465FC @ =gPlayerEntity movs r0, #0x2e ldrsh r2, [r3, r0] ldr r1, _08046600 @ =gRoomControls @@ -606,16 +606,16 @@ sub_080465C8: @ 0x080465C8 ldrh r0, [r0] cmp r0, #0 beq _080465F8 - ldr r1, _08046608 @ =gLinkState + ldr r1, _08046608 @ =gPlayerState movs r0, #1 strb r0, [r1, #0x14] _080465F8: pop {r4, pc} .align 2, 0 -_080465FC: .4byte gLinkEntity +_080465FC: .4byte gPlayerEntity _08046600: .4byte gRoomControls _08046604: .4byte gUnk_02019EE0 -_08046608: .4byte gLinkState +_08046608: .4byte gPlayerState thumb_func_start sub_0804660C sub_0804660C: @ 0x0804660C @@ -817,7 +817,7 @@ _0804674C: adds r0, r1, #0 cmp r0, #0xff beq _080467CC - ldr r2, _080467D8 @ =gLinkEntity + ldr r2, _080467D8 @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x3e strb r1, [r0] @@ -854,7 +854,7 @@ _080467CC: strb r0, [r1] pop {r4, r5, r6, r7, pc} .align 2, 0 -_080467D8: .4byte gLinkEntity +_080467D8: .4byte gPlayerEntity thumb_func_start sub_080467DC sub_080467DC: @ 0x080467DC diff --git a/asm/gyorgFemaleEye.s b/asm/gyorgFemaleEye.s index 174b71e2..30a31622 100644 --- a/asm/gyorgFemaleEye.s +++ b/asm/gyorgFemaleEye.s @@ -120,7 +120,7 @@ _08048A7C: adds r1, r1, r0 ldr r0, [r5, #0x4c] str r0, [r1] - ldr r2, _08048ACC @ =gLinkEntity + ldr r2, _08048ACC @ =gPlayerEntity movs r6, #0x2e ldrsh r0, [r2, r6] movs r6, #0x2e @@ -151,7 +151,7 @@ _08048A7C: strb r0, [r2] b _08048AD8 .align 2, 0 -_08048ACC: .4byte gLinkEntity +_08048ACC: .4byte gPlayerEntity _08048AD0: ldr r0, [r4, #0x64] adds r0, #0x3c diff --git a/asm/gyorgFemaleMouth.s b/asm/gyorgFemaleMouth.s index 90d121e9..007356a9 100644 --- a/asm/gyorgFemaleMouth.s +++ b/asm/gyorgFemaleMouth.s @@ -85,16 +85,16 @@ _0804901E: ands r0, r5 cmp r0, #0 beq _08049038 - ldr r0, _08049034 @ =gLinkEntity + ldr r0, _08049034 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r4, r2] movs r2, #0x32 ldrsh r0, [r0, r2] b _08049042 .align 2, 0 -_08049034: .4byte gLinkEntity +_08049034: .4byte gPlayerEntity _08049038: - ldr r0, _08049054 @ =gLinkEntity + ldr r0, _08049054 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r4, r2] movs r2, #0x2e @@ -111,5 +111,5 @@ _08049048: str r0, [r4, #0x48] pop {r4, r5, r6, pc} .align 2, 0 -_08049054: .4byte gLinkEntity +_08049054: .4byte gPlayerEntity _08049058: .4byte gUnk_080D28AC diff --git a/asm/gyorgMale.s b/asm/gyorgMale.s index b629c4d4..f51bb0d8 100644 --- a/asm/gyorgMale.s +++ b/asm/gyorgMale.s @@ -77,7 +77,7 @@ _08046836: ands r0, r2 strb r0, [r4, #0x18] _08046878: - ldr r2, _08046894 @ =gLinkEntity + ldr r2, _08046894 @ =gPlayerEntity ldrh r1, [r2, #0x2e] adds r0, r4, #0 adds r0, #0x84 @@ -89,7 +89,7 @@ _08046878: .align 2, 0 _0804688C: .4byte gUnk_080D1AFC _08046890: .4byte gRoomControls -_08046894: .4byte gLinkEntity +_08046894: .4byte gPlayerEntity thumb_func_start sub_08046898 sub_08046898: @ 0x08046898 @@ -2193,7 +2193,7 @@ _0804780A: strb r0, [r4, #0x15] adds r0, r4, #0 bl sub_08047E48 - ldr r0, _0804786C @ =gLinkEntity + ldr r0, _0804786C @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r3, #0x32 @@ -2223,7 +2223,7 @@ _0804780A: b _0804790C .align 2, 0 _08047868: .4byte 0x000002FF -_0804786C: .4byte gLinkEntity +_0804786C: .4byte gPlayerEntity _08047870: ldr r5, _080478FC @ =gRoomControls ldrh r1, [r5, #6] @@ -2425,7 +2425,7 @@ _080479CC: beq _080479F4 str r4, [r0, #0x50] _080479F4: - ldr r0, _08047A78 @ =gLinkEntity + ldr r0, _08047A78 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r3, #0x32 @@ -2491,7 +2491,7 @@ _08047A2C: adds r1, #0x82 b _08047B04 .align 2, 0 -_08047A78: .4byte gLinkEntity +_08047A78: .4byte gPlayerEntity _08047A7C: .4byte gRoomControls _08047A80: ldr r2, _08047AA0 @ =gRoomControls @@ -2911,7 +2911,7 @@ sub_08047D88: @ 0x08047D88 lsrs r0, r0, #6 cmp r0, #3 bne _08047DB0 - ldr r0, _08047DE8 @ =gLinkState + ldr r0, _08047DE8 @ =gPlayerState ldrb r0, [r0, #0x14] cmp r0, #0 bne _08047DE6 @@ -2921,7 +2921,7 @@ _08047DB0: ldrb r0, [r0] cmp r0, #1 beq _08047DE6 - ldr r4, _08047DEC @ =gLinkEntity + ldr r4, _08047DEC @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] movs r0, #0x32 @@ -2931,7 +2931,7 @@ _08047DB0: bl sub_0806FCB8 cmp r0, #0 beq _08047DE6 - ldr r0, _08047DE8 @ =gLinkState + ldr r0, _08047DE8 @ =gPlayerState movs r1, #1 strb r1, [r0, #0x14] movs r1, #0x36 @@ -2945,8 +2945,8 @@ _08047DB0: _08047DE6: pop {r4, r5, pc} .align 2, 0 -_08047DE8: .4byte gLinkState -_08047DEC: .4byte gLinkEntity +_08047DE8: .4byte gPlayerState +_08047DEC: .4byte gPlayerEntity thumb_func_start sub_08047DF0 sub_08047DF0: @ 0x08047DF0 @@ -2976,7 +2976,7 @@ sub_08047DF0: @ 0x08047DF0 bl sub_08079F8C cmp r0, #0 beq _08047E42 - ldr r0, _08047E44 @ =gLinkEntity + ldr r0, _08047E44 @ =gPlayerEntity ldrh r1, [r5, #0x2e] subs r1, r1, r4 ldrh r2, [r0, #0x2e] @@ -2990,7 +2990,7 @@ sub_08047DF0: @ 0x08047DF0 _08047E42: pop {r4, r5, r6, pc} .align 2, 0 -_08047E44: .4byte gLinkEntity +_08047E44: .4byte gPlayerEntity thumb_func_start sub_08047E48 sub_08047E48: @ 0x08047E48 @@ -3024,7 +3024,7 @@ sub_08047E58: @ 0x08047E58 bl sub_08079F8C cmp r0, #0 beq _08047E9C - ldr r0, _08047EA0 @ =gLinkEntity + ldr r0, _08047EA0 @ =gPlayerEntity ldrh r1, [r4, #0x2e] subs r1, r1, r5 ldrh r2, [r0, #0x2e] @@ -3038,7 +3038,7 @@ sub_08047E58: @ 0x08047E58 _08047E9C: pop {r4, r5, r6, pc} .align 2, 0 -_08047EA0: .4byte gLinkEntity +_08047EA0: .4byte gPlayerEntity thumb_func_start sub_08047EA4 sub_08047EA4: @ 0x08047EA4 @@ -3069,7 +3069,7 @@ sub_08047EA4: @ 0x08047EA4 bl sub_08047F68 lsls r0, r0, #8 mov r8, r0 - ldr r6, _08047F60 @ =gLinkEntity + ldr r6, _08047F60 @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r6, r1] movs r2, #0x2e @@ -3137,13 +3137,13 @@ _08047F58: mov r8, r3 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08047F60: .4byte gLinkEntity +_08047F60: .4byte gPlayerEntity _08047F64: .4byte gSineTable thumb_func_start sub_08047F68 sub_08047F68: @ 0x08047F68 push {r4, r5, lr} - ldr r3, _08047F98 @ =gLinkEntity + ldr r3, _08047F98 @ =gPlayerEntity movs r1, #0x2e ldrsh r2, [r3, r1] movs r4, #0x2e @@ -3167,7 +3167,7 @@ sub_08047F68: @ 0x08047F68 movs r0, #0x20 b _08048002 .align 2, 0 -_08047F98: .4byte gLinkEntity +_08047F98: .4byte gPlayerEntity _08047F9C: ldr r0, _08047FB8 @ =gUnk_080D1C04 movs r3, #0x18 @@ -3251,7 +3251,7 @@ _0804801C: movs r1, #0x7f ands r1, r0 strb r1, [r4, #0x10] - ldr r6, _080480A4 @ =gLinkEntity + ldr r6, _080480A4 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r6, r1] cmp r0, #0 @@ -3317,7 +3317,7 @@ _08048086: strh r0, [r6, #0x32] b _08048138 .align 2, 0 -_080480A4: .4byte gLinkEntity +_080480A4: .4byte gPlayerEntity _080480A8: .4byte gRoomControls _080480AC: .4byte gUnk_02019EE0 _080480B0: diff --git a/asm/helmasaur.s b/asm/helmasaur.s index 007bf3fd..6b17b172 100644 --- a/asm/helmasaur.s +++ b/asm/helmasaur.s @@ -152,7 +152,7 @@ sub_0802BC74: @ 0x0802BC74 strb r0, [r4, #0xd] movs r0, #0x3c strb r0, [r4, #0x1d] - ldr r0, _0802BC9C @ =gLinkEntity + ldr r0, _0802BC9C @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 movs r1, #2 @@ -163,7 +163,7 @@ sub_0802BC74: @ 0x0802BC74 bl InitializeAnimation pop {r4, pc} .align 2, 0 -_0802BC9C: .4byte gLinkEntity +_0802BC9C: .4byte gPlayerEntity thumb_func_start sub_0802BCA0 sub_0802BCA0: @ 0x0802BCA0 diff --git a/asm/houseDoorInterior.s b/asm/houseDoorInterior.s index 244dcffb..fe322524 100644 --- a/asm/houseDoorInterior.s +++ b/asm/houseDoorInterior.s @@ -116,12 +116,12 @@ _08092C20: bl sub_0806ED9C cmp r0, #0 blt _08092C78 - ldr r1, _08092C6C @ =gLinkEntity + ldr r1, _08092C6C @ =gPlayerEntity ldrh r0, [r5] ldrb r1, [r1, #0x14] cmp r0, r1 bne _08092C78 - ldr r0, _08092C70 @ =gLinkState + ldr r0, _08092C70 @ =gPlayerState adds r0, #0x90 ldrh r1, [r0] ldrh r0, [r5, #2] @@ -133,8 +133,8 @@ _08092C20: b _08092C76 .align 2, 0 _08092C68: .4byte gUnk_081227CC -_08092C6C: .4byte gLinkEntity -_08092C70: .4byte gLinkState +_08092C6C: .4byte gPlayerEntity +_08092C70: .4byte gPlayerState _08092C74: movs r0, #8 _08092C76: diff --git a/asm/hurdyGurdyMan.s b/asm/hurdyGurdyMan.s index 76e75707..049ac213 100644 --- a/asm/hurdyGurdyMan.s +++ b/asm/hurdyGurdyMan.s @@ -57,7 +57,7 @@ _0806E34C: adds r1, r4, #0 adds r1, #0x69 strb r0, [r1] - ldr r1, _0806E3B0 @ =gLinkEntity + ldr r1, _0806E3B0 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -82,15 +82,15 @@ _0806E398: ldrh r3, [r3, #4] adds r0, r4, #0 bl sub_0801DFB4 - ldr r0, _0806E3B8 @ =gLinkState + ldr r0, _0806E3B8 @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] b _0806E3E0 .align 2, 0 -_0806E3B0: .4byte gLinkEntity +_0806E3B0: .4byte gPlayerEntity _0806E3B4: .4byte gUnk_08001A7C -_0806E3B8: .4byte gLinkState +_0806E3B8: .4byte gPlayerState _0806E3BC: adds r0, r4, #0 movs r1, #0 diff --git a/asm/initializeLink.s b/asm/initializeLink.s deleted file mode 100644 index 192b979f..00000000 --- a/asm/initializeLink.s +++ /dev/null @@ -1,174 +0,0 @@ - .include "asm/macros.inc" - .text - .syntax unified - - thumb_func_start InitializeLink -InitializeLink: @ 0x080524A8 - push {r4, r5, r6, lr} - bl sub_080784C8 - ldr r0, _08052510 @ =gUnk_03000B80 - movs r1, #0x70 - bl _DmaZero - ldr r6, _08052514 @ =gLinkState - adds r0, r6, #0 - movs r1, #0xb0 - bl _DmaZero - movs r0, #1 - rsbs r0, r0, #0 - adds r1, r6, #0 - adds r1, #0x40 - movs r2, #0x40 - bl _DmaFill32 - ldr r4, _08052518 @ =gLinkEntity - adds r0, r4, #0 - movs r1, #0x88 - bl _DmaZero - ldr r0, _0805251C @ =gRoomControls - str r4, [r0, #0x30] - ldr r1, _08052520 @ =gUnk_080FCAC8 - ldr r5, _08052524 @ =gScreenTransition - ldrb r0, [r5, #0xf] - adds r0, r0, r1 - ldrb r0, [r0] - strb r0, [r6, #0xc] - movs r0, #0x14 - bl CheckGlobalFlag - cmp r0, #0 - bne _080524FA - ldr r0, [r6, #0x30] - movs r1, #8 - orrs r0, r1 - str r0, [r6, #0x30] -_080524FA: - ldrb r0, [r5, #0xf] - subs r0, #2 - adds r2, r5, #0 - cmp r0, #0xa - bhi _080525C2 - lsls r0, r0, #2 - ldr r1, _08052528 @ =_0805252C - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08052510: .4byte gUnk_03000B80 -_08052514: .4byte gLinkState -_08052518: .4byte gLinkEntity -_0805251C: .4byte gRoomControls -_08052520: .4byte gUnk_080FCAC8 -_08052524: .4byte gScreenTransition -_08052528: .4byte _0805252C -_0805252C: @ jump table - .4byte _08052558 @ case 0 - .4byte _08052576 @ case 1 - .4byte _08052564 @ case 2 - .4byte _080525C2 @ case 3 - .4byte _08052558 @ case 4 - .4byte _08052584 @ case 5 - .4byte _08052584 @ case 6 - .4byte _080525C2 @ case 7 - .4byte _080525A0 @ case 8 - .4byte _080525AC @ case 9 - .4byte _080525B8 @ case 10 -_08052558: - ldr r0, _08052560 @ =0x0000FF40 - strh r0, [r4, #0x36] - b _080525C0 - .align 2, 0 -_08052560: .4byte 0x0000FF40 -_08052564: - ldr r0, _0805257C @ =gLinkState - adds r0, #0x38 - movs r1, #0x10 - strb r1, [r0] - ldr r1, _08052580 @ =gScreenTransition - ldrb r0, [r1, #0xe] - lsls r0, r0, #2 - strb r0, [r4, #0x15] - adds r2, r1, #0 -_08052576: - movs r0, #0xe0 - strh r0, [r4, #0x24] - b _080525C2 - .align 2, 0 -_0805257C: .4byte gLinkState -_08052580: .4byte gScreenTransition -_08052584: - ldr r1, _08052598 @ =gLinkState - adds r2, r1, #0 - adds r2, #0x38 - movs r0, #1 - strb r0, [r2] - ldr r2, _0805259C @ =gScreenTransition - ldrb r0, [r2, #0xf] - adds r1, #0x39 - strb r0, [r1] - b _080525C2 - .align 2, 0 -_08052598: .4byte gLinkState -_0805259C: .4byte gScreenTransition -_080525A0: - ldr r0, _080525A8 @ =gLinkState - adds r0, #0x38 - movs r1, #1 - b _080525BE - .align 2, 0 -_080525A8: .4byte gLinkState -_080525AC: - ldr r0, _080525B4 @ =gLinkState - adds r0, #0x38 - movs r1, #3 - b _080525BE - .align 2, 0 -_080525B4: .4byte gLinkState -_080525B8: - ldr r0, _08052614 @ =gLinkState - adds r0, #0x38 - movs r1, #4 -_080525BE: - strb r1, [r0] -_080525C0: - ldr r2, _08052618 @ =gScreenTransition -_080525C2: - movs r0, #1 - strb r0, [r4, #8] - ldrb r1, [r4, #0x10] - movs r0, #0xa0 - orrs r0, r1 - strb r0, [r4, #0x10] - adds r3, r4, #0 - adds r3, #0x29 - ldrb r1, [r3] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #4 - orrs r0, r1 - strb r0, [r3] - ldr r0, _0805261C @ =gUnk_02002A40 - adds r0, #0xaa - ldrb r0, [r0] - adds r1, r4, #0 - adds r1, #0x45 - strb r0, [r1] - ldrh r0, [r2, #0x10] - strh r0, [r4, #0x2e] - ldrh r0, [r2, #0x12] - strh r0, [r4, #0x32] - ldrb r0, [r2, #0xe] - strb r0, [r4, #0x14] - ldrb r1, [r2, #0x14] - adds r0, r4, #0 - adds r0, #0x38 - strb r1, [r0] - adds r0, r4, #0 - bl UpdateSpriteForCollisionLayer - adds r0, r4, #0 - movs r1, #1 - bl sub_0805EA2C - bl sub_08017640 - pop {r4, r5, r6, pc} - .align 2, 0 -_08052614: .4byte gLinkState -_08052618: .4byte gScreenTransition -_0805261C: .4byte gUnk_02002A40 diff --git a/asm/item11.s b/asm/item11.s index 8ea3fa78..f9d7a5f0 100644 --- a/asm/item11.s +++ b/asm/item11.s @@ -173,7 +173,7 @@ _08018F9E: sub_08018FA0: @ 0x08018FA0 push {lr} adds r2, r0, #0 - ldr r0, _08018FC8 @ =gLinkEntity + ldr r0, _08018FC8 @ =gPlayerEntity adds r0, #0x38 ldrb r0, [r0] adds r1, r2, #0 @@ -191,4 +191,4 @@ _08018FBC: bl PlaySFX pop {pc} .align 2, 0 -_08018FC8: .4byte gLinkEntity \ No newline at end of file +_08018FC8: .4byte gPlayerEntity \ No newline at end of file diff --git a/asm/itemForSale.s b/asm/itemForSale.s index 52c82031..8b447c9c 100644 --- a/asm/itemForSale.s +++ b/asm/itemForSale.s @@ -115,13 +115,13 @@ _080818C0: ldr r1, _080818E8 @ =gRoomVars movs r0, #1 str r0, [r1, #0x68] - ldr r1, _080818EC @ =gLinkState + ldr r1, _080818EC @ =gPlayerState movs r0, #7 strb r0, [r1, #0xc] b _08081920 .align 2, 0 _080818E8: .4byte gRoomVars -_080818EC: .4byte gLinkState +_080818EC: .4byte gPlayerState _080818F0: adds r1, r4, #0 adds r1, #0x39 @@ -133,11 +133,11 @@ _080818F0: movs r0, #1 strb r0, [r4, #0xd] bl sub_08078B48 - bl ResetLink - ldr r1, _08081924 @ =gLinkState + bl ResetPlayer + ldr r1, _08081924 @ =gPlayerState movs r0, #4 strb r0, [r1, #5] - ldr r0, _08081928 @ =gLinkEntity + ldr r0, _08081928 @ =gPlayerEntity str r4, [r0, #0x74] ldr r0, _0808192C @ =gUnk_0200AF00 adds r0, #0x2f @@ -147,8 +147,8 @@ _080818F0: _08081920: pop {r4, pc} .align 2, 0 -_08081924: .4byte gLinkState -_08081928: .4byte gLinkEntity +_08081924: .4byte gPlayerState +_08081928: .4byte gPlayerEntity _0808192C: .4byte gUnk_0200AF00 thumb_func_start sub_08081930 @@ -160,7 +160,7 @@ sub_08081930: @ 0x08081930 adds r6, #0x2f movs r0, #2 strb r0, [r6] - ldr r3, _0808196C @ =gLinkEntity + ldr r3, _0808196C @ =gPlayerEntity ldrb r1, [r3, #0x18] lsls r1, r1, #0x1e lsrs r1, r1, #0x1e @@ -169,7 +169,7 @@ sub_08081930: @ 0x08081930 ands r0, r2 orrs r0, r1 strb r0, [r4, #0x18] - ldr r5, _08081970 @ =gLinkState + ldr r5, _08081970 @ =gPlayerState ldrb r0, [r5, #5] cmp r0, #0 beq _0808195E @@ -182,8 +182,8 @@ _0808195E: b _080819AC .align 2, 0 _08081968: .4byte gUnk_0200AF00 -_0808196C: .4byte gLinkEntity -_08081970: .4byte gLinkState +_0808196C: .4byte gPlayerEntity +_08081970: .4byte gPlayerState _08081974: bl sub_080784E4 adds r1, r0, #0 @@ -203,7 +203,7 @@ _08081974: cmp r0, #0 bne _080819AC _08081998: - ldr r0, _080819B0 @ =gLinkState + ldr r0, _080819B0 @ =gPlayerState adds r0, #0x92 ldrh r1, [r0] movs r0, #0x98 @@ -215,7 +215,7 @@ _08081998: _080819AC: pop {r4, r5, r6, pc} .align 2, 0 -_080819B0: .4byte gLinkState +_080819B0: .4byte gPlayerState thumb_func_start sub_080819B4 sub_080819B4: @ 0x080819B4 @@ -236,10 +236,10 @@ sub_080819B4: @ 0x080819B4 _080819D0: bl DeleteThisEntity _080819D4: - ldr r0, _08081A4C @ =gLinkState + ldr r0, _08081A4C @ =gPlayerState movs r2, #0 strb r2, [r0, #5] - ldr r4, _08081A50 @ =gLinkEntity + ldr r4, _08081A50 @ =gPlayerEntity str r2, [r4, #0x74] ldr r1, _08081A54 @ =gUnk_0200AF00 ldr r3, _08081A48 @ =gRoomVars @@ -294,8 +294,8 @@ _080819D4: pop {r4, r5, r6, pc} .align 2, 0 _08081A48: .4byte gRoomVars -_08081A4C: .4byte gLinkState -_08081A50: .4byte gLinkEntity +_08081A4C: .4byte gPlayerState +_08081A50: .4byte gPlayerEntity _08081A54: .4byte gUnk_0200AF00 _08081A58: .4byte gRoomControls diff --git a/asm/itemOnGround.s b/asm/itemOnGround.s index aaf987cc..56f4fa8a 100644 --- a/asm/itemOnGround.s +++ b/asm/itemOnGround.s @@ -127,13 +127,13 @@ sub_08080A40: @ 0x08080A40 push {r4, r5, r6, r7, lr} ldr r7, _08080A70 @ =gRoomControls ldr r1, [r7, #0x30] - ldr r0, _08080A74 @ =gLinkEntity + ldr r0, _08080A74 @ =gPlayerEntity adds r2, r7, #0 cmp r1, r0 beq _08080A50 b _08080B5C _08080A50: - ldr r0, _08080A78 @ =gLinkState + ldr r0, _08080A78 @ =gPlayerState ldrb r0, [r0, #2] cmp r0, #0 beq _08080A5A @@ -152,8 +152,8 @@ _08080A64: mov pc, r0 .align 2, 0 _08080A70: .4byte gRoomControls -_08080A74: .4byte gLinkEntity -_08080A78: .4byte gLinkState +_08080A74: .4byte gPlayerEntity +_08080A78: .4byte gPlayerState _08080A7C: .4byte _08080A80 _08080A80: @ jump table .4byte _08080AFA @ case 0 @@ -897,13 +897,13 @@ _0808110E: adds r1, #0x3b movs r0, #0x11 strb r0, [r1] - ldr r0, _08081130 @ =gLinkEntity + ldr r0, _08081130 @ =gPlayerEntity adds r1, r2, #0 bl CopyPosition _0808112E: pop {pc} .align 2, 0 -_08081130: .4byte gLinkEntity +_08081130: .4byte gPlayerEntity thumb_func_start sub_08081134 sub_08081134: @ 0x08081134 @@ -1150,7 +1150,7 @@ _080812E4: sub_080812E8: @ 0x080812E8 push {r4, lr} adds r4, r0, #0 - ldr r3, _0808131C @ =gLinkState + ldr r3, _0808131C @ =gPlayerState adds r0, r3, #0 adds r0, #0x26 ldrb r1, [r0] @@ -1163,7 +1163,7 @@ sub_080812E8: @ 0x080812E8 ands r0, r2 cmp r0, #0 bne _08081318 - ldr r1, _08081320 @ =gLinkEntity + ldr r1, _08081320 @ =gPlayerEntity adds r0, r4, #0 bl sub_080177A0 cmp r0, #0 @@ -1173,8 +1173,8 @@ sub_080812E8: @ 0x080812E8 _08081318: pop {r4, pc} .align 2, 0 -_0808131C: .4byte gLinkState -_08081320: .4byte gLinkEntity +_0808131C: .4byte gPlayerState +_08081320: .4byte gPlayerEntity thumb_func_start nullsub_510 nullsub_510: @ 0x08081324 @@ -1202,7 +1202,7 @@ _08081342: ldrh r0, [r4, #0x36] subs r0, #1 strh r0, [r4, #0x36] - ldr r2, _08081368 @ =gLinkEntity + ldr r2, _08081368 @ =gPlayerEntity adds r0, r4, #0 adds r1, r2, #0 bl sub_080177A0 @@ -1213,7 +1213,7 @@ _08081342: _08081364: pop {r4, pc} .align 2, 0 -_08081368: .4byte gLinkEntity +_08081368: .4byte gPlayerEntity thumb_func_start sub_0808136C sub_0808136C: @ 0x0808136C @@ -1570,7 +1570,7 @@ _080815AC: movs r1, #3 orrs r0, r1 strb r0, [r2] - ldr r0, _08081618 @ =gLinkEntity + ldr r0, _08081618 @ =gPlayerEntity str r0, [r4, #0x54] adds r1, r4, #0 bl CopyPosition @@ -1590,4 +1590,4 @@ _080815AC: _08081614: pop {r4, pc} .align 2, 0 -_08081618: .4byte gLinkEntity +_08081618: .4byte gPlayerEntity diff --git a/asm/jarPortal.s b/asm/jarPortal.s index 2c797755..7a6fc73b 100644 --- a/asm/jarPortal.s +++ b/asm/jarPortal.s @@ -248,7 +248,7 @@ _0808C050: strb r0, [r2, #0x17] cmp r5, #1 bne _0808C0A6 - ldr r3, _0808C070 @ =gLinkState + ldr r3, _0808C070 @ =gPlayerState ldr r0, [r3, #0x30] movs r1, #0x20 ands r0, r1 @@ -261,7 +261,7 @@ _0808C050: b _0808C082 .align 2, 0 _0808C06C: .4byte gArea -_0808C070: .4byte gLinkState +_0808C070: .4byte gPlayerState _0808C074: bl sub_08057810 cmp r0, #0 diff --git a/asm/kid.s b/asm/kid.s index 3aa4ff7d..337736d6 100644 --- a/asm/kid.s +++ b/asm/kid.s @@ -263,7 +263,7 @@ _0806229A: ldrb r0, [r5] cmp r0, #7 bhi _080622F2 - ldr r1, _080622C8 @ =gLinkEntity + ldr r1, _080622C8 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -276,7 +276,7 @@ _0806229A: bl InitializeAnimation b _080622F2 .align 2, 0 -_080622C8: .4byte gLinkEntity +_080622C8: .4byte gPlayerEntity _080622CC: adds r0, r4, #0 bl GetNextFrame @@ -307,7 +307,7 @@ sub_080622F4: @ 0x080622F4 mov r6, r8 push {r6, r7} adds r7, r0, #0 - ldr r0, _0806239C @ =gLinkEntity + ldr r0, _0806239C @ =gPlayerEntity mov r8, r0 ldrh r1, [r0, #0x2e] ldr r3, _080623A0 @ =0xFFFF0000 @@ -325,7 +325,7 @@ sub_080622F4: @ 0x080622F4 ldrh r0, [r1, #0x36] ands r3, r6 orrs r3, r0 - ldr r0, _080623A8 @ =gLinkState + ldr r0, _080623A8 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] lsls r0, r0, #0x10 @@ -389,10 +389,10 @@ _08062390: strb r0, [r1] b _080624F8 .align 2, 0 -_0806239C: .4byte gLinkEntity +_0806239C: .4byte gPlayerEntity _080623A0: .4byte 0xFFFF0000 _080623A4: .4byte 0x0000FFFF -_080623A8: .4byte gLinkState +_080623A8: .4byte gPlayerState _080623AC: .4byte 0xFF00FFFF _080623B0: .4byte 0xC0FFFFFF _080623B4: .4byte 0x3FFFFFFF @@ -471,7 +471,7 @@ _08062430: bge _08062430 b _08062480 _08062442: - ldr r1, _080624E8 @ =gLinkEntity + ldr r1, _080624E8 @ =gPlayerEntity movs r3, #0x2e ldrsh r0, [r1, r3] movs r2, #0x32 @@ -559,7 +559,7 @@ _080624D8: strb r0, [r1] b _080624F2 .align 2, 0 -_080624E8: .4byte gLinkEntity +_080624E8: .4byte gPlayerEntity _080624EC: adds r0, r7, #0 bl UpdateAnimationSingleFrame @@ -603,7 +603,7 @@ sub_0806252C: @ 0x0806252C mov r5, r8 push {r5, r6, r7} adds r7, r0, #0 - ldr r4, _08062618 @ =gLinkEntity + ldr r4, _08062618 @ =gPlayerEntity ldrh r1, [r4, #0x2e] ldr r3, _0806261C @ =0xFFFF0000 adds r0, r3, #0 @@ -618,7 +618,7 @@ sub_0806252C: @ 0x0806252C ldrh r0, [r4, #0x36] ands r3, r6 orrs r3, r0 - ldr r0, _08062624 @ =gLinkState + ldr r0, _08062624 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] lsls r0, r0, #0x10 @@ -715,10 +715,10 @@ _080625C8: mov sl, r5 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08062618: .4byte gLinkEntity +_08062618: .4byte gPlayerEntity _0806261C: .4byte 0xFFFF0000 _08062620: .4byte 0x0000FFFF -_08062624: .4byte gLinkState +_08062624: .4byte gPlayerState _08062628: .4byte 0xFF00FFFF _0806262C: .4byte 0xC0FFFFFF _08062630: .4byte 0x3FFFFFFF diff --git a/asm/kingDaltus.s b/asm/kingDaltus.s index 9b6bb8c6..e77fb2d8 100644 --- a/asm/kingDaltus.s +++ b/asm/kingDaltus.s @@ -24,7 +24,7 @@ KingDaltus: @ 0x080665E4 movs r0, #0 strb r0, [r2] strb r1, [r4, #0xc] - ldr r1, _08066630 @ =gLinkEntity + ldr r1, _08066630 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -43,7 +43,7 @@ _0806661E: bl _call_via_r1 b _0806664E .align 2, 0 -_08066630: .4byte gLinkEntity +_08066630: .4byte gPlayerEntity _08066634: .4byte gUnk_081104EC _08066638: ldr r0, _08066650 @ =gUnk_081104E0 diff --git a/asm/ladderHoleInBookshelf.s b/asm/ladderHoleInBookshelf.s index 4f2b4648..4d1cd0d1 100644 --- a/asm/ladderHoleInBookshelf.s +++ b/asm/ladderHoleInBookshelf.s @@ -44,7 +44,7 @@ sub_08093FE0: @ 0x08093FE0 ldrb r0, [r3] cmp r0, #2 bne _08094024 - ldr r0, _08094020 @ =gLinkEntity + ldr r0, _08094020 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0x1e bgt _08094002 @@ -65,9 +65,9 @@ _08094002: orrs r0, r1 b _08094060 .align 2, 0 -_08094020: .4byte gLinkEntity +_08094020: .4byte gPlayerEntity _08094024: - ldr r0, _0809404C @ =gLinkEntity + ldr r0, _0809404C @ =gPlayerEntity ldrb r2, [r0, #0xc] cmp r2, #0x1e bgt _08094050 @@ -87,7 +87,7 @@ _08094024: orrs r0, r1 b _08094060 .align 2, 0 -_0809404C: .4byte gLinkEntity +_0809404C: .4byte gPlayerEntity _08094050: adds r2, r0, #0 adds r2, #0x38 @@ -106,7 +106,7 @@ _08094062: sub_08094064: @ 0x08094064 push {lr} movs r2, #1 - ldr r1, _08094080 @ =gLinkEntity + ldr r1, _08094080 @ =gPlayerEntity movs r3, #0x2e ldrsh r1, [r1, r3] movs r3, #0x2e @@ -120,4 +120,4 @@ _0809407C: adds r0, r2, #0 pop {pc} .align 2, 0 -_08094080: .4byte gLinkEntity +_08094080: .4byte gPlayerEntity diff --git a/asm/ladderUp.s b/asm/ladderUp.s index 654eb080..a9fe683f 100644 --- a/asm/ladderUp.s +++ b/asm/ladderUp.s @@ -136,14 +136,14 @@ _0808DC46: beq _0808DC4E b _0808DD72 _0808DC4E: - ldr r0, _0808DCC8 @ =gLinkEntity + ldr r0, _0808DCC8 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r0, r2] movs r3, #0x32 ldrsh r0, [r7, r3] cmp r1, r0 bge _0808DCDC - ldr r0, _0808DCCC @ =gLinkState + ldr r0, _0808DCCC @ =gPlayerState ldrb r0, [r0, #0x12] cmp r0, #0x1e bne _0808DC66 @@ -196,8 +196,8 @@ _0808DC74: bl sub_0807BA8C b _0808DD72 .align 2, 0 -_0808DCC8: .4byte gLinkEntity -_0808DCCC: .4byte gLinkState +_0808DCC8: .4byte gPlayerEntity +_0808DCCC: .4byte gPlayerState _0808DCD0: .4byte 0x00004017 _0808DCD4: .4byte 0x00004023 _0808DCD8: .4byte gRoomControls diff --git a/asm/lavaPlatform.s b/asm/lavaPlatform.s index ce50eb1b..32d6da37 100644 --- a/asm/lavaPlatform.s +++ b/asm/lavaPlatform.s @@ -240,14 +240,14 @@ _080923F8: strb r0, [r4, #0x10] movs r0, #0x14 strb r0, [r4, #0xe] - ldr r0, _0809241C @ =gLinkState + ldr r0, _0809241C @ =gPlayerState adds r0, #0x3f movs r1, #0xfd strb r1, [r0] _0809241A: pop {r4, pc} .align 2, 0 -_0809241C: .4byte gLinkState +_0809241C: .4byte gPlayerState thumb_func_start sub_08092420 sub_08092420: @ 0x08092420 @@ -256,7 +256,7 @@ sub_08092420: @ 0x08092420 bl sub_0809269C cmp r0, #0 beq _08092434 - ldr r0, _08092464 @ =gLinkState + ldr r0, _08092464 @ =gPlayerState adds r0, #0x3f movs r1, #0xfd strb r1, [r0] @@ -285,7 +285,7 @@ _08092434: _08092462: pop {r4, pc} .align 2, 0 -_08092464: .4byte gLinkState +_08092464: .4byte gPlayerState _08092468: .4byte 0x0000017B thumb_func_start sub_0809246C @@ -433,14 +433,14 @@ _08092570: bl sub_0809264C cmp r5, #0 beq _0809258A - ldr r0, _0809258C @ =gLinkState + ldr r0, _0809258C @ =gPlayerState adds r0, #0x3f movs r1, #0xfd strb r1, [r0] _0809258A: pop {r4, r5, pc} .align 2, 0 -_0809258C: .4byte gLinkState +_0809258C: .4byte gPlayerState thumb_func_start sub_08092590 sub_08092590: @ 0x08092590 @@ -592,13 +592,13 @@ _08092674: sub_0809269C: @ 0x0809269C push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r6, _080926D8 @ =gLinkState + ldr r6, _080926D8 @ =gPlayerState ldr r0, [r6, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 bne _080926E0 - ldr r5, _080926DC @ =gLinkEntity + ldr r5, _080926DC @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 movs r2, #0x10 @@ -619,8 +619,8 @@ sub_0809269C: @ 0x0809269C movs r0, #1 b _080926E2 .align 2, 0 -_080926D8: .4byte gLinkState -_080926DC: .4byte gLinkEntity +_080926D8: .4byte gPlayerState +_080926DC: .4byte gPlayerEntity _080926E0: movs r0, #0 _080926E2: diff --git a/asm/likeLike.s b/asm/likeLike.s index 81490b51..618b6227 100644 --- a/asm/likeLike.s +++ b/asm/likeLike.s @@ -84,7 +84,7 @@ _08027DD2: movs r0, #0xfc ands r0, r1 strb r0, [r2] - ldr r0, _08027E38 @ =gLinkEntity + ldr r0, _08027E38 @ =gPlayerEntity adds r0, #0x29 ldrb r0, [r0] lsls r0, r0, #0x1a @@ -115,7 +115,7 @@ _08027E2E: bl sub_0804AA30 pop {r4, pc} .align 2, 0 -_08027E38: .4byte gLinkEntity +_08027E38: .4byte gPlayerEntity _08027E3C: .4byte gUnk_080CC6FC thumb_func_start sub_08027E40 @@ -439,13 +439,13 @@ _0802808E: .align 2, 0 _08028098: .4byte gUnk_02002A40 _0802809C: - bl ResetLink - ldr r2, _08028104 @ =gLinkState + bl ResetPlayer + ldr r2, _08028104 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r0, r1 strb r0, [r2, #0x1a] - ldr r4, _08028108 @ =gLinkEntity + ldr r4, _08028108 @ =gPlayerEntity movs r3, #0x80 lsls r3, r3, #9 adds r0, r5, #0 @@ -489,14 +489,14 @@ _080280F0: _08028102: pop {r4, r5, pc} .align 2, 0 -_08028104: .4byte gLinkState -_08028108: .4byte gLinkEntity +_08028104: .4byte gPlayerState +_08028108: .4byte gPlayerEntity thumb_func_start sub_0802810C sub_0802810C: @ 0x0802810C push {r4, r5, lr} adds r4, r0, #0 - ldr r2, _08028198 @ =gLinkState + ldr r2, _08028198 @ =gPlayerState movs r1, #0 movs r0, #0x41 strb r0, [r2, #2] @@ -505,7 +505,7 @@ sub_0802810C: @ 0x0802810C subs r1, #0x11 ands r0, r1 str r0, [r2, #0x30] - ldr r0, _0802819C @ =gLinkEntity + ldr r0, _0802819C @ =gPlayerEntity mov ip, r0 ldrb r0, [r0, #0x10] movs r1, #0x80 @@ -566,8 +566,8 @@ sub_0802810C: @ 0x0802810C _08028196: pop {r4, r5, pc} .align 2, 0 -_08028198: .4byte gLinkState -_0802819C: .4byte gLinkEntity +_08028198: .4byte gPlayerState +_0802819C: .4byte gPlayerEntity thumb_func_start sub_080281A0 sub_080281A0: @ 0x080281A0 diff --git a/asm/lilypadLarge.s b/asm/lilypadLarge.s index 0657df02..2fb565f2 100644 --- a/asm/lilypadLarge.s +++ b/asm/lilypadLarge.s @@ -143,7 +143,7 @@ sub_080855E8: @ 0x080855E8 movs r0, #0x20 orrs r0, r1 strb r0, [r7, #0x10] - ldr r6, _0808564C @ =gLinkEntity + ldr r6, _0808564C @ =gPlayerEntity adds r0, r7, #0 adds r1, r6, #0 movs r2, #0x18 @@ -151,7 +151,7 @@ sub_080855E8: @ 0x080855E8 adds r1, r0, #0 cmp r1, #0 beq _080856EE - ldr r3, _08085650 @ =gLinkState + ldr r3, _08085650 @ =gPlayerState ldr r0, [r3, #0x30] movs r1, #2 orrs r0, r1 @@ -186,8 +186,8 @@ _08085634: bl sub_0800455E b _0808565A .align 2, 0 -_0808564C: .4byte gLinkEntity -_08085650: .4byte gLinkState +_0808564C: .4byte gPlayerEntity +_08085650: .4byte gPlayerState _08085654: adds r0, r6, #0 bl sub_08004542 @@ -218,7 +218,7 @@ _08085664: str r2, [r7, #0x70] str r2, [r7, #0x6c] _0808568C: - ldr r2, _080856B8 @ =gLinkState + ldr r2, _080856B8 @ =gPlayerState ldrb r0, [r2, #0x1c] cmp r0, #3 beq _08085696 @@ -230,7 +230,7 @@ _08085696: lsls r0, r0, #2 adds r0, r0, r1 ldr r4, [r0] - ldr r0, _080856C0 @ =gLinkEntity + ldr r0, _080856C0 @ =gPlayerEntity ldrb r0, [r0, #0x14] movs r1, #6 ands r1, r0 @@ -242,9 +242,9 @@ _08085696: beq _080856D6 b _080857CE .align 2, 0 -_080856B8: .4byte gLinkState +_080856B8: .4byte gPlayerState _080856BC: .4byte gUnk_08120620 -_080856C0: .4byte gLinkEntity +_080856C0: .4byte gPlayerEntity _080856C4: cmp r1, #4 beq _080856CE @@ -314,7 +314,7 @@ _080856FC: adds r2, r5, #0 bl sub_080045D4 strb r0, [r7, #0x15] - ldr r0, _0808575C @ =gLinkState + ldr r0, _0808575C @ =gPlayerState ldrb r0, [r0, #0x1d] cmp r0, #2 beq _0808576A @@ -325,7 +325,7 @@ _080856FC: b _08085774 .align 2, 0 _08085758: .4byte gUnk_08126EE4 -_0808575C: .4byte gLinkState +_0808575C: .4byte gPlayerState _08085760: cmp r0, #3 bne _08085774 @@ -568,7 +568,7 @@ _0808592E: _08085930: strb r0, [r2] _08085932: - ldr r0, _0808595C @ =gLinkState + ldr r0, _0808595C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #2 ands r0, r1 @@ -589,7 +589,7 @@ _08085944: movs r0, #0 b _08085964 .align 2, 0 -_0808595C: .4byte gLinkState +_0808595C: .4byte gPlayerState _08085960: adds r0, r1, #0 adds r0, #0x80 @@ -707,7 +707,7 @@ sub_08085A1C: @ 0x08085A1C adds r1, r1, r2 ldr r1, [r1] bl _call_via_r1 - ldr r2, _08085A40 @ =gLinkState + ldr r2, _08085A40 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #2 orrs r0, r1 @@ -716,7 +716,7 @@ sub_08085A1C: @ 0x08085A1C pop {pc} .align 2, 0 _08085A3C: .4byte gUnk_0812062C -_08085A40: .4byte gLinkState +_08085A40: .4byte gPlayerState thumb_func_start sub_08085A44 sub_08085A44: @ 0x08085A44 @@ -870,7 +870,7 @@ sub_08085B40: @ 0x08085B40 adds r1, r2, #0 bl sub_0805EC9C _08085B7A: - ldr r4, _08085BA0 @ =gLinkEntity + ldr r4, _08085BA0 @ =gPlayerEntity ldrh r3, [r5, #0x32] ldrh r0, [r5, #0x36] adds r0, r3, r0 @@ -889,7 +889,7 @@ _08085B7A: b _08085BAE .align 2, 0 _08085B9C: .4byte 0x011FFFFF -_08085BA0: .4byte gLinkEntity +_08085BA0: .4byte gPlayerEntity _08085BA4: .4byte gArea _08085BA8: subs r0, r3, r1 @@ -906,7 +906,7 @@ _08085BB4: bl sub_080002B8 cmp r0, #0xd bne _08085BE8 - ldr r4, _08085C50 @ =gLinkEntity + ldr r4, _08085C50 @ =gPlayerEntity adds r0, r4, #0 bl sub_0800455E adds r0, r5, #0 @@ -926,7 +926,7 @@ _08085BE8: ldrh r0, [r1] cmp r0, #0 bne _08085C54 - ldr r4, _08085C50 @ =gLinkEntity + ldr r4, _08085C50 @ =gPlayerEntity movs r1, #0x80 lsls r1, r1, #6 adds r0, r4, #0 @@ -969,7 +969,7 @@ _08085C16: strb r0, [r5, #0xc] b _08085C58 .align 2, 0 -_08085C50: .4byte gLinkEntity +_08085C50: .4byte gPlayerEntity _08085C54: subs r0, #1 strh r0, [r1] @@ -981,7 +981,7 @@ _08085C58: sub_08085C5C: @ 0x08085C5C push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08085CA0 @ =gLinkEntity + ldr r5, _08085CA0 @ =gPlayerEntity adds r1, r5, #0 movs r2, #0x18 bl sub_0806FC80 @@ -995,7 +995,7 @@ sub_08085C5C: @ 0x08085C5C strb r0, [r5, #0x15] adds r0, r5, #0 bl sub_0806F69C - ldr r2, _08085CA4 @ =gLinkState + ldr r2, _08085CA4 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #2 orrs r0, r1 @@ -1009,8 +1009,8 @@ sub_08085C5C: @ 0x08085C5C bl sub_0800455E b _08085CAE .align 2, 0 -_08085CA0: .4byte gLinkEntity -_08085CA4: .4byte gLinkState +_08085CA0: .4byte gPlayerEntity +_08085CA4: .4byte gPlayerState _08085CA8: adds r0, r5, #0 bl sub_08004542 @@ -1031,13 +1031,13 @@ _08085CAE: ands r0, r1 orrs r0, r2 strb r0, [r4, #0x11] - ldr r0, _08085CD8 @ =gLinkEntity + ldr r0, _08085CD8 @ =gPlayerEntity str r0, [r3, #0x30] _08085CD2: pop {r4, r5, pc} .align 2, 0 _08085CD4: .4byte gRoomControls -_08085CD8: .4byte gLinkEntity +_08085CD8: .4byte gPlayerEntity thumb_func_start sub_08085CDC sub_08085CDC: @ 0x08085CDC @@ -1085,7 +1085,7 @@ _08085D26: sub_08085D28: @ 0x08085D28 push {r4, r5, lr} adds r4, r0, #0 - ldr r1, _08085D5C @ =gLinkState + ldr r1, _08085D5C @ =gPlayerState adds r0, r1, #0 adds r0, #0xa8 ldrb r0, [r0] @@ -1109,7 +1109,7 @@ sub_08085D28: @ 0x08085D28 _08085D5A: pop {r4, r5, pc} .align 2, 0 -_08085D5C: .4byte gLinkState +_08085D5C: .4byte gPlayerState thumb_func_start sub_08085D60 sub_08085D60: @ 0x08085D60 @@ -1117,7 +1117,7 @@ sub_08085D60: @ 0x08085D60 mov r7, r8 push {r7} adds r5, r0, #0 - ldr r2, _08085D94 @ =gLinkState + ldr r2, _08085D94 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #2 ands r0, r1 @@ -1140,7 +1140,7 @@ sub_08085D60: @ 0x08085D60 adds r4, r6, #0 b _08085DB0 .align 2, 0 -_08085D94: .4byte gLinkState +_08085D94: .4byte gPlayerState _08085D98: movs r0, #0x10 ands r0, r1 @@ -1194,7 +1194,7 @@ _08085DB8: bl sub_080806BC cmp r0, #0 bne _08085E1C - ldr r0, _08085E18 @ =gLinkEntity + ldr r0, _08085E18 @ =gPlayerEntity lsrs r1, r4, #3 bl sub_0807BD14 cmp r0, #0 @@ -1204,7 +1204,7 @@ _08085DB8: .align 2, 0 _08085E10: .4byte gUnk_08120638 _08085E14: .4byte gRoomControls -_08085E18: .4byte gLinkEntity +_08085E18: .4byte gPlayerEntity _08085E1C: strb r4, [r5, #0x15] b _08085E6C @@ -1227,7 +1227,7 @@ _08085E28: bl sub_080002CC cmp r0, #0xff bne _08085E6C - ldr r0, _08085E60 @ =gLinkEntity + ldr r0, _08085E60 @ =gPlayerEntity lsrs r1, r6, #3 bl sub_0807BD14 cmp r0, #0 @@ -1239,7 +1239,7 @@ _08085E52: b _08085E6C .align 2, 0 _08085E5C: .4byte gUnk_08120638 -_08085E60: .4byte gLinkEntity +_08085E60: .4byte gPlayerEntity _08085E64: ldrb r1, [r5, #0x10] movs r0, #0xdf @@ -1301,12 +1301,12 @@ _08085EBE: str r0, [r2, #0x6c] strh r0, [r2, #0x2c] strh r0, [r2, #0x30] - ldr r1, _08085EF0 @ =gLinkEntity + ldr r1, _08085EF0 @ =gPlayerEntity strh r0, [r1, #0x2c] strh r0, [r1, #0x30] ldrb r0, [r2, #0x15] strb r0, [r1, #0x15] - ldr r1, _08085EF4 @ =gLinkState + ldr r1, _08085EF4 @ =gPlayerState movs r0, #0x80 lsls r0, r0, #1 strh r0, [r1, #8] @@ -1317,16 +1317,16 @@ _08085EBE: beq _08085EE8 bl DeleteEntity _08085EE8: - bl ResetLink + bl ResetPlayer pop {pc} .align 2, 0 -_08085EF0: .4byte gLinkEntity -_08085EF4: .4byte gLinkState +_08085EF0: .4byte gPlayerEntity +_08085EF4: .4byte gPlayerState _08085EF8: .4byte gRoomControls thumb_func_start sub_08085EFC sub_08085EFC: @ 0x08085EFC - ldr r3, _08085F18 @ =gLinkEntity + ldr r3, _08085F18 @ =gPlayerEntity ldrh r1, [r0, #0x2e] ldrh r2, [r3, #0x2e] subs r1, r1, r2 @@ -1340,13 +1340,13 @@ sub_08085EFC: @ 0x08085EFC strh r1, [r0] bx lr .align 2, 0 -_08085F18: .4byte gLinkEntity +_08085F18: .4byte gPlayerEntity thumb_func_start sub_08085F1C sub_08085F1C: @ 0x08085F1C push {lr} adds r3, r0, #0 - ldr r2, _08085F44 @ =gLinkEntity + ldr r2, _08085F44 @ =gPlayerEntity adds r1, r3, #0 adds r1, #0x76 ldrh r0, [r3, #0x2e] @@ -1363,7 +1363,7 @@ sub_08085F1C: @ 0x08085F1C bl sub_0807A5B8 pop {pc} .align 2, 0 -_08085F44: .4byte gLinkEntity +_08085F44: .4byte gPlayerEntity thumb_func_start sub_08085F48 sub_08085F48: @ 0x08085F48 @@ -1376,7 +1376,7 @@ sub_08085F48: @ 0x08085F48 lsrs r3, r0, #0x18 cmp r3, #0 beq _08085F8C - ldr r5, _08085F80 @ =gLinkState + ldr r5, _08085F80 @ =gPlayerState ldrb r0, [r5, #0x12] cmp r0, #0x17 bne _08085F6A @@ -1394,13 +1394,13 @@ _08085F6A: lsls r2, r2, #0xc b _08085FF8 .align 2, 0 -_08085F80: .4byte gLinkState +_08085F80: .4byte gPlayerState _08085F84: .4byte 0x0127FFFF _08085F88: movs r0, #0 b _08086006 _08085F8C: - ldr r0, _08085FAC @ =gLinkState + ldr r0, _08085FAC @ =gPlayerState ldr r1, [r0, #0x30] movs r0, #2 ands r1, r0 @@ -1417,7 +1417,7 @@ _08085F8C: lsls r2, r2, #8 b _08085FF8 .align 2, 0 -_08085FAC: .4byte gLinkState +_08085FAC: .4byte gPlayerState _08085FB0: .4byte 0x011FFFFF _08085FB4: strb r3, [r4, #0xe] diff --git a/asm/lilypadSmall.s b/asm/lilypadSmall.s index 8d5da9c2..166e2b09 100644 --- a/asm/lilypadSmall.s +++ b/asm/lilypadSmall.s @@ -73,13 +73,13 @@ _08097ADA: sub_08097ADC: @ 0x08097ADC push {r4, r5, lr} adds r2, r0, #0 - ldr r5, _08097B18 @ =gLinkState + ldr r5, _08097B18 @ =gPlayerState ldr r0, [r5, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 beq _08097B20 - ldr r4, _08097B1C @ =gLinkEntity + ldr r4, _08097B1C @ =gPlayerEntity adds r0, r2, #0 adds r1, r4, #0 movs r2, #8 @@ -99,8 +99,8 @@ sub_08097ADC: @ 0x08097ADC movs r0, #1 b _08097B22 .align 2, 0 -_08097B18: .4byte gLinkState -_08097B1C: .4byte gLinkEntity +_08097B18: .4byte gPlayerState +_08097B1C: .4byte gPlayerEntity _08097B20: movs r0, #0 _08097B22: diff --git a/asm/lockedDoor.s b/asm/lockedDoor.s index aad7a891..c73a92cd 100644 --- a/asm/lockedDoor.s +++ b/asm/lockedDoor.s @@ -569,15 +569,15 @@ _0808374A: adds r0, r2, #0 adds r0, #0x72 ldrh r1, [r0] - ldr r0, _0808375C @ =gLinkEntity + ldr r0, _0808375C @ =gPlayerEntity movs r2, #0x32 ldrsh r0, [r0, r2] subs r0, #0xd b _0808379E .align 2, 0 -_0808375C: .4byte gLinkEntity +_0808375C: .4byte gPlayerEntity _08083760: - ldr r0, _08083770 @ =gLinkEntity + ldr r0, _08083770 @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r0, r1] adds r0, #0xb @@ -585,9 +585,9 @@ _08083760: adds r1, #0x70 b _08083780 .align 2, 0 -_08083770: .4byte gLinkEntity +_08083770: .4byte gPlayerEntity _08083774: - ldr r0, _0808378C @ =gLinkEntity + ldr r0, _0808378C @ =gPlayerEntity movs r1, #0x32 ldrsh r0, [r0, r1] adds r0, #8 @@ -601,12 +601,12 @@ _08083780: movs r0, #1 b _080837AE .align 2, 0 -_0808378C: .4byte gLinkEntity +_0808378C: .4byte gPlayerEntity _08083790: adds r0, r2, #0 adds r0, #0x70 ldrh r1, [r0] - ldr r0, _080837A8 @ =gLinkEntity + ldr r0, _080837A8 @ =gPlayerEntity movs r2, #0x2e ldrsh r0, [r0, r2] subs r0, #0xa @@ -617,7 +617,7 @@ _0808379E: movs r0, #1 b _080837AE .align 2, 0 -_080837A8: .4byte gLinkEntity +_080837A8: .4byte gPlayerEntity _080837AC: movs r0, #0 _080837AE: diff --git a/asm/macroBook.s b/asm/macroBook.s index 6ec09881..838925b4 100644 --- a/asm/macroBook.s +++ b/asm/macroBook.s @@ -237,7 +237,7 @@ _0809A92A: adds r0, r4, #0 movs r2, #0 bl sub_0809AA9C - ldr r1, _0809A950 @ =gLinkEntity + ldr r1, _0809A950 @ =gPlayerEntity adds r0, r4, #0 movs r2, #1 bl sub_0809AA9C @@ -251,7 +251,7 @@ _0809A92A: _0809A94E: pop {r4, pc} .align 2, 0 -_0809A950: .4byte gLinkEntity +_0809A950: .4byte gPlayerEntity _0809A954: .4byte gUnk_03004040 thumb_func_start sub_0809A958 @@ -394,7 +394,7 @@ _0809AA50: adds r7, r5, #0 adds r7, #0x78 _0809AA5C: - ldr r4, _0809AA94 @ =gLinkEntity + ldr r4, _0809AA94 @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 movs r2, #0x20 @@ -421,7 +421,7 @@ _0809AA8E: mov r8, r3 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0809AA94: .4byte gLinkEntity +_0809AA94: .4byte gPlayerEntity _0809AA98: .4byte gUnk_03004040 thumb_func_start sub_0809AA9C diff --git a/asm/macroLink.s b/asm/macroPlayer.s similarity index 99% rename from asm/macroLink.s rename to asm/macroPlayer.s index 2b9ccfa9..c7c6bf90 100644 --- a/asm/macroLink.s +++ b/asm/macroPlayer.s @@ -7,8 +7,8 @@ .text - thumb_func_start MacroLink -MacroLink: @ 0x0808CAE4 + thumb_func_start MacroPlayer +MacroPlayer: @ 0x0808CAE4 push {lr} ldr r2, _0808CAF8 @ =gUnk_08121680 ldrb r1, [r0, #0xa] diff --git a/asm/mama.s b/asm/mama.s index e23cb932..bb42541d 100644 --- a/asm/mama.s +++ b/asm/mama.s @@ -60,7 +60,7 @@ _0806C3E2: adds r1, r4, #0 adds r1, #0x69 strb r0, [r1] - ldr r1, _0806C41C @ =gLinkEntity + ldr r1, _0806C41C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -71,7 +71,7 @@ _0806C3E2: bl sub_0806F118 b _0806C450 .align 2, 0 -_0806C41C: .4byte gLinkEntity +_0806C41C: .4byte gPlayerEntity _0806C420: adds r0, r4, #0 movs r1, #0 diff --git a/asm/manager1.s b/asm/manager1.s index c9530794..74bf3c4e 100644 --- a/asm/manager1.s +++ b/asm/manager1.s @@ -18,7 +18,7 @@ sub_08057174: @ 0x08057174 bne _08057188 b _0805728A _08057188: - ldr r1, _080571E8 @ =gLinkEntity + ldr r1, _080571E8 @ =gPlayerEntity movs r2, #0x2e ldrsh r0, [r1, r2] cmp r0, #0 @@ -69,7 +69,7 @@ _080571A8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080571E8: .4byte gLinkEntity +_080571E8: .4byte gPlayerEntity _080571EC: .4byte gRoomControls _080571F0: .4byte _080571F4 _080571F4: @ jump table diff --git a/asm/manager10.s b/asm/manager10.s index 2a3fed1d..40bf1a3e 100644 --- a/asm/manager10.s +++ b/asm/manager10.s @@ -368,7 +368,7 @@ _08059840: .4byte gBG1Settings sub_08059844: @ 0x08059844 push {lr} movs r3, #0 - ldr r0, _08059864 @ =gLinkEntity + ldr r0, _08059864 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] ldr r2, _08059868 @ =gRoomControls @@ -383,14 +383,14 @@ _0805985E: adds r0, r3, #0 pop {pc} .align 2, 0 -_08059864: .4byte gLinkEntity +_08059864: .4byte gPlayerEntity _08059868: .4byte gRoomControls thumb_func_start sub_0805986C sub_0805986C: @ 0x0805986C push {lr} movs r2, #0 - ldr r0, _0805988C @ =gLinkEntity + ldr r0, _0805988C @ =gPlayerEntity movs r3, #0x2e ldrsh r1, [r0, r3] ldr r0, _08059890 @ =gRoomControls @@ -405,7 +405,7 @@ _08059886: adds r0, r2, #0 pop {pc} .align 2, 0 -_0805988C: .4byte gLinkEntity +_0805988C: .4byte gPlayerEntity _08059890: .4byte gRoomControls thumb_func_start sub_08059894 diff --git a/asm/manager15.s b/asm/manager15.s index 7386b034..413b9554 100644 --- a/asm/manager15.s +++ b/asm/manager15.s @@ -676,7 +676,7 @@ _0805A76A: sub_0805A76C: @ 0x0805A76C push {r4, r5, r6, lr} adds r4, r0, #0 - ldr r5, _0805A7D4 @ =gLinkEntity + ldr r5, _0805A7D4 @ =gPlayerEntity adds r0, r5, #0 adds r0, #0x45 ldrb r0, [r0] @@ -686,7 +686,7 @@ sub_0805A76C: @ 0x0805A76C ldrsh r0, [r5, r1] cmp r0, #0 bne _0805A7D0 - ldr r0, _0805A7D8 @ =gLinkState + ldr r0, _0805A7D8 @ =gPlayerState ldr r6, [r0, #0x2c] cmp r6, #0 bne _0805A7D0 @@ -722,15 +722,15 @@ sub_0805A76C: @ 0x0805A76C _0805A7D0: pop {r4, r5, r6, pc} .align 2, 0 -_0805A7D4: .4byte gLinkEntity -_0805A7D8: .4byte gLinkState +_0805A7D4: .4byte gPlayerEntity +_0805A7D8: .4byte gPlayerState _0805A7DC: .4byte gUnk_02034490 _0805A7E0: .4byte gRoomControls thumb_func_start sub_0805A7E4 sub_0805A7E4: @ 0x0805A7E4 push {lr} - ldr r2, _0805A800 @ =gLinkState + ldr r2, _0805A800 @ =gPlayerState ldrb r0, [r2, #0xc] cmp r0, #0x12 beq _0805A7FE @@ -745,7 +745,7 @@ sub_0805A7E4: @ 0x0805A7E4 _0805A7FE: pop {pc} .align 2, 0 -_0805A800: .4byte gLinkState +_0805A800: .4byte gPlayerState thumb_func_start sub_0805A804 sub_0805A804: @ 0x0805A804 diff --git a/asm/manager1A.s b/asm/manager1A.s index fad93017..2df04f21 100644 --- a/asm/manager1A.s +++ b/asm/manager1A.s @@ -224,7 +224,7 @@ sub_0805B1CC: @ 0x0805B1CC bl sub_0806FBFC cmp r0, #0 beq _0805B20C - ldr r2, _0805B1FC @ =gLinkState + ldr r2, _0805B1FC @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #5 ands r0, r1 @@ -236,7 +236,7 @@ sub_0805B1CC: @ 0x0805B1CC str r1, [r2, #0x30] b _0805B20C .align 2, 0 -_0805B1FC: .4byte gLinkState +_0805B1FC: .4byte gPlayerState _0805B200: movs r0, #0x80 lsls r0, r0, #8 @@ -269,7 +269,7 @@ sub_0805B210: @ 0x0805B210 strb r0, [r2, #0xd] ldrb r0, [r4, #3] strb r0, [r2, #0x14] - ldr r0, _0805B250 @ =gLinkState + ldr r0, _0805B250 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -281,7 +281,7 @@ sub_0805B210: @ 0x0805B210 .align 2, 0 _0805B248: .4byte gScreenTransition _0805B24C: .4byte gUnk_08108764 -_0805B250: .4byte gLinkState +_0805B250: .4byte gPlayerState _0805B254: movs r0, #2 _0805B256: @@ -305,7 +305,7 @@ _0805B26E: strh r0, [r5, #0x12] b _0805B2AC _0805B278: - ldr r2, _0805B298 @ =gLinkEntity + ldr r2, _0805B298 @ =gPlayerEntity ldr r3, _0805B29C @ =gRoomControls ldrh r0, [r2, #0x2e] ldrh r1, [r3, #6] @@ -321,7 +321,7 @@ _0805B278: strh r0, [r5, #0x12] b _0805B2AC .align 2, 0 -_0805B298: .4byte gLinkEntity +_0805B298: .4byte gPlayerEntity _0805B29C: .4byte gRoomControls _0805B2A0: ldrh r0, [r4, #4] diff --git a/asm/manager22.s b/asm/manager22.s index 8f0bdb43..af6900a2 100644 --- a/asm/manager22.s +++ b/asm/manager22.s @@ -71,7 +71,7 @@ _0805B96C: .4byte 0x0000D7FF _0805B970: .4byte gUnk_03001000 _0805B974: .4byte 0x0000DFFF _0805B978: - ldr r3, _0805B9A8 @ =gLinkEntity + ldr r3, _0805B9A8 @ =gPlayerEntity movs r4, #0x2e ldrsh r0, [r3, r4] ldr r2, _0805B9AC @ =gRoomControls @@ -94,7 +94,7 @@ _0805B978: orrs r0, r1 b _0805B9BC .align 2, 0 -_0805B9A8: .4byte gLinkEntity +_0805B9A8: .4byte gPlayerEntity _0805B9AC: .4byte gRoomControls _0805B9B0: .4byte gScreen _0805B9B4: @@ -105,7 +105,7 @@ _0805B9B4: _0805B9BC: strh r0, [r2] ldrb r4, [r5, #0xe] - ldr r0, _0805B9F0 @ =gLinkState + ldr r0, _0805B9F0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #0x10 @@ -127,7 +127,7 @@ _0805B9BC: .align 2, 0 _0805B9E8: .4byte gScreen _0805B9EC: .4byte 0x0000DFFF -_0805B9F0: .4byte gLinkState +_0805B9F0: .4byte gPlayerState _0805B9F4: .4byte gArea _0805B9F8: ldr r0, _0805BA24 @ =gScreenTransition @@ -167,7 +167,7 @@ _0805BA3C: bl sub_0801E154 _0805BA42: strb r4, [r5, #0xe] - ldr r3, _0805BA70 @ =gLinkEntity + ldr r3, _0805BA70 @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r3, r1] ldr r2, _0805BA74 @ =gRoomControls @@ -189,7 +189,7 @@ _0805BA42: _0805BA6C: pop {r4, r5, r6, pc} .align 2, 0 -_0805BA70: .4byte gLinkEntity +_0805BA70: .4byte gPlayerEntity _0805BA74: .4byte gRoomControls thumb_func_start sub_0805BA78 diff --git a/asm/manager26.s b/asm/manager26.s index 0cda662e..7aab3755 100644 --- a/asm/manager26.s +++ b/asm/manager26.s @@ -159,13 +159,13 @@ sub_0805C7C4: @ 0x0805C7C4 sub_0805C7CC: @ 0x0805C7CC push {lr} adds r2, r0, #0 - ldr r0, _0805C7F0 @ =gLinkState + ldr r0, _0805C7F0 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 beq _0805C7FC - ldr r0, _0805C7F4 @ =gLinkEntity + ldr r0, _0805C7F4 @ =gPlayerEntity movs r3, #0x32 ldrsh r1, [r0, r3] ldrh r0, [r2, #0x2a] @@ -175,13 +175,13 @@ sub_0805C7CC: @ 0x0805C7CC movs r0, #1 b _0805C816 .align 2, 0 -_0805C7F0: .4byte gLinkState -_0805C7F4: .4byte gLinkEntity +_0805C7F0: .4byte gPlayerState +_0805C7F4: .4byte gPlayerEntity _0805C7F8: movs r0, #0 b _0805C816 _0805C7FC: - ldr r0, _0805C810 @ =gLinkEntity + ldr r0, _0805C810 @ =gPlayerEntity movs r3, #0x32 ldrsh r1, [r0, r3] ldrh r0, [r2, #0x2a] @@ -191,7 +191,7 @@ _0805C7FC: movs r0, #3 b _0805C816 .align 2, 0 -_0805C810: .4byte gLinkEntity +_0805C810: .4byte gPlayerEntity _0805C814: movs r0, #2 _0805C816: diff --git a/asm/manager2C.s b/asm/manager2C.s index 6b3b92a3..99d1abc3 100644 --- a/asm/manager2C.s +++ b/asm/manager2C.s @@ -26,7 +26,7 @@ _0805D184: bl CheckPlayerInRegion cmp r0, #0 beq _0805D1EE - ldr r0, _0805D1F0 @ =gLinkEntity + ldr r0, _0805D1F0 @ =gPlayerEntity movs r4, #0x32 ldrsh r1, [r0, r4] ldr r3, _0805D1F4 @ =gRoomControls @@ -71,6 +71,6 @@ _0805D184: _0805D1EE: pop {r4, r5, pc} .align 2, 0 -_0805D1F0: .4byte gLinkEntity +_0805D1F0: .4byte gPlayerEntity _0805D1F4: .4byte gRoomControls _0805D1F8: .4byte gUnk_030010AC diff --git a/asm/manager2D.s b/asm/manager2D.s index c3129650..374004d2 100644 --- a/asm/manager2D.s +++ b/asm/manager2D.s @@ -17,7 +17,7 @@ sub_0805D1FC: @ 0x0805D1FC ldr r3, _0805D248 @ =gRoomControls ldrh r0, [r3, #8] adds r0, #0xc8 - ldr r2, _0805D24C @ =gLinkEntity + ldr r2, _0805D24C @ =gPlayerEntity movs r5, #0x32 ldrsh r1, [r2, r5] cmp r0, r1 @@ -43,4 +43,4 @@ _0805D236: _0805D240: .4byte 0x00004014 _0805D244: .4byte 0x000005C3 _0805D248: .4byte gRoomControls -_0805D24C: .4byte gLinkEntity +_0805D24C: .4byte gPlayerEntity diff --git a/asm/manager3.s b/asm/manager3.s index 2f755748..7bd5a45c 100644 --- a/asm/manager3.s +++ b/asm/manager3.s @@ -70,7 +70,7 @@ _080576EC: _08057738: .4byte gArea _0805773C: .4byte gUnk_08107C6C _08057740: - ldr r2, _08057758 @ =gLinkState + ldr r2, _08057758 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x20 ands r0, r1 @@ -83,7 +83,7 @@ _08057740: strb r0, [r5, #0x18] b _0805776A .align 2, 0 -_08057758: .4byte gLinkState +_08057758: .4byte gPlayerState _0805775C: bl sub_08057810 cmp r0, #0 @@ -180,7 +180,7 @@ _08057808: thumb_func_start sub_08057810 sub_08057810: @ 0x08057810 push {lr} - ldr r2, _08057848 @ =gLinkState + ldr r2, _08057848 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -208,7 +208,7 @@ sub_08057810: @ 0x08057810 movs r0, #1 b _08057852 .align 2, 0 -_08057848: .4byte gLinkState +_08057848: .4byte gPlayerState _0805784C: .4byte gArea _08057850: movs r0, #0 diff --git a/asm/manager30.s b/asm/manager30.s index 90b9b601..6d5e1c08 100644 --- a/asm/manager30.s +++ b/asm/manager30.s @@ -46,7 +46,7 @@ _0805D4D2: lsls r0, r0, #6 orrs r1, r0 strh r1, [r6, #0x28] - ldr r4, _0805D518 @ =gLinkEntity + ldr r4, _0805D518 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] ldr r2, _0805D51C @ =gRoomControls @@ -66,10 +66,10 @@ _0805D4D2: strh r1, [r6, #0x2c] b _0805D628 .align 2, 0 -_0805D518: .4byte gLinkEntity +_0805D518: .4byte gPlayerEntity _0805D51C: .4byte gRoomControls _0805D520: - ldr r4, _0805D568 @ =gLinkEntity + ldr r4, _0805D568 @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r4, r1] ldr r3, _0805D56C @ =gRoomControls @@ -104,7 +104,7 @@ _0805D520: beq _0805D580 b _0805D5A4 .align 2, 0 -_0805D568: .4byte gLinkEntity +_0805D568: .4byte gPlayerEntity _0805D56C: .4byte gRoomControls _0805D570: .4byte 0x00000317 _0805D574: diff --git a/asm/manager33.s b/asm/manager33.s index f3555e47..dc8db449 100644 --- a/asm/manager33.s +++ b/asm/manager33.s @@ -18,7 +18,7 @@ sub_0805DAE8: @ 0x0805DAE8 lsls r1, r1, #1 mov r8, r1 add r0, r8 - ldr r3, _0805DB50 @ =gLinkEntity + ldr r3, _0805DB50 @ =gPlayerEntity movs r4, #0x2e ldrsh r1, [r3, r4] subs r0, r0, r1 @@ -45,7 +45,7 @@ sub_0805DAE8: @ 0x0805DAE8 rsbs r0, r0, #0 cmp r1, r0 bge _0805DB88 - ldr r0, _0805DB54 @ =gLinkState + ldr r0, _0805DB54 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] cmp r0, #0x14 @@ -59,8 +59,8 @@ sub_0805DAE8: @ 0x0805DAE8 b _0805DB88 .align 2, 0 _0805DB4C: .4byte gRoomControls -_0805DB50: .4byte gLinkEntity -_0805DB54: .4byte gLinkState +_0805DB50: .4byte gPlayerEntity +_0805DB54: .4byte gPlayerState _0805DB58: ldrb r0, [r2, #0xe] subs r0, #1 diff --git a/asm/manager37.s b/asm/manager37.s index 5ae4d78f..24af0735 100644 --- a/asm/manager37.s +++ b/asm/manager37.s @@ -75,7 +75,7 @@ _0805DEB4: .4byte 0x00001194 sub_0805DEB8: @ 0x0805DEB8 push {r4, r5, lr} adds r3, r0, #0 - ldr r5, _0805DF44 @ =gLinkEntity + ldr r5, _0805DF44 @ =gPlayerEntity movs r0, #0x2e ldrsh r2, [r5, r0] subs r2, #0x88 @@ -142,14 +142,14 @@ _0805DF3C: _0805DF42: pop {r4, r5, pc} .align 2, 0 -_0805DF44: .4byte gLinkEntity +_0805DF44: .4byte gPlayerEntity _0805DF48: .4byte gRoomControls thumb_func_start sub_0805DF4C sub_0805DF4C: @ 0x0805DF4C push {lr} adds r1, r0, #0 - ldr r2, _0805DF70 @ =gLinkEntity + ldr r2, _0805DF70 @ =gPlayerEntity movs r0, #0 strb r0, [r2, #0x14] movs r3, #0x36 @@ -166,7 +166,7 @@ sub_0805DF4C: @ 0x0805DF4C strh r1, [r2, #0x32] b _0805DF92 .align 2, 0 -_0805DF70: .4byte gLinkEntity +_0805DF70: .4byte gPlayerEntity _0805DF74: .4byte gRoomControls _0805DF78: ldrb r0, [r1, #0xe] diff --git a/asm/manager39.s b/asm/manager39.s index 26dd0847..b41cee8c 100644 --- a/asm/manager39.s +++ b/asm/manager39.s @@ -95,7 +95,7 @@ sub_0805E18C: @ 0x0805E18C cmp r0, #0 bne _0805E1BA strb r0, [r4, #0xb] - ldr r0, _0805E1D4 @ =gLinkState + ldr r0, _0805E1D4 @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] @@ -113,7 +113,7 @@ _0805E1CC: pop {r4, pc} .align 2, 0 _0805E1D0: .4byte gUnk_03000FD0 -_0805E1D4: .4byte gLinkState +_0805E1D4: .4byte gPlayerState thumb_func_start sub_0805E1D8 sub_0805E1D8: @ 0x0805E1D8 diff --git a/asm/manager4.s b/asm/manager4.s index f579829c..9daea0ca 100644 --- a/asm/manager4.s +++ b/asm/manager4.s @@ -149,7 +149,7 @@ sub_0805795C: @ 0x0805795C ldrb r0, [r0, #8] cmp r0, #0 beq _080579C8 - ldr r1, _080579C0 @ =gLinkEntity + ldr r1, _080579C0 @ =gPlayerEntity ldr r3, _080579C4 @ =gRoomControls ldrh r2, [r1, #0x2e] ldrh r0, [r3, #6] @@ -192,10 +192,10 @@ sub_0805795C: @ 0x0805795C b _08057A00 .align 2, 0 _080579BC: .4byte gUnk_03004030 -_080579C0: .4byte gLinkEntity +_080579C0: .4byte gPlayerEntity _080579C4: .4byte gRoomControls _080579C8: - ldr r3, _08057A0C @ =gLinkEntity + ldr r3, _08057A0C @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r3, r1] ldr r2, _08057A10 @ =gRoomControls @@ -230,7 +230,7 @@ _08057A00: movs r0, #1 b _08057A16 .align 2, 0 -_08057A0C: .4byte gLinkEntity +_08057A0C: .4byte gPlayerEntity _08057A10: .4byte gRoomControls _08057A14: movs r0, #0 @@ -259,7 +259,7 @@ sub_08057A18: @ 0x08057A18 ldrb r0, [r5, #5] strb r0, [r3, #5] str r5, [r6] - ldr r4, _08057AA0 @ =gLinkEntity + ldr r4, _08057AA0 @ =gPlayerEntity ldrh r1, [r4, #0x2e] ldrh r0, [r3, #6] subs r1, r1, r0 @@ -304,7 +304,7 @@ _08057A86: _08057A94: .4byte gUnk_03004030 _08057A98: .4byte gRoomControls _08057A9C: .4byte gScreenTransition -_08057AA0: .4byte gLinkEntity +_08057AA0: .4byte gPlayerEntity _08057AA4: .4byte gUnk_02034480 thumb_func_start sub_08057AA8 diff --git a/asm/managerC.s b/asm/managerC.s index 80f37976..ec3a3b40 100644 --- a/asm/managerC.s +++ b/asm/managerC.s @@ -157,7 +157,7 @@ _08058968: ldrb r0, [r4, #0xe] cmp r0, #0 beq _080589DE - ldr r0, _080589A4 @ =gLinkEntity + ldr r0, _080589A4 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r0, r2] ldr r0, _080589A8 @ =gRoomControls @@ -186,7 +186,7 @@ _08058986: subs r0, r0, r1 b _080589B4 .align 2, 0 -_080589A4: .4byte gLinkEntity +_080589A4: .4byte gPlayerEntity _080589A8: .4byte gRoomControls _080589AC: cmp r2, #0x57 @@ -246,7 +246,7 @@ sub_08058A04: @ 0x08058A04 mov r7, r8 push {r7} adds r4, r0, #0 - ldr r6, _08058A68 @ =gLinkEntity + ldr r6, _08058A68 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r6, r0] ldr r7, _08058A6C @ =gRoomControls @@ -278,7 +278,7 @@ sub_08058A04: @ 0x08058A04 ldrsh r2, [r6, r0] cmp r2, #0 bne _08058A78 - ldr r0, _08058A74 @ =gLinkState + ldr r0, _08058A74 @ =gPlayerState movs r1, #3 strb r1, [r0, #0xc] adds r0, #0x38 @@ -291,10 +291,10 @@ sub_08058A04: @ 0x08058A04 strh r0, [r6, #0x32] b _08058AFC .align 2, 0 -_08058A68: .4byte gLinkEntity +_08058A68: .4byte gPlayerEntity _08058A6C: .4byte gRoomControls _08058A70: .4byte 0xFFFFFEE8 -_08058A74: .4byte gLinkState +_08058A74: .4byte gPlayerState _08058A78: mov r1, r8 cmp r1, #0x77 @@ -380,7 +380,7 @@ _08058B1A: lsrs r0, r0, #3 lsls r0, r0, #3 adds r4, r4, r0 - ldr r3, _08058B54 @ =gLinkEntity + ldr r3, _08058B54 @ =gPlayerEntity movs r0, #0x2e ldrsh r2, [r3, r0] ldr r1, _08058B58 @ =gRoomControls @@ -407,7 +407,7 @@ _08058B4E: _08058B50: pop {r4, r5, pc} .align 2, 0 -_08058B54: .4byte gLinkEntity +_08058B54: .4byte gPlayerEntity _08058B58: .4byte gRoomControls thumb_func_start sub_08058B5C @@ -578,7 +578,7 @@ _08058CAC: .4byte gScreen sub_08058CB0: @ 0x08058CB0 push {r4, lr} adds r4, r0, #0 - ldr r2, _08058CD8 @ =gLinkEntity + ldr r2, _08058CD8 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r2, r0] ldr r3, _08058CDC @ =gRoomControls @@ -596,7 +596,7 @@ sub_08058CB0: @ 0x08058CB0 movs r1, #0 b _08058CE8 .align 2, 0 -_08058CD8: .4byte gLinkEntity +_08058CD8: .4byte gPlayerEntity _08058CDC: .4byte gRoomControls _08058CE0: movs r1, #3 @@ -617,7 +617,7 @@ _08058CF8: .4byte gUnk_08108300 thumb_func_start sub_08058CFC sub_08058CFC: @ 0x08058CFC push {r4, r5, lr} - ldr r5, _08058D2C @ =gLinkEntity + ldr r5, _08058D2C @ =gPlayerEntity movs r1, #0x32 ldrsh r0, [r5, r1] ldr r1, _08058D30 @ =gRoomControls @@ -640,7 +640,7 @@ _08058D1A: _08058D28: pop {r4, r5, pc} .align 2, 0 -_08058D2C: .4byte gLinkEntity +_08058D2C: .4byte gPlayerEntity _08058D30: .4byte gRoomControls thumb_func_start sub_08058D34 diff --git a/asm/managerF.s b/asm/managerF.s index 1c92cc1f..b975e239 100644 --- a/asm/managerF.s +++ b/asm/managerF.s @@ -186,7 +186,7 @@ _08059028: ldrb r2, [r4, #0xe] cmp r2, #0x3c bne _08059034 - ldr r1, _0805904C @ =gLinkEntity + ldr r1, _0805904C @ =gPlayerEntity ldrb r0, [r4, #0xf] strb r0, [r1, #0x14] _08059034: @@ -202,7 +202,7 @@ _08059034: bl MenuFadeIn b _08059060 .align 2, 0 -_0805904C: .4byte gLinkEntity +_0805904C: .4byte gPlayerEntity _08059050: ldrh r0, [r4, #0x3e] bl SetFlag @@ -505,12 +505,12 @@ sub_08059290: @ 0x08059290 movs r1, #1 strb r1, [r0, #0xc] ldr r1, _0805929C @ =gRoomControls - ldr r0, _080592A0 @ =gLinkEntity + ldr r0, _080592A0 @ =gPlayerEntity str r0, [r1, #0x30] bx lr .align 2, 0 _0805929C: .4byte gRoomControls -_080592A0: .4byte gLinkEntity +_080592A0: .4byte gPlayerEntity thumb_func_start sub_080592A4 sub_080592A4: @ 0x080592A4 @@ -669,7 +669,7 @@ _080593CA: sub_080593CC: @ 0x080593CC push {r4, lr} adds r3, r0, #0 - ldr r2, _08059418 @ =gLinkState + ldr r2, _08059418 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -680,7 +680,7 @@ sub_080593CC: @ 0x080593CC ldrb r0, [r0] cmp r0, #0 beq _08059420 - ldr r4, _0805941C @ =gLinkEntity + ldr r4, _0805941C @ =gPlayerEntity ldrb r0, [r4, #0x14] cmp r0, #0 bne _08059420 @@ -704,8 +704,8 @@ sub_080593CC: @ 0x080593CC bl sub_0806FCB8 b _08059422 .align 2, 0 -_08059418: .4byte gLinkState -_0805941C: .4byte gLinkEntity +_08059418: .4byte gPlayerState +_0805941C: .4byte gPlayerEntity _08059420: movs r0, #0 _08059422: @@ -784,7 +784,7 @@ _080594B4: .4byte gRoomVars _080594B8: .4byte gUnk_08108380 _080594BC: ldr r1, _080594D4 @ =gUnk_08108380 - ldr r0, _080594D8 @ =gLinkEntity + ldr r0, _080594D8 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 lsls r0, r0, #2 @@ -797,7 +797,7 @@ _080594D2: pop {pc} .align 2, 0 _080594D4: .4byte gUnk_08108380 -_080594D8: .4byte gLinkEntity +_080594D8: .4byte gPlayerEntity thumb_func_start sub_080594DC sub_080594DC: @ 0x080594DC @@ -856,7 +856,7 @@ sub_08059548: @ 0x08059548 push {lr} movs r1, #6 bl sub_0805E3A0 - ldr r0, _08059568 @ =gLinkEntity + ldr r0, _08059568 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0x16 bne _0805955C @@ -869,5 +869,5 @@ _0805955C: strh r0, [r2] pop {pc} .align 2, 0 -_08059568: .4byte gLinkEntity +_08059568: .4byte gPlayerEntity _0805956C: .4byte gUnk_03000FF0 diff --git a/asm/mazaalBracelet.s b/asm/mazaalBracelet.s index e5d95297..95170d28 100644 --- a/asm/mazaalBracelet.s +++ b/asm/mazaalBracelet.s @@ -680,7 +680,7 @@ _0803A688: movs r0, #7 strb r0, [r4, #0xc] strb r1, [r4, #0xe] - ldr r1, _0803A6A4 @ =gLinkEntity + ldr r1, _0803A6A4 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -689,7 +689,7 @@ _0803A688: strh r0, [r4, #0x24] b _0803A6DE .align 2, 0 -_0803A6A4: .4byte gLinkEntity +_0803A6A4: .4byte gPlayerEntity _0803A6A8: adds r0, r4, #0 bl sub_0803B55C @@ -1185,7 +1185,7 @@ _0803AA54: ldrb r0, [r4, #0x15] cmp r0, r5 beq _0803AA6E - ldr r0, _0803AA94 @ =gLinkEntity + ldr r0, _0803AA94 @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r4, r2] movs r2, #0x32 @@ -1200,7 +1200,7 @@ _0803AA6E: ands r0, r1 strb r0, [r4, #0x18] strb r5, [r4, #0x15] - ldr r0, _0803AA94 @ =gLinkEntity + ldr r0, _0803AA94 @ =gPlayerEntity ldrh r1, [r0, #0x2e] adds r0, r4, #0 adds r0, #0x80 @@ -1212,7 +1212,7 @@ _0803AA8E: pop {r4, r5, pc} .align 2, 0 _0803AA90: .4byte gUnk_080CED6C -_0803AA94: .4byte gLinkEntity +_0803AA94: .4byte gPlayerEntity thumb_func_start sub_0803AA98 sub_0803AA98: @ 0x0803AA98 @@ -2718,7 +2718,7 @@ _0803B5B8: sub_0803B5C0: @ 0x0803B5C0 push {r4, lr} adds r4, r0, #0 - ldr r1, _0803B5E8 @ =gLinkEntity + ldr r1, _0803B5E8 @ =gPlayerEntity bl GetFacingDirection adds r2, r0, #0 cmp r2, #9 @@ -2737,7 +2737,7 @@ _0803B5D8: subs r0, #0xa b _0803B5F6 .align 2, 0 -_0803B5E8: .4byte gLinkEntity +_0803B5E8: .4byte gPlayerEntity _0803B5EC: .4byte gUnk_080CFD0C _0803B5F0: ldr r1, _0803B60C @ =gUnk_080CFD0C @@ -2761,7 +2761,7 @@ _0803B60C: .4byte gUnk_080CFD0C thumb_func_start sub_0803B610 sub_0803B610: @ 0x0803B610 push {r4, lr} - ldr r4, _0803B634 @ =gLinkEntity + ldr r4, _0803B634 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r4, r2] ldr r3, _0803B638 @ =gUnk_080CFD19 @@ -2778,14 +2778,14 @@ sub_0803B610: @ 0x0803B610 bl sub_0806FCB8 pop {r4, pc} .align 2, 0 -_0803B634: .4byte gLinkEntity +_0803B634: .4byte gPlayerEntity _0803B638: .4byte gUnk_080CFD19 thumb_func_start sub_0803B63C sub_0803B63C: @ 0x0803B63C push {r4, r5, lr} adds r4, r0, #0 - ldr r2, _0803B680 @ =gLinkEntity + ldr r2, _0803B680 @ =gPlayerEntity movs r0, #0x2e ldrsh r3, [r2, r0] ldr r1, _0803B684 @ =gUnk_080CFD19 @@ -2816,7 +2816,7 @@ sub_0803B63C: @ 0x0803B63C strb r0, [r4, #0x15] b _0803B6A0 .align 2, 0 -_0803B680: .4byte gLinkEntity +_0803B680: .4byte gPlayerEntity _0803B684: .4byte gUnk_080CFD19 _0803B688: movs r1, #0x2e @@ -2973,7 +2973,7 @@ _0803B794: .4byte gRoomControls thumb_func_start sub_0803B798 sub_0803B798: @ 0x0803B798 - ldr r2, _0803B7F4 @ =gLinkState + ldr r2, _0803B7F4 @ =gPlayerState movs r1, #0 movs r0, #0x41 strb r0, [r2, #2] @@ -2982,7 +2982,7 @@ sub_0803B798: @ 0x0803B798 ldr r1, _0803B7F8 @ =0x0000FFEF ands r0, r1 str r0, [r2, #0x30] - ldr r3, _0803B7FC @ =gLinkEntity + ldr r3, _0803B7FC @ =gPlayerEntity ldrb r1, [r3, #0x10] movs r0, #0x80 orrs r0, r1 @@ -3020,15 +3020,15 @@ sub_0803B798: @ 0x0803B798 strb r0, [r1] bx lr .align 2, 0 -_0803B7F4: .4byte gLinkState +_0803B7F4: .4byte gPlayerState _0803B7F8: .4byte 0x0000FFEF -_0803B7FC: .4byte gLinkEntity +_0803B7FC: .4byte gPlayerEntity _0803B800: .4byte 0x0000FFF6 thumb_func_start sub_0803B804 sub_0803B804: @ 0x0803B804 push {r4, lr} - ldr r4, _0803B820 @ =gLinkEntity + ldr r4, _0803B820 @ =gPlayerEntity adds r1, r4, #0 adds r1, #0x3d movs r0, #0x1e @@ -3040,19 +3040,19 @@ sub_0803B804: @ 0x0803B804 bl sub_0800449C pop {r4, pc} .align 2, 0 -_0803B820: .4byte gLinkEntity +_0803B820: .4byte gPlayerEntity thumb_func_start sub_0803B824 sub_0803B824: @ 0x0803B824 push {r4, r5, lr} adds r5, r0, #0 - bl ResetLink - ldr r2, _0803B864 @ =gLinkState + bl ResetPlayer + ldr r2, _0803B864 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r0, r1 strb r0, [r2, #0x1a] - ldr r4, _0803B868 @ =gLinkEntity + ldr r4, _0803B868 @ =gPlayerEntity ldr r1, _0803B86C @ =gUnk_080CFD1D ldrb r0, [r5, #0xa] adds r0, r0, r1 @@ -3074,8 +3074,8 @@ sub_0803B824: @ 0x0803B824 strb r0, [r4] pop {r4, r5, pc} .align 2, 0 -_0803B864: .4byte gLinkState -_0803B868: .4byte gLinkEntity +_0803B864: .4byte gPlayerState +_0803B868: .4byte gPlayerEntity _0803B86C: .4byte gUnk_080CFD1D thumb_func_start sub_0803B870 @@ -3090,7 +3090,7 @@ sub_0803B870: @ 0x0803B870 ands r0, r1 cmp r0, #0 beq _0803B8DC - ldr r0, _0803B8D4 @ =gLinkState + ldr r0, _0803B8D4 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x10 ands r0, r1 @@ -3104,7 +3104,7 @@ sub_0803B870: @ 0x0803B870 subs r0, #0x48 ands r0, r1 strb r0, [r3, #0x18] - ldr r1, _0803B8D8 @ =gLinkEntity + ldr r1, _0803B8D8 @ =gPlayerEntity ldrb r2, [r1, #0x10] movs r0, #0x7f ands r0, r2 @@ -3127,8 +3127,8 @@ sub_0803B870: @ 0x0803B870 movs r0, #1 b _0803B8E6 .align 2, 0 -_0803B8D4: .4byte gLinkState -_0803B8D8: .4byte gLinkEntity +_0803B8D4: .4byte gPlayerState +_0803B8D8: .4byte gPlayerEntity _0803B8DC: adds r1, r4, #0 adds r1, #0x3f diff --git a/asm/mazaalHead.s b/asm/mazaalHead.s index ea96d43f..93f4a365 100644 --- a/asm/mazaalHead.s +++ b/asm/mazaalHead.s @@ -305,11 +305,11 @@ _08034114: cmp r0, #0 beq _0803413E ldr r1, _08034140 @ =gRoomControls - ldr r0, _08034144 @ =gLinkEntity + ldr r0, _08034144 @ =gPlayerEntity str r0, [r1, #0x30] adds r0, r3, #0 bl sub_08034420 - ldr r0, _08034148 @ =gLinkState + ldr r0, _08034148 @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] @@ -320,8 +320,8 @@ _0803413E: pop {r4, pc} .align 2, 0 _08034140: .4byte gRoomControls -_08034144: .4byte gLinkEntity -_08034148: .4byte gLinkState +_08034144: .4byte gPlayerEntity +_08034148: .4byte gPlayerState thumb_func_start sub_0803414C sub_0803414C: @ 0x0803414C @@ -1154,20 +1154,20 @@ sub_0803473C: @ 0x0803473C ldrb r0, [r0, #0xc] cmp r0, #0x28 bhi _080347B0 - ldr r0, _08034760 @ =gLinkEntity + ldr r0, _08034760 @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r0, r1] adds r2, r0, #0 subs r2, #0x60 b _08034776 .align 2, 0 -_08034760: .4byte gLinkEntity +_08034760: .4byte gPlayerEntity _08034764: ldr r0, [r3, #0x78] ldrb r0, [r0, #0xc] cmp r0, #0x28 bhi _080347B0 - ldr r0, _08034790 @ =gLinkEntity + ldr r0, _08034790 @ =gPlayerEntity movs r5, #0x2e ldrsh r0, [r0, r5] adds r2, r0, #0 @@ -1187,7 +1187,7 @@ _08034776: movs r0, #8 b _080347A8 .align 2, 0 -_08034790: .4byte gLinkEntity +_08034790: .4byte gPlayerEntity _08034794: .4byte gRoomControls _08034798: adds r0, r2, #4 @@ -1210,7 +1210,7 @@ _080347B0: sub_080347B4: @ 0x080347B4 push {r4, r5, lr} adds r2, r0, #0 - ldr r0, _080347D8 @ =gLinkEntity + ldr r0, _080347D8 @ =gPlayerEntity movs r1, #0x2e ldrsh r3, [r0, r1] ldr r0, _080347DC @ =gRoomControls @@ -1227,7 +1227,7 @@ sub_080347B4: @ 0x080347B4 movs r0, #8 b _080347F0 .align 2, 0 -_080347D8: .4byte gLinkEntity +_080347D8: .4byte gPlayerEntity _080347DC: .4byte gRoomControls _080347E0: adds r0, r3, #4 @@ -1810,7 +1810,7 @@ _08034BFE: sub_08034C00: @ 0x08034C00 push {r4, lr} adds r3, r0, #0 - ldr r0, _08034C44 @ =gLinkState + ldr r0, _08034C44 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -1840,7 +1840,7 @@ sub_08034C00: @ 0x08034C00 bl DoExitTransition b _08034C5A .align 2, 0 -_08034C44: .4byte gLinkState +_08034C44: .4byte gPlayerState _08034C48: .4byte gRoomControls _08034C4C: .4byte gScreenTransition _08034C50: .4byte gUnk_080CED88 diff --git a/asm/minecart.s b/asm/minecart.s index f06f5240..2ec63ae3 100644 --- a/asm/minecart.s +++ b/asm/minecart.s @@ -11,7 +11,7 @@ sub_08091C0C: @ 0x08091C0C push {r4, lr} adds r4, r0, #0 bl sub_08004168 - ldr r1, _08091C30 @ =gLinkEntity + ldr r1, _08091C30 @ =gPlayerEntity adds r0, r4, #0 bl CopyPosition adds r0, r4, #0 @@ -24,7 +24,7 @@ sub_08091C0C: @ 0x08091C0C beq _08091C3E b _08091C80 .align 2, 0 -_08091C30: .4byte gLinkEntity +_08091C30: .4byte gPlayerEntity _08091C34: cmp r0, #0x69 beq _08091C4E @@ -79,21 +79,21 @@ _08091C80: _08091C86: movs r0, #3 strb r0, [r4, #0xc] - ldr r1, _08091C94 @ =gLinkEntity + ldr r1, _08091C94 @ =gPlayerEntity ldrb r0, [r4, #0x14] lsls r0, r0, #1 strb r0, [r1, #0x14] _08091C92: pop {r4, pc} .align 2, 0 -_08091C94: .4byte gLinkEntity +_08091C94: .4byte gPlayerEntity thumb_func_start sub_08091C98 sub_08091C98: @ 0x08091C98 push {r4, r5, lr} adds r4, r0, #0 bl sub_0806F69C - ldr r5, _08091CC0 @ =gLinkEntity + ldr r5, _08091CC0 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 bl CopyPosition @@ -110,14 +110,14 @@ sub_08091C98: @ 0x08091C98 _08091CBE: pop {r4, r5, pc} .align 2, 0 -_08091CC0: .4byte gLinkEntity +_08091CC0: .4byte gPlayerEntity _08091CC4: .4byte gRoomControls thumb_func_start sub_08091CC8 sub_08091CC8: @ 0x08091CC8 push {r4, r5, r6, lr} adds r6, r0, #0 - ldr r2, _08091D58 @ =gLinkState + ldr r2, _08091D58 @ =gPlayerState ldrb r0, [r2, #2] cmp r0, #0 bne _08091D64 @@ -186,13 +186,13 @@ sub_08091CC8: @ 0x08091CC8 bl SetTile b _08091D8A .align 2, 0 -_08091D58: .4byte gLinkState +_08091D58: .4byte gPlayerState _08091D5C: .4byte gRoomControls _08091D60: .4byte 0x00004022 _08091D64: adds r0, r6, #0 bl UpdateAnimationSingleFrame - ldr r3, _08091D8C @ =gLinkEntity + ldr r3, _08091D8C @ =gPlayerEntity adds r0, r6, #0 adds r0, #0x29 ldrb r1, [r0] @@ -211,7 +211,7 @@ _08091D64: _08091D8A: pop {r4, r5, r6, pc} .align 2, 0 -_08091D8C: .4byte gLinkEntity +_08091D8C: .4byte gPlayerEntity thumb_func_start sub_08091D90 sub_08091D90: @ 0x08091D90 @@ -272,7 +272,7 @@ sub_08091DDC: @ 0x08091DDC bl sub_080002CC cmp r0, #0xff bne _08091E5C - ldr r0, _08091E34 @ =gLinkEntity + ldr r0, _08091E34 @ =gPlayerEntity ldrb r1, [r4, #0x14] bl sub_0807BD14 cmp r0, #0 @@ -296,7 +296,7 @@ sub_08091DDC: @ 0x08091DDC b _08091E44 .align 2, 0 _08091E30: .4byte gUnk_081223D0 -_08091E34: .4byte gLinkEntity +_08091E34: .4byte gPlayerEntity _08091E38: cmp r0, #0x10 beq _08091E40 @@ -306,7 +306,7 @@ _08091E40: movs r0, #0xa0 strh r0, [r4, #0x24] _08091E44: - ldr r0, _08091E54 @ =gLinkEntity + ldr r0, _08091E54 @ =gPlayerEntity ldrb r1, [r4, #0x15] strb r1, [r0, #0x15] ldr r0, _08091E58 @ =gRoomControls @@ -314,7 +314,7 @@ _08091E44: movs r0, #1 b _08091E5E .align 2, 0 -_08091E54: .4byte gLinkEntity +_08091E54: .4byte gPlayerEntity _08091E58: .4byte gRoomControls _08091E5C: movs r0, #0 diff --git a/asm/minecartDoor.s b/asm/minecartDoor.s index 4d561b9e..308edf13 100644 --- a/asm/minecartDoor.s +++ b/asm/minecartDoor.s @@ -206,7 +206,7 @@ sub_08096C3C: @ 0x08096C3C cmp r0, #0 bne _08096CAE _08096C56: - ldr r0, _08096C80 @ =gLinkState + ldr r0, _08096C80 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #5 @@ -215,7 +215,7 @@ _08096C56: beq _08096C92 ldrb r2, [r4, #0xa] lsls r1, r2, #1 - ldr r0, _08096C84 @ =gLinkEntity + ldr r0, _08096C84 @ =gPlayerEntity ldrb r0, [r0, #0x14] cmp r1, r0 bne _08096C88 @@ -226,8 +226,8 @@ _08096C56: beq _08096CAE b _08096C9C .align 2, 0 -_08096C80: .4byte gLinkState -_08096C84: .4byte gLinkEntity +_08096C80: .4byte gPlayerState +_08096C84: .4byte gPlayerEntity _08096C88: ldrb r0, [r4, #0xe] subs r0, #1 @@ -298,14 +298,14 @@ sub_08096CEC: @ 0x08096CEC cmp r0, #0 bne _08096D60 _08096D06: - ldr r0, _08096D40 @ =gLinkState + ldr r0, _08096D40 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #5 ands r0, r1 cmp r0, #0 beq _08096D64 - ldr r3, _08096D44 @ =gLinkEntity + ldr r3, _08096D44 @ =gPlayerEntity ldrb r2, [r4, #0xa] lsls r0, r2, #1 ldrb r1, [r3, #0x14] @@ -328,8 +328,8 @@ _08096D06: ldrsh r3, [r4, r5] b _08096D58 .align 2, 0 -_08096D40: .4byte gLinkState -_08096D44: .4byte gLinkEntity +_08096D40: .4byte gPlayerState +_08096D44: .4byte gPlayerEntity _08096D48: movs r1, #0x2e ldrsh r0, [r3, r1] @@ -391,14 +391,14 @@ _08096D98: _08096DA2: movs r0, #0x32 ldrsh r1, [r1, r0] - ldr r0, _08096DB0 @ =gLinkEntity + ldr r0, _08096DB0 @ =gPlayerEntity movs r2, #0x32 ldrsh r0, [r0, r2] b _08096DEE .align 2, 0 -_08096DB0: .4byte gLinkEntity +_08096DB0: .4byte gPlayerEntity _08096DB4: - ldr r0, _08096DC4 @ =gLinkEntity + ldr r0, _08096DC4 @ =gPlayerEntity movs r2, #0x2e ldrsh r0, [r0, r2] adds r0, #0xa @@ -406,9 +406,9 @@ _08096DB4: ldrsh r1, [r1, r2] b _08096DD4 .align 2, 0 -_08096DC4: .4byte gLinkEntity +_08096DC4: .4byte gPlayerEntity _08096DC8: - ldr r0, _08096DE0 @ =gLinkEntity + ldr r0, _08096DE0 @ =gPlayerEntity movs r2, #0x32 ldrsh r0, [r0, r2] adds r0, #0xa @@ -421,11 +421,11 @@ _08096DD4: movs r0, #1 b _08096E02 .align 2, 0 -_08096DE0: .4byte gLinkEntity +_08096DE0: .4byte gPlayerEntity _08096DE4: movs r0, #0x2e ldrsh r1, [r1, r0] - ldr r0, _08096DFC @ =gLinkEntity + ldr r0, _08096DFC @ =gPlayerEntity movs r2, #0x2e ldrsh r0, [r0, r2] _08096DEE: @@ -436,7 +436,7 @@ _08096DEE: movs r0, #1 b _08096E02 .align 2, 0 -_08096DFC: .4byte gLinkEntity +_08096DFC: .4byte gPlayerEntity _08096E00: movs r0, #0 _08096E02: diff --git a/asm/minishSizedEntrance.s b/asm/minishSizedEntrance.s index f6b4ad3c..aa4edc0d 100644 --- a/asm/minishSizedEntrance.s +++ b/asm/minishSizedEntrance.s @@ -22,13 +22,13 @@ sub_08090F00: @ 0x08090F00 bne _08090F1C bl DeleteThisEntity _08090F1C: - ldr r6, _08090F64 @ =gLinkState + ldr r6, _08090F64 @ =gPlayerState ldr r0, [r6, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 beq _08090F62 - ldr r5, _08090F68 @ =gLinkEntity + ldr r5, _08090F68 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 movs r2, #4 @@ -57,6 +57,6 @@ _08090F1C: _08090F62: pop {r4, r5, r6, pc} .align 2, 0 -_08090F64: .4byte gLinkState -_08090F68: .4byte gLinkEntity +_08090F64: .4byte gPlayerState +_08090F68: .4byte gPlayerEntity _08090F6C: .4byte gUnk_0812225C diff --git a/asm/ministerPotho.s b/asm/ministerPotho.s index cd793eb1..ea0d3c95 100644 --- a/asm/ministerPotho.s +++ b/asm/ministerPotho.s @@ -149,7 +149,7 @@ _080668A2: movs r0, #0 strb r1, [r4, #0xc] strb r0, [r2] - ldr r1, _080668D0 @ =gLinkEntity + ldr r1, _080668D0 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -160,7 +160,7 @@ _080668A2: bl sub_0806F118 b _080668EC .align 2, 0 -_080668D0: .4byte gLinkEntity +_080668D0: .4byte gPlayerEntity _080668D4: adds r0, r4, #0 movs r1, #0 diff --git a/asm/moldworm.s b/asm/moldworm.s index 3b33afac..5b914aa5 100644 --- a/asm/moldworm.s +++ b/asm/moldworm.s @@ -156,7 +156,7 @@ _08023132: ldrb r0, [r5, #0xc] cmp r0, #7 bne _0802318A - ldr r4, _08023194 @ =gLinkEntity + ldr r4, _08023194 @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 bl CopyPosition @@ -179,7 +179,7 @@ _08023132: adds r4, #0x3d movs r0, #0xec strb r0, [r4] - ldr r2, _08023198 @ =gLinkState + ldr r2, _08023198 @ =gPlayerState movs r0, #0x41 strb r0, [r2, #2] ldr r0, [r2, #0x30] @@ -192,8 +192,8 @@ _0802318A: bl sub_0804AA30 pop {r4, r5, pc} .align 2, 0 -_08023194: .4byte gLinkEntity -_08023198: .4byte gLinkState +_08023194: .4byte gPlayerEntity +_08023198: .4byte gPlayerState _0802319C: .4byte 0xFFF7FFFF _080231A0: .4byte gUnk_080CBC38 @@ -340,7 +340,7 @@ sub_08023288: @ 0x08023288 ands r4, r0 movs r0, #0 mov r8, r0 - ldr r2, _08023308 @ =gLinkEntity + ldr r2, _08023308 @ =gPlayerEntity mov sb, r2 ldr r0, _0802330C @ =gUnk_080CBC70 mov sl, r0 @@ -377,7 +377,7 @@ _080232C2: bl sub_08023990 b _08023324 .align 2, 0 -_08023308: .4byte gLinkEntity +_08023308: .4byte gPlayerEntity _0802330C: .4byte gUnk_080CBC70 _08023310: .4byte gUnk_03001198 _08023314: @@ -656,7 +656,7 @@ sub_0802351C: @ 0x0802351C ldrb r0, [r7, #0xb] cmp r0, #1 beq _08023534 - ldr r0, _080235A8 @ =gLinkEntity + ldr r0, _080235A8 @ =gPlayerEntity ldrb r0, [r0, #0x1e] cmp r0, #0xff bne _0802355A @@ -687,13 +687,13 @@ _0802355A: ldrb r0, [r7, #0xb] cmp r0, #0 bne _080235B8 - ldr r5, _080235A8 @ =gLinkEntity + ldr r5, _080235A8 @ =gPlayerEntity ldrb r0, [r7, #0x14] movs r4, #7 adds r2, r4, #0 ands r2, r0 strb r2, [r5, #0x14] - ldr r3, _080235AC @ =gLinkState + ldr r3, _080235AC @ =gPlayerState ldr r0, [r3, #0x30] movs r1, #0x80 lsls r1, r1, #0xc @@ -717,8 +717,8 @@ _0802355A: strb r0, [r5] b _080235B8 .align 2, 0 -_080235A8: .4byte gLinkEntity -_080235AC: .4byte gLinkState +_080235A8: .4byte gPlayerEntity +_080235AC: .4byte gPlayerState _080235B0: .4byte gUnk_080CBC90 _080235B4: movs r0, #4 @@ -1134,13 +1134,13 @@ sub_08023894: @ 0x08023894 ldrb r0, [r0, #0xb] cmp r0, #0 bne _08023900 - ldr r2, _08023904 @ =gLinkState + ldr r2, _08023904 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 lsls r1, r1, #0xe orrs r0, r1 str r0, [r2, #0x30] - ldr r4, _08023908 @ =gLinkEntity + ldr r4, _08023908 @ =gPlayerEntity ldrh r0, [r5, #0x2e] strh r0, [r4, #0x2e] ldrh r0, [r5, #0x32] @@ -1166,8 +1166,8 @@ sub_08023894: @ 0x08023894 _08023900: pop {r4, r5, pc} .align 2, 0 -_08023904: .4byte gLinkState -_08023908: .4byte gLinkEntity +_08023904: .4byte gPlayerState +_08023908: .4byte gPlayerEntity thumb_func_start sub_0802390C sub_0802390C: @ 0x0802390C @@ -1268,7 +1268,7 @@ sub_08023990: @ 0x08023990 strb r0, [r4] strh r1, [r5, #0x2e] strh r2, [r5, #0x32] - ldr r0, _080239EC @ =gLinkEntity + ldr r0, _080239EC @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] adds r0, r5, #0 @@ -1291,7 +1291,7 @@ _080239D4: bne _080239D4 pop {r4, r5, pc} .align 2, 0 -_080239EC: .4byte gLinkEntity +_080239EC: .4byte gPlayerEntity thumb_func_start sub_080239F0 sub_080239F0: @ 0x080239F0 diff --git a/asm/mountainMinish.s b/asm/mountainMinish.s index ab2b9fc0..d55b8c9a 100644 --- a/asm/mountainMinish.s +++ b/asm/mountainMinish.s @@ -184,7 +184,7 @@ _08067F58: adds r1, r5, #0 adds r1, #0x69 strb r0, [r1] - ldr r1, _08067F94 @ =gLinkEntity + ldr r1, _08067F94 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -195,7 +195,7 @@ _08067F58: bl sub_0806F118 b _0806801A .align 2, 0 -_08067F94: .4byte gLinkEntity +_08067F94: .4byte gPlayerEntity _08067F98: adds r0, r5, #0 movs r1, #0 @@ -213,7 +213,7 @@ _08067F98: movs r0, #2 strb r0, [r5, #0xc] strb r1, [r4] - ldr r1, _08067FD8 @ =gLinkEntity + ldr r1, _08067FD8 @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -224,7 +224,7 @@ _08067F98: bl sub_08068190 b _0806801A .align 2, 0 -_08067FD8: .4byte gLinkEntity +_08067FD8: .4byte gPlayerEntity _08067FDC: ldr r0, _08067FFC @ =gTextBox ldrb r1, [r0] diff --git a/asm/nayru.s b/asm/nayru.s index dd6c6974..0a11072f 100644 --- a/asm/nayru.s +++ b/asm/nayru.s @@ -52,7 +52,7 @@ _080648C2: ldrb r1, [r0] adds r0, #0x10 strb r1, [r0] - ldr r1, _080648FC @ =gLinkEntity + ldr r1, _080648FC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -61,7 +61,7 @@ _080648C2: bl InitAnimationForceUpdate b _08064924 .align 2, 0 -_080648FC: .4byte gLinkEntity +_080648FC: .4byte gPlayerEntity _08064900: adds r0, r4, #0 movs r1, #0 diff --git a/asm/non_matching/code_0805457C.inc b/asm/non_matching/code_0805457C.inc index eedefa95..21288249 100644 --- a/asm/non_matching/code_0805457C.inc +++ b/asm/non_matching/code_0805457C.inc @@ -299,7 +299,7 @@ _080547DA: adds r2, r0, #0 cmp r2, #0 beq _0805486A - ldr r0, _08054804 @ =gLinkEntity + ldr r0, _08054804 @ =gPlayerEntity cmp r6, r0 bne _08054808 movs r0, #1 @@ -307,7 +307,7 @@ _080547DA: .align 2, 0 _080547FC: .4byte gRoomVars _08054800: .4byte gUnk_080FE1DD -_08054804: .4byte gLinkEntity +_08054804: .4byte gPlayerEntity _08054808: movs r0, #0 _0805480A: diff --git a/asm/non_matching/guard/sub_08063D44.inc b/asm/non_matching/guard/sub_08063D44.inc deleted file mode 100644 index 201f79c0..00000000 --- a/asm/non_matching/guard/sub_08063D44.inc +++ /dev/null @@ -1,69 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - push {r4, lr} - adds r4, r0, #0 - ldr r0, _08063DA0 @ =gUnk_03003DBC - ldrb r0, [r0] - cmp r0, #0x46 - bhi _08063DC6 - ldrb r0, [r4, #9] - movs r1, #0x15 - eors r0, r1 - rsbs r1, r0, #0 - orrs r1, r0 - lsrs r1, r1, #0x1f - lsls r1, r1, #4 - ldr r0, _08063DA4 @ =gUnk_0810F524 - adds r1, r1, r0 - adds r0, r4, #0 - bl LoadExtraSpriteData - cmp r0, #0 - beq _08063DC6 - adds r0, r4, #0 - movs r1, #4 - bl InitializeAnimation - ldr r0, _08063DA8 @ =gUnk_0810F6BC - ldrb r1, [r4, #0xa] - lsls r1, r1, #2 - adds r1, r1, r0 - ldr r1, [r1] - adds r0, r4, #0 - movs r2, #0 - bl sub_0806EE04 - ldrb r0, [r4, #0xa] - cmp r0, #0 - blt _08063DB6 - cmp r0, #3 - bgt _08063DAC - movs r0, #0xc - bl sub_080A7EE0 - str r4, [r0, #0x50] - movs r1, #0x3c - strb r1, [r0, #0xf] - b _08063DB6 - .align 2, 0 -_08063DA0: .4byte gUnk_03003DBC -_08063DA4: .4byte gUnk_0810F524 -_08063DA8: .4byte gUnk_0810F6BC -_08063DAC: - cmp r0, #5 - bgt _08063DB6 - adds r0, r4, #0 - bl sub_08078778 -_08063DB6: - ldrb r0, [r4, #0xc] - adds r0, #1 - movs r1, #0 - strb r0, [r4, #0xc] - strb r1, [r4, #0xa] - adds r0, r4, #0 - bl sub_08063DC8 -_08063DC6: - pop {r4, pc} - .syntax divided \ No newline at end of file diff --git a/asm/non_matching/guard/sub_08063E90.inc b/asm/non_matching/guard/sub_08063E90.inc deleted file mode 100644 index 76e3d4a5..00000000 --- a/asm/non_matching/guard/sub_08063E90.inc +++ /dev/null @@ -1,73 +0,0 @@ - .syntax unified - push {r4, lr} - adds r4, r0, #0 - ldrb r0, [r4, #9] - movs r1, #0x15 - eors r0, r1 - rsbs r1, r0, #0 - orrs r1, r0 - lsrs r1, r1, #0x1f - lsls r1, r1, #4 - ldr r0, _08063EC8 @ =gUnk_0810F524 - adds r1, r1, r0 - adds r0, r4, #0 - bl LoadExtraSpriteData - cmp r0, #0 - beq _08063F1E - ldrb r0, [r4, #0xc] - adds r0, #1 - strb r0, [r4, #0xc] - ldrb r1, [r4, #0xe] - cmp r1, #0 - beq _08063ECC - adds r1, r4, #0 - adds r1, #0x70 - movs r0, #8 - strb r0, [r1] - b _08063ED2 - .align 2, 0 -_08063EC8: .4byte gUnk_0810F524 -_08063ECC: - adds r0, r4, #0 - adds r0, #0x70 - strb r1, [r0] -_08063ED2: - movs r0, #0 - strb r0, [r4, #0xe] - adds r0, r4, #0 - bl sub_0805ACC0 - adds r2, r0, #0 - cmp r2, #0 - bne _08063EF2 - ldrh r0, [r4, #0x2e] - adds r1, r4, #0 - adds r1, #0x68 - strh r0, [r1] - ldrh r0, [r4, #0x32] - adds r1, #2 - strh r0, [r1] - b _08063EFE -_08063EF2: - lsrs r1, r2, #0x10 - adds r0, r4, #0 - adds r0, #0x68 - strh r1, [r0] - adds r0, #2 - strh r2, [r0] -_08063EFE: - adds r1, r4, #0 - adds r1, #0x71 - movs r0, #0 - strb r0, [r1] - subs r1, #0x39 - movs r0, #1 - strb r0, [r1] - adds r0, r4, #0 - bl UpdateSpriteForCollisionLayer - adds r0, r4, #0 - bl sub_0807DD64 - adds r0, r4, #0 - bl sub_08063F20 -_08063F1E: - pop {r4, pc} - .syntax divided \ No newline at end of file diff --git a/asm/non_matching/keaton/sub_08032574.inc b/asm/non_matching/keaton/sub_08032574.inc deleted file mode 100644 index c6caea9d..00000000 --- a/asm/non_matching/keaton/sub_08032574.inc +++ /dev/null @@ -1,50 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - push {r4, r5, lr} - adds r4, r0, #0 - ldr r0, [r4, #0x54] - cmp r0, #0 - beq _0803258A - adds r0, #0x41 - ldrb r1, [r0] - movs r0, #0x80 - ands r0, r1 - cmp r0, #0 - bne _080325A4 -_0803258A: - adds r5, r4, #0 - adds r5, #0x76 - ldrh r0, [r5] - subs r0, #1 - strh r0, [r5] - lsls r0, r0, #0x10 - cmp r0, #0 - beq _080325A4 - adds r0, r4, #0 - bl sub_080AEFE0 - cmp r0, #0 - bne _080325AC -_080325A4: - adds r0, r4, #0 - bl sub_0803275C - b _080325C2 -_080325AC: - adds r0, r4, #0 - bl UpdateAnimationSingleFrame - ldrh r1, [r5] - movs r0, #7 - ands r0, r1 - cmp r0, #0 - bne _080325C2 - adds r0, r4, #0 - bl sub_08032794 -_080325C2: - pop {r4, r5, pc} - .align 2, 0 - .syntax divided diff --git a/asm/non_matching/leever/sub_0801FED4.inc b/asm/non_matching/leever/sub_0801FED4.inc deleted file mode 100644 index 70d3ea26..00000000 --- a/asm/non_matching/leever/sub_0801FED4.inc +++ /dev/null @@ -1,72 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - push {r4, lr} - adds r4, r0, #0 - movs r1, #1 - bl sub_08049FDC - cmp r0, #0 - bne _0801FEEA - adds r1, r4, #0 - adds r1, #0x74 - movs r0, #1 - strh r0, [r1] -_0801FEEA: - adds r0, r4, #0 - adds r0, #0x5a - ldrb r0, [r0] - movs r2, #0xf - adds r1, r2, #0 - ands r1, r0 - lsls r1, r1, #5 - strh r1, [r4, #0x24] - ldrb r0, [r4, #0xa] - cmp r0, #0 - bne _0801FF28 - ldrb r1, [r4, #0xf] - adds r0, r1, #1 - strb r0, [r4, #0xf] - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - bne _0801FF4E - ldr r0, _0801FF24 @ =gUnk_020000B0 - ldr r1, [r0] - adds r0, r4, #0 - bl sub_0800132C - adds r1, r0, #0 - adds r0, r4, #0 - bl sub_08004596 - b _0801FF4E - .align 2, 0 -_0801FF24: .4byte gUnk_020000B0 -_0801FF28: - adds r0, r1, #0 - adds r0, #0x40 - strh r0, [r4, #0x24] - ldrb r1, [r4, #0xf] - adds r0, r1, #1 - strb r0, [r4, #0xf] - movs r0, #7 - ands r0, r1 - cmp r0, #0 - bne _0801FF4E - ldr r0, _0801FF58 @ =gUnk_020000B0 - ldr r1, [r0] - adds r0, r4, #0 - bl sub_0800132C - adds r1, r0, #0 - adds r0, r4, #0 - bl sub_08004596 -_0801FF4E: - adds r0, r4, #0 - bl sub_080AEF88 - pop {r4, pc} - .align 2, 0 -_0801FF58: .4byte gUnk_020000B0 -.syntax divided \ No newline at end of file diff --git a/asm/non_matching/minecart/sub_080919AC.inc b/asm/non_matching/minecart/sub_080919AC.inc deleted file mode 100644 index a3dfeadd..00000000 --- a/asm/non_matching/minecart/sub_080919AC.inc +++ /dev/null @@ -1,287 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - .syntax unified - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - adds r5, r0, #0 - ldr r1, _080919D4 @ =gRoomControls - movs r0, #0 - mov r8, r0 - movs r0, #7 - strb r0, [r1, #0xe] - ldr r0, _080919D8 @ =gLinkState - ldr r0, [r0, #0x30] - movs r1, #0x80 - lsls r1, r1, #5 - ands r0, r1 - cmp r0, #0 - bne _080919DC - movs r0, #1 - strb r0, [r5, #0xc] - b _08091C04 - .align 2, 0 -_080919D4: .4byte gRoomControls -_080919D8: .4byte gLinkState -_080919DC: - ldr r4, _08091A14 @ =gLinkEntity - adds r6, r4, #0 - adds r6, #0x5a - ldrb r1, [r6] - movs r7, #0xf - adds r0, r7, #0 - ands r0, r1 - cmp r0, #0 - bne _08091A22 - ldrb r1, [r5, #0x10] - movs r0, #0x7f - ands r0, r1 - strb r0, [r5, #0x10] - adds r0, r5, #0 - adds r1, r4, #0 - bl CopyPosition - ldrb r1, [r6] - movs r0, #0xf0 - ands r0, r1 - cmp r0, #0x10 - bne _08091A18 - adds r1, r5, #0 - adds r1, #0x63 - movs r0, #1 - strb r0, [r1] - b _08091C04 - .align 2, 0 -_08091A14: .4byte gLinkEntity -_08091A18: - adds r0, r5, #0 - adds r0, #0x63 - mov r1, r8 - strb r1, [r0] - b _08091C04 -_08091A22: - ldrb r0, [r5, #0x10] - movs r1, #0x80 - orrs r0, r1 - strb r0, [r5, #0x10] - mov r0, r8 - strh r0, [r4, #0x24] - adds r0, r5, #0 - bl sub_0806F69C - adds r0, r5, #0 - adds r1, r4, #0 - bl CopyPosition - adds r0, r5, #0 - adds r0, #0x29 - ldrb r1, [r0] - lsls r1, r1, #0x1d - lsrs r1, r1, #0x1d - subs r1, #1 - adds r3, r4, #0 - adds r3, #0x29 - movs r0, #7 - ands r1, r0 - ldrb r2, [r3] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - adds r0, r5, #0 - bl sub_08091DDC - cmp r0, #0 - beq _08091A68 - b _08091C04 -_08091A68: - ldr r0, _08091AD8 @ =gScreenTransition - ldr r0, [r0] - ands r0, r7 - cmp r0, #0 - bne _08091A7A - movs r0, #0x9c - lsls r0, r0, #1 - bl PlaySFX -_08091A7A: - ldrb r0, [r5, #0xf] - subs r0, #1 - strb r0, [r5, #0xf] - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #0xff - bne _08091A92 - movs r0, #0x7b - bl PlaySFX - movs r0, #0x3c - strb r0, [r5, #0xf] -_08091A92: - ldr r2, _08091ADC @ =gUnk_081223C8 - ldrb r0, [r5, #0x14] - lsls r0, r0, #1 - adds r1, r0, r2 - ldrb r1, [r1] - lsls r1, r1, #0x18 - asrs r1, r1, #0x18 - adds r0, #1 - adds r0, r0, r2 - movs r2, #0 - ldrsb r2, [r0, r2] - adds r0, r5, #0 - bl sub_080002B4 - adds r4, r0, #0 - ldr r1, _08091AE0 @ =gUnk_081223D8 - ldrb r0, [r5, #0x14] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r1, [r0] - adds r0, r4, #0 - bl sub_08007DD6 - cmp r0, #0 - bne _08091AE4 - ldrb r0, [r5, #0x15] - movs r1, #0x10 - eors r0, r1 - strb r0, [r5, #0x15] - ldrb r0, [r5, #0x14] - movs r1, #2 - eors r0, r1 - strb r0, [r5, #0x14] - b _08091BD8 - .align 2, 0 -_08091AD8: .4byte gScreenTransition -_08091ADC: .4byte gUnk_081223C8 -_08091AE0: .4byte gUnk_081223D8 -_08091AE4: - adds r0, r4, #0 - subs r0, #0x64 - cmp r0, #0xb - bhi _08091BD8 - lsls r0, r0, #2 - ldr r1, _08091AF8 @ =_08091AFC - adds r0, r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08091AF8: .4byte _08091AFC -_08091AFC: @ jump table - .4byte _08091B2C @ case 0 - .4byte _08091BD8 @ case 1 - .4byte _08091BD8 @ case 2 - .4byte _08091BB8 @ case 3 - .4byte _08091BB8 @ case 4 - .4byte _08091BB8 @ case 5 - .4byte _08091BB8 @ case 6 - .4byte _08091BD8 @ case 7 - .4byte _08091BB8 @ case 8 - .4byte _08091BB8 @ case 9 - .4byte _08091BB8 @ case 10 - .4byte _08091BB8 @ case 11 -_08091B2C: - ldrb r1, [r5, #0x10] - movs r0, #0xdf - ands r0, r1 - strb r0, [r5, #0x10] - adds r1, r5, #0 - adds r1, #0x3f - movs r0, #1 - strb r0, [r1] - subs r1, #3 - movs r0, #0x47 - strb r0, [r1] - adds r1, #4 - movs r0, #0x44 - strb r0, [r1] - subs r1, #5 - movs r4, #0x80 - movs r0, #0x80 - strb r0, [r1] - movs r0, #6 - strb r0, [r5, #0xc] - adds r0, r5, #0 - bl sub_08017744 - ldr r2, _08091BAC @ =gLinkState - movs r0, #0x41 - strb r0, [r2, #2] - ldr r0, [r2, #0x30] - movs r1, #0x80 - lsls r1, r1, #5 - eors r0, r1 - movs r1, #0x80 - lsls r1, r1, #0x13 - orrs r0, r1 - str r0, [r2, #0x30] - ldr r1, _08091BB0 @ =gLinkEntity - movs r0, #0x80 - lsls r0, r0, #0xa - str r0, [r1, #0x20] - movs r0, #0x80 - lsls r0, r0, #2 - strh r0, [r1, #0x24] - ldrb r0, [r5, #0x14] - lsls r0, r0, #1 - strb r0, [r1, #0x14] - ldrb r0, [r5, #0x15] - strb r0, [r1, #0x15] - ldrb r0, [r1, #0x10] - orrs r4, r0 - strb r4, [r1, #0x10] - adds r0, r5, #0 - bl sub_08004168 - ldrb r1, [r5, #0x14] - adds r1, #0xc - adds r0, r5, #0 - bl InitAnimationForceUpdate - movs r0, #0x78 - bl PlaySFX - ldr r0, _08091BB4 @ =0x00000139 - bl PlaySFX - b _08091C04 - .align 2, 0 -_08091BAC: .4byte gLinkState -_08091BB0: .4byte gLinkEntity -_08091BB4: .4byte 0x00000139 -_08091BB8: - adds r0, r5, #0 - bl sub_080002B8 - cmp r4, r0 - bne _08091BD8 - adds r0, r5, #0 - bl sub_08091C0C - ldr r1, _08091BD4 @ =gLinkEntity - ldrb r0, [r5, #0x14] - lsls r0, r0, #1 - strb r0, [r1, #0x14] - b _08091C04 - .align 2, 0 -_08091BD4: .4byte gLinkEntity -_08091BD8: - ldr r2, _08091BF8 @ =gLinkEntity - ldrb r0, [r5, #0x14] - lsls r1, r0, #1 - strb r1, [r2, #0x14] - adds r1, r5, #0 - adds r1, #0x58 - ldrb r1, [r1] - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r1, r0 - bne _08091BFC - adds r0, r5, #0 - bl UpdateAnimationSingleFrame - b _08091C04 - .align 2, 0 -_08091BF8: .4byte gLinkEntity -_08091BFC: - ldrb r1, [r5, #0x14] - adds r0, r5, #0 - bl InitAnimationForceUpdate -_08091C04: - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 - .syntax divided \ No newline at end of file diff --git a/asm/non_matching/railtrack/sub_080854A8.inc b/asm/non_matching/railtrack/sub_080854A8.inc deleted file mode 100644 index aa5bed89..00000000 --- a/asm/non_matching/railtrack/sub_080854A8.inc +++ /dev/null @@ -1,36 +0,0 @@ - .syntax unified - push {r4, lr} - ldr r2, _080854E0 @ =gUnk_081205E0 - ldrb r1, [r0, #0x14] - lsrs r1, r1, #1 - lsls r1, r1, #1 - adds r2, r1, r2 - ldrh r3, [r2] - adds r4, r3, #0 - ldr r2, _080854E4 @ =gUnk_080B4488 - adds r1, r1, r2 - ldr r2, [r0, #0x70] - movs r0, #0 - ldrsb r0, [r1, r0] - lsls r1, r0, #1 - subs r0, r2, r1 - ldrh r0, [r0] - cmp r3, r0 - bne _080854E8 - ldrh r0, [r2] - cmp r3, r0 - bne _080854E8 - adds r0, r1, r2 - ldrh r0, [r0] - cmp r4, r0 - bne _080854E8 - movs r0, #0 - b _080854EA - .align 2, 0 -_080854E0: .4byte gUnk_081205E0 -_080854E4: .4byte gUnk_080B4488 -_080854E8: - movs r0, #1 -_080854EA: - pop {r4, pc} - .syntax divided \ No newline at end of file diff --git a/asm/non_matching/smith/smith.inc b/asm/non_matching/smith/smith.inc index 27a834f7..c2997056 100644 --- a/asm/non_matching/smith/smith.inc +++ b/asm/non_matching/smith/smith.inc @@ -31,7 +31,7 @@ bne _08065FF0 movs r5, #8 _08065FF0: - ldr r1, _08066020 @ =gLinkEntity + ldr r1, _08066020 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -51,7 +51,7 @@ _0806600C: bl _call_via_r1 b _08066042 .align 2, 0 -_08066020: .4byte gLinkEntity +_08066020: .4byte gPlayerEntity _08066024: .4byte gUnk_0811036C _08066028: ldr r0, _08066058 @ =gUnk_08110360 diff --git a/asm/non_matching/sub_08077D38.inc b/asm/non_matching/sub_08077D38.inc index 1f4015f3..22514994 100644 --- a/asm/non_matching/sub_08077D38.inc +++ b/asm/non_matching/sub_08077D38.inc @@ -11,7 +11,7 @@ push {r7} adds r4, r0, #0 mov r8, r1 - ldr r3, _08077D94 @ =gLinkState + ldr r3, _08077D94 @ =gPlayerState movs r7, #8 adds r1, r7, #0 mov r0, r8 @@ -23,7 +23,7 @@ ldrb r0, [r3, #0xb] orrs r1, r0 strb r1, [r3, #0xb] - ldr r0, _08077D98 @ =gLinkEntity + ldr r0, _08077D98 @ =gPlayerEntity ldrb r0, [r0, #0x14] strb r0, [r4, #0xa] ldrb r0, [r4, #4] @@ -53,8 +53,8 @@ _08077D6A: beq _08077DAC b _08077DB4 .align 2, 0 -_08077D94: .4byte gLinkState -_08077D98: .4byte gLinkEntity +_08077D94: .4byte gPlayerState +_08077D98: .4byte gPlayerEntity _08077D9C: .4byte gUnk_0811BE48 _08077DA0: cmp r2, #0x1b @@ -86,7 +86,7 @@ _08077DCC: ldrb r0, [r5, #7] cmp r0, #0 beq _08077DE8 - ldr r2, _08077DF0 @ =gLinkState + ldr r2, _08077DF0 @ =gPlayerState movs r0, #8 mov r1, r8 asrs r0, r1 @@ -100,5 +100,5 @@ _08077DE8: mov r8, r3 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08077DF0: .4byte gLinkState +_08077DF0: .4byte gPlayerState .syntax divided \ No newline at end of file diff --git a/asm/npc23.s b/asm/npc23.s index af5a0ba7..d3828237 100644 --- a/asm/npc23.s +++ b/asm/npc23.s @@ -58,7 +58,7 @@ sub_080662F8: @ 0x080662F8 adds r1, r5, #0 adds r1, #0x82 strh r0, [r1] - ldr r0, _08066354 @ =gLinkEntity + ldr r0, _08066354 @ =gPlayerEntity str r0, [r5, #0x50] adds r0, r5, #0 adds r0, #0x84 @@ -70,7 +70,7 @@ sub_080662F8: @ 0x080662F8 bl sub_08078778 pop {r4, r5, pc} .align 2, 0 -_08066354: .4byte gLinkEntity +_08066354: .4byte gPlayerEntity thumb_func_start sub_08066358 sub_08066358: @ 0x08066358 @@ -151,7 +151,7 @@ sub_080663D4: @ 0x080663D4 subs r0, #8 cmp r1, r0 bne _08066410 - ldr r0, _0806640C @ =gLinkEntity + ldr r0, _0806640C @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0xf beq _0806642E @@ -168,7 +168,7 @@ sub_080663D4: @ 0x080663D4 bl InitializeAnimation b _0806642E .align 2, 0 -_0806640C: .4byte gLinkEntity +_0806640C: .4byte gPlayerEntity _08066410: ldrb r0, [r4, #0xd] cmp r0, #0 @@ -207,7 +207,7 @@ sub_0806643C: @ 0x0806643C movs r1, #0 movs r2, #0 bl sub_08078AC0 - ldr r0, _08066470 @ =gLinkEntity + ldr r0, _08066470 @ =gPlayerEntity strb r4, [r0, #0x14] strb r4, [r0, #0x15] _08066462: @@ -216,12 +216,12 @@ _08066462: pop {r4, r5, pc} .align 2, 0 _0806646C: .4byte gRoomControls -_08066470: .4byte gLinkEntity +_08066470: .4byte gPlayerEntity thumb_func_start sub_08066474 sub_08066474: @ 0x08066474 push {lr} - ldr r0, _08066488 @ =gLinkEntity + ldr r0, _08066488 @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0xf beq _08066484 @@ -231,7 +231,7 @@ sub_08066474: @ 0x08066474 _08066484: pop {pc} .align 2, 0 -_08066488: .4byte gLinkEntity +_08066488: .4byte gPlayerEntity _0806648C: .4byte gUnk_02034490 thumb_func_start sub_08066490 @@ -306,7 +306,7 @@ sub_0806650C: @ 0x0806650C push {r4, r5, r6, r7, lr} adds r3, r0, #0 movs r4, #0 - ldr r1, _0806652C @ =gLinkEntity + ldr r1, _0806652C @ =gPlayerEntity ldrh r5, [r1, #0x2e] adds r7, r5, #0 ldrh r2, [r1, #0x32] @@ -319,7 +319,7 @@ sub_0806650C: @ 0x0806650C movs r4, #4 b _0806654C .align 2, 0 -_0806652C: .4byte gLinkEntity +_0806652C: .4byte gPlayerEntity _08066530: adds r0, r3, #0 adds r0, #0x7e @@ -372,7 +372,7 @@ sub_08066570: @ 0x08066570 ldrb r0, [r5, #0xc] cmp r0, #3 beq _080665DE - ldr r4, _080665E0 @ =gLinkEntity + ldr r4, _080665E0 @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 movs r2, #0x50 @@ -417,4 +417,4 @@ _080665C8: _080665DE: pop {r4, r5, r6, pc} .align 2, 0 -_080665E0: .4byte gLinkEntity +_080665E0: .4byte gPlayerEntity diff --git a/asm/npc5.s b/asm/npc5.s index 36baa15a..3e49b7fc 100644 --- a/asm/npc5.s +++ b/asm/npc5.s @@ -24,7 +24,7 @@ _080609FC: .4byte gUnk_0810AC1C sub_08060A00: @ 0x08060A00 push {r4, r5, lr} adds r5, r0, #0 - ldr r0, _08060AD0 @ =gLinkState + ldr r0, _08060AD0 @ =gPlayerState ldrb r1, [r0, #2] movs r0, #0x80 ands r0, r1 @@ -43,7 +43,7 @@ sub_08060A00: @ 0x08060A00 orrs r0, r1 strb r0, [r2] ldr r4, [r5, #0x64] - ldr r3, _08060AD4 @ =gLinkEntity + ldr r3, _08060AD4 @ =gPlayerEntity ldrh r2, [r3, #0x2e] movs r1, #0x10 rsbs r1, r1, #0 @@ -77,7 +77,7 @@ _08060A62: cmp r0, #0 beq _08060A76 ldr r1, [r5, #0x64] - ldr r2, _08060AD4 @ =gLinkEntity + ldr r2, _08060AD4 @ =gPlayerEntity ldrh r0, [r2, #0x2e] strh r0, [r1, #2] ldr r1, [r5, #0x64] @@ -92,7 +92,7 @@ _08060A76: cmp r0, r1 beq _08060ACE strh r1, [r2] - ldr r0, _08060AD4 @ =gLinkEntity + ldr r0, _08060AD4 @ =gPlayerEntity adds r1, r5, #0 bl CopyPosition movs r2, #1 @@ -128,8 +128,8 @@ _08060A76: _08060ACE: pop {r4, r5, pc} .align 2, 0 -_08060AD0: .4byte gLinkState -_08060AD4: .4byte gLinkEntity +_08060AD0: .4byte gPlayerState +_08060AD4: .4byte gPlayerEntity _08060AD8: .4byte gUnk_0810AC2C _08060ADC: .4byte gRoomControls @@ -207,7 +207,7 @@ sub_08060B5C: @ 0x08060B5C adds r5, r0, #0 cmp r5, #0 bne _08060B98 - ldr r1, _08060B94 @ =gLinkEntity + ldr r1, _08060B94 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection ldrb r1, [r4, #0x14] @@ -223,7 +223,7 @@ sub_08060B5C: @ 0x08060B5C strb r5, [r4, #0xf] b _08060B9E .align 2, 0 -_08060B94: .4byte gLinkEntity +_08060B94: .4byte gPlayerEntity _08060B98: adds r0, r4, #0 bl sub_08060EDC @@ -327,7 +327,7 @@ _08060C56: bl sub_08061464 b _08060D54 _08060C66: - ldr r5, _08060C98 @ =gLinkEntity + ldr r5, _08060C98 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r5, r0] movs r0, #0x32 @@ -349,7 +349,7 @@ _08060C66: movs r0, #0xf5 b _08060D36 .align 2, 0 -_08060C98: .4byte gLinkEntity +_08060C98: .4byte gPlayerEntity _08060C9C: ldr r2, [r4, #0x64] ldrb r1, [r2] @@ -571,7 +571,7 @@ sub_08060E34: @ 0x08060E34 beq _08060E68 movs r0, #2 strb r0, [r4, #0xc] - ldr r1, _08060E6C @ =gLinkEntity + ldr r1, _08060E6C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r0, #4 @@ -585,7 +585,7 @@ sub_08060E34: @ 0x08060E34 _08060E68: pop {r4, pc} .align 2, 0 -_08060E6C: .4byte gLinkEntity +_08060E6C: .4byte gPlayerEntity thumb_func_start sub_08060E70 sub_08060E70: @ 0x08060E70 @@ -664,7 +664,7 @@ sub_08060EDC: @ 0x08060EDC bl UpdateAnimationSingleFrame b _08060F7C _08060F00: - ldr r1, _08060F30 @ =gLinkEntity + ldr r1, _08060F30 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection ldrb r2, [r4, #0x14] @@ -686,7 +686,7 @@ _08060F00: adds r0, #1 b _08060F42 .align 2, 0 -_08060F30: .4byte gLinkEntity +_08060F30: .4byte gPlayerEntity _08060F34: adds r1, r2, #0 adds r1, #0x28 @@ -732,7 +732,7 @@ _08060F7C: sub_08060F80: @ 0x08060F80 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _08060FC8 @ =gLinkEntity + ldr r5, _08060FC8 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r5, r0] movs r3, #0x32 @@ -765,7 +765,7 @@ _08060FC2: movs r0, #0 b _08060FCE .align 2, 0 -_08060FC8: .4byte gLinkEntity +_08060FC8: .4byte gPlayerEntity _08060FCC: movs r0, #1 _08060FCE: @@ -878,7 +878,7 @@ sub_08061090: @ 0x08061090 adds r3, r0, #0 adds r5, r1, #0 adds r6, r2, #0 - ldr r1, _080610C8 @ =gLinkEntity + ldr r1, _080610C8 @ =gPlayerEntity movs r0, #0x2e ldrsh r2, [r1, r0] movs r4, #0x2e @@ -902,7 +902,7 @@ sub_08061090: @ 0x08061090 lsls r0, r0, #1 b _080610F0 .align 2, 0 -_080610C8: .4byte gLinkEntity +_080610C8: .4byte gPlayerEntity _080610CC: .4byte 0x000008FF _080610D0: ldr r0, _080610E4 @ =0x000018FF diff --git a/asm/object10.s b/asm/object10.s index 8390ccb0..dc1d3334 100644 --- a/asm/object10.s +++ b/asm/object10.s @@ -92,7 +92,7 @@ _080848C4: .4byte 0x00004016 sub_080848C8: @ 0x080848C8 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08084980 @ =gLinkState + ldr r0, _08084980 @ =gPlayerState adds r0, #0xa0 ldrb r0, [r0] cmp r0, #5 @@ -123,7 +123,7 @@ sub_080848C8: @ 0x080848C8 lsls r0, r1, #4 subs r0, r0, r1 strb r0, [r4, #0xf] - ldr r2, _08084988 @ =gLinkEntity + ldr r2, _08084988 @ =gPlayerEntity ldrh r0, [r4, #0x2e] ldrh r1, [r2, #0x2e] subs r0, r0, r1 @@ -159,7 +159,7 @@ _0808493C: bl sub_08000152 ldrb r1, [r4, #0xa] adds r1, #1 - ldr r0, _08084980 @ =gLinkState + ldr r0, _08084980 @ =gPlayerState ldr r0, [r0, #0x2c] adds r0, #0x68 ldrb r3, [r0] @@ -179,9 +179,9 @@ _0808496A: bl sub_080849D8 b _080849D6 .align 2, 0 -_08084980: .4byte gLinkState +_08084980: .4byte gPlayerState _08084984: .4byte gUnk_08120574 -_08084988: .4byte gLinkEntity +_08084988: .4byte gPlayerEntity _0808498C: .4byte gUnk_03004040 _08084990: .4byte 0x00000315 _08084994: @@ -238,7 +238,7 @@ _080849F2: subs r0, #1 strb r0, [r4, #0xf] _080849F6: - ldr r2, _08084A3C @ =gLinkState + ldr r2, _08084A3C @ =gPlayerState adds r3, r2, #0 adds r3, #0xa0 ldrb r0, [r3] @@ -263,7 +263,7 @@ _08084A04: ldrb r0, [r0] cmp r0, #0 beq _08084AF8 - ldr r5, _08084A44 @ =gLinkEntity + ldr r5, _08084A44 @ =gPlayerEntity adds r0, r5, #0 adds r0, #0x3d ldrb r0, [r0] @@ -275,9 +275,9 @@ _08084A04: strb r0, [r3] b _08084AF8 .align 2, 0 -_08084A3C: .4byte gLinkState +_08084A3C: .4byte gPlayerState _08084A40: .4byte gUnk_03004040 -_08084A44: .4byte gLinkEntity +_08084A44: .4byte gPlayerEntity _08084A48: adds r0, r4, #0 bl sub_080002B8 @@ -361,13 +361,13 @@ _08084AE4: strb r0, [r4, #0xe] b _08084B16 _08084AEA: - ldr r0, _08084AF4 @ =gLinkState + ldr r0, _08084AF4 @ =gPlayerState adds r0, #0xa0 movs r1, #1 strb r1, [r0] b _08084B16 .align 2, 0 -_08084AF4: .4byte gLinkState +_08084AF4: .4byte gPlayerState _08084AF8: bl sub_0807A108 adds r0, r4, #0 @@ -392,7 +392,7 @@ sub_08084B1C: @ 0x08084B1C mov r5, r8 push {r5, r6, r7} adds r4, r0, #0 - ldr r3, _08084CA4 @ =gLinkEntity + ldr r3, _08084CA4 @ =gPlayerEntity ldrb r0, [r3, #0x10] strb r0, [r4, #0x10] adds r0, r3, #0 @@ -493,7 +493,7 @@ sub_08084B1C: @ 0x08084B1C ldr r1, [r4, #0x54] adds r0, r4, #0 bl CopyPosition - ldr r5, _08084CA8 @ =gLinkState + ldr r5, _08084CA8 @ =gPlayerState ldrb r0, [r5, #4] cmp r0, #0 beq _08084C6A @@ -578,8 +578,8 @@ _08084C6A: mov sl, r5 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08084CA4: .4byte gLinkEntity -_08084CA8: .4byte gLinkState +_08084CA4: .4byte gPlayerEntity +_08084CA8: .4byte gPlayerState thumb_func_start sub_08084CAC sub_08084CAC: @ 0x08084CAC diff --git a/asm/object11.s b/asm/object11.s index 99dd93a5..165dd5ab 100644 --- a/asm/object11.s +++ b/asm/object11.s @@ -73,7 +73,7 @@ _08084D7E: movs r2, #0 movs r0, #0x80 strh r0, [r7, #0x24] - ldr r0, _08084E4C @ =gLinkEntity + ldr r0, _08084E4C @ =gPlayerEntity adds r0, #0x38 ldrb r0, [r0] adds r6, r7, #0 @@ -145,7 +145,7 @@ _08084D7E: pop {r4, r5, r6, r7, pc} .align 2, 0 _08084E48: .4byte gUnk_08120588 -_08084E4C: .4byte gLinkEntity +_08084E4C: .4byte gPlayerEntity _08084E50: .4byte gUnk_081205B4 _08084E54: .4byte gRoomControls _08084E58: .4byte 0x00004022 @@ -154,7 +154,7 @@ _08084E58: .4byte 0x00004022 sub_08084E5C: @ 0x08084E5C push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08084EAC @ =gLinkState + ldr r0, _08084EAC @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -192,7 +192,7 @@ _08084E7A: _08084EA8: pop {r4, r5, pc} .align 2, 0 -_08084EAC: .4byte gLinkState +_08084EAC: .4byte gPlayerState _08084EB0: .4byte gRoomControls thumb_func_start sub_08084EB4 @@ -273,7 +273,7 @@ sub_08084EFC: @ 0x08084EFC ldrb r2, [r2] bl sub_0807B9B8 _08084F42: - ldr r0, _08084F80 @ =gLinkState + ldr r0, _08084F80 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -304,7 +304,7 @@ _08084F7A: pop {r4, r5, r6, pc} .align 2, 0 _08084F7C: .4byte gRoomControls -_08084F80: .4byte gLinkState +_08084F80: .4byte gPlayerState thumb_func_start sub_08084F84 sub_08084F84: @ 0x08084F84 diff --git a/asm/object17.s b/asm/object17.s index 93768f63..23b434a2 100644 --- a/asm/object17.s +++ b/asm/object17.s @@ -29,7 +29,7 @@ sub_080861C4: @ 0x080861C4 strb r0, [r4, #0xc] movs r0, #0x80 strh r0, [r4, #0x24] - ldr r0, _08086230 @ =gLinkEntity + ldr r0, _08086230 @ =gPlayerEntity mov ip, r0 ldrb r1, [r0, #0x19] lsrs r1, r1, #6 @@ -75,7 +75,7 @@ sub_080861C4: @ 0x080861C4 bl InitializeAnimation pop {r4, r5, r6, pc} .align 2, 0 -_08086230: .4byte gLinkEntity +_08086230: .4byte gPlayerEntity thumb_func_start sub_08086234 sub_08086234: @ 0x08086234 @@ -106,7 +106,7 @@ _0808625E: bl DeleteThisEntity b _0808627E _0808626E: - ldr r0, _08086280 @ =gLinkState + ldr r0, _08086280 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -116,4 +116,4 @@ _0808626E: _0808627E: pop {r4, pc} .align 2, 0 -_08086280: .4byte gLinkState +_08086280: .4byte gPlayerState diff --git a/asm/object1E.s b/asm/object1E.s index d9d10e01..8bfbd69b 100644 --- a/asm/object1E.s +++ b/asm/object1E.s @@ -32,7 +32,7 @@ sub_08087528: @ 0x08087528 adds r4, r0, #0 movs r0, #1 strb r0, [r4, #0xc] - ldr r0, _08087590 @ =gLinkEntity + ldr r0, _08087590 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsrs r0, r0, #1 strb r0, [r4, #0x14] @@ -81,7 +81,7 @@ _08087588: bl sub_08087640 b _080875DC .align 2, 0 -_08087590: .4byte gLinkEntity +_08087590: .4byte gPlayerEntity _08087594: ldr r0, _080875B4 @ =gArea ldrb r0, [r0, #1] @@ -151,7 +151,7 @@ _0808760E: ldrb r0, [r4, #0xb] cmp r0, #0 beq _08087638 - ldr r0, _0808763C @ =gLinkEntity + ldr r0, _0808763C @ =gPlayerEntity adds r0, #0x29 ldrb r1, [r0] lsls r1, r1, #0x1d @@ -172,7 +172,7 @@ _0808760E: _08087638: pop {r4, r5, pc} .align 2, 0 -_0808763C: .4byte gLinkEntity +_0808763C: .4byte gPlayerEntity thumb_func_start sub_08087640 sub_08087640: @ 0x08087640 diff --git a/asm/object1F.s b/asm/object1F.s index 8eff6587..315749f8 100644 --- a/asm/object1F.s +++ b/asm/object1F.s @@ -97,7 +97,7 @@ _080876E2: adds r0, r0, r3 ldrb r0, [r0, #2] str r0, [r2, #0x6c] - ldr r0, _08087768 @ =gLinkEntity + ldr r0, _08087768 @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] mov r0, ip @@ -116,7 +116,7 @@ _080876E2: .align 2, 0 _08087760: .4byte gUnk_08120A20 _08087764: .4byte gUnk_08120A18 -_08087768: .4byte gLinkEntity +_08087768: .4byte gPlayerEntity thumb_func_start sub_0808776C sub_0808776C: @ 0x0808776C @@ -127,12 +127,12 @@ sub_0808776C: @ 0x0808776C beq _08087788 subs r0, #1 str r0, [r4, #0x6c] - ldr r0, _08087784 @ =gLinkState + ldr r0, _08087784 @ =gPlayerState adds r0, #0x3d ldrb r0, [r0] b _08087798 .align 2, 0 -_08087784: .4byte gLinkState +_08087784: .4byte gPlayerState _08087788: adds r0, r4, #0 bl sub_080AEFE0 diff --git a/asm/object21.s b/asm/object21.s index 8367e2d3..1c03e043 100644 --- a/asm/object21.s +++ b/asm/object21.s @@ -163,7 +163,7 @@ _08087AC0: ldrh r0, [r4, #0x32] adds r0, r0, r2 strh r0, [r4, #0x32] - ldr r0, _08087AEC @ =gLinkEntity + ldr r0, _08087AEC @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] adds r0, r4, #0 @@ -176,7 +176,7 @@ _08087AC0: .align 2, 0 _08087AE4: .4byte gUnk_08120A8C _08087AE8: .4byte gUnk_08120A7A -_08087AEC: .4byte gLinkEntity +_08087AEC: .4byte gPlayerEntity _08087AF0: adds r0, r4, #0 movs r1, #0x10 diff --git a/asm/object24.s b/asm/object24.s index 60438adc..a3d057e1 100644 --- a/asm/object24.s +++ b/asm/object24.s @@ -232,7 +232,7 @@ sub_080889A8: @ 0x080889A8 bl sub_08017850 cmp r0, #0 beq _080889CA - ldr r1, _08088A40 @ =gLinkEntity + ldr r1, _08088A40 @ =gPlayerEntity ldr r2, _08088A44 @ =gUnk_08120BEC adds r0, r4, #0 adds r0, #0x72 @@ -243,7 +243,7 @@ sub_080889A8: @ 0x080889A8 strb r0, [r1] movs r5, #1 _080889CA: - ldr r0, _08088A48 @ =gLinkState + ldr r0, _08088A48 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #0xf @@ -302,7 +302,7 @@ _08088A3A: adds r0, r5, #0 pop {r4, r5, r6, pc} .align 2, 0 -_08088A40: .4byte gLinkEntity +_08088A40: .4byte gPlayerEntity _08088A44: .4byte gUnk_08120BEC -_08088A48: .4byte gLinkState +_08088A48: .4byte gPlayerState _08088A4C: .4byte gUnk_03004040 diff --git a/asm/object29.s b/asm/object29.s index 8c442a10..43e3180d 100644 --- a/asm/object29.s +++ b/asm/object29.s @@ -172,7 +172,7 @@ _08089964: cmp r0, #2 bne _08089A76 _08089984: - ldr r0, _08089998 @ =gLinkEntity + ldr r0, _08089998 @ =gPlayerEntity movs r1, #0x36 ldrsh r2, [r0, r1] movs r1, #0x24 @@ -183,7 +183,7 @@ _08089984: movs r0, #1 b _0808999E .align 2, 0 -_08089998: .4byte gLinkEntity +_08089998: .4byte gPlayerEntity _0808999C: movs r0, #0 _0808999E: @@ -226,7 +226,7 @@ _0808999E: movs r0, #1 strb r0, [r1, #0xc] _080899EC: - ldr r1, _08089A78 @ =gLinkState + ldr r1, _08089A78 @ =gPlayerState movs r0, #1 strb r0, [r1, #0x14] ldrh r0, [r5, #0x32] @@ -297,7 +297,7 @@ _08089A62: _08089A76: pop {r4, r5, r6, pc} .align 2, 0 -_08089A78: .4byte gLinkState +_08089A78: .4byte gPlayerState thumb_func_start sub_08089A7C sub_08089A7C: @ 0x08089A7C @@ -310,7 +310,7 @@ sub_08089A7C: @ 0x08089A7C ldrh r0, [r4, #0x32] subs r0, r0, r1 strh r0, [r4, #0x32] - ldr r5, _08089AB0 @ =gLinkEntity + ldr r5, _08089AB0 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 movs r2, #0xf @@ -318,7 +318,7 @@ sub_08089A7C: @ 0x08089A7C bl sub_080041A0 cmp r0, #0 beq _08089AB8 - ldr r2, _08089AB4 @ =gLinkState + ldr r2, _08089AB4 @ =gPlayerState movs r0, #1 strb r0, [r2, #0x14] ldr r0, [r2, #0x30] @@ -327,8 +327,8 @@ sub_08089A7C: @ 0x08089A7C str r0, [r2, #0x30] b _08089AD0 .align 2, 0 -_08089AB0: .4byte gLinkEntity -_08089AB4: .4byte gLinkState +_08089AB0: .4byte gPlayerEntity +_08089AB4: .4byte gPlayerState _08089AB8: movs r2, #1 strb r2, [r4, #0xc] @@ -355,17 +355,17 @@ _08089AD0: thumb_func_start sub_08089AE0 sub_08089AE0: @ 0x08089AE0 push {lr} - ldr r1, _08089AF8 @ =gLinkEntity + ldr r1, _08089AF8 @ =gPlayerEntity movs r2, #0xf movs r3, #0xf bl sub_080041A0 cmp r0, #0 beq _08089AF6 - ldr r1, _08089AFC @ =gLinkState + ldr r1, _08089AFC @ =gPlayerState movs r0, #1 strb r0, [r1, #0x14] _08089AF6: pop {pc} .align 2, 0 -_08089AF8: .4byte gLinkEntity -_08089AFC: .4byte gLinkState +_08089AF8: .4byte gPlayerEntity +_08089AFC: .4byte gPlayerState diff --git a/asm/object35.s b/asm/object35.s index 903fe6a1..f99aae2c 100644 --- a/asm/object35.s +++ b/asm/object35.s @@ -104,7 +104,7 @@ sub_0808B910: @ 0x0808B910 adds r1, r1, r2 ldr r1, [r1] bl _call_via_r1 - ldr r2, _0808B930 @ =gLinkState + ldr r2, _0808B930 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r0, r1 @@ -112,7 +112,7 @@ sub_0808B910: @ 0x0808B910 pop {pc} .align 2, 0 _0808B92C: .4byte gUnk_081213DC -_0808B930: .4byte gLinkState +_0808B930: .4byte gPlayerState thumb_func_start sub_0808B934 sub_0808B934: @ 0x0808B934 diff --git a/asm/object36.s b/asm/object36.s index 4b9680e4..96185a8e 100644 --- a/asm/object36.s +++ b/asm/object36.s @@ -83,7 +83,7 @@ _0808BB4C: str r0, [r4, #0x48] movs r0, #2 strb r0, [r4, #0x1e] - ldr r0, _0808BBDC @ =gLinkEntity + ldr r0, _0808BBDC @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] adds r0, r4, #0 @@ -104,7 +104,7 @@ _0808BBD4: pop {r4, pc} .align 2, 0 _0808BBD8: .4byte gUnk_080FD150 -_0808BBDC: .4byte gLinkEntity +_0808BBDC: .4byte gPlayerEntity thumb_func_start sub_0808BBE0 sub_0808BBE0: @ 0x0808BBE0 @@ -283,7 +283,7 @@ _0808BD34: ldrb r0, [r0] cmp r0, #0x93 bne _0808BD74 - ldr r4, _0808BD70 @ =gLinkEntity + ldr r4, _0808BD70 @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 bl GetFacingDirection @@ -304,7 +304,7 @@ _0808BD34: bl sub_0808BD00 b _0808BDAE .align 2, 0 -_0808BD70: .4byte gLinkEntity +_0808BD70: .4byte gPlayerEntity _0808BD74: ldrb r1, [r5, #0x10] movs r0, #0x80 diff --git a/asm/object37.s b/asm/object37.s index dae8eb8b..1cbfc628 100644 --- a/asm/object37.s +++ b/asm/object37.s @@ -67,7 +67,7 @@ sub_0808BE2C: @ 0x0808BE2C adds r1, r0, #0 cmp r1, #0 beq _0808BE6C - ldr r0, _0808BE80 @ =gLinkEntity + ldr r0, _0808BE80 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsls r0, r0, #2 strb r0, [r1, #0x15] @@ -85,4 +85,4 @@ _0808BE74: .align 2, 0 _0808BE78: .4byte gUnk_02002A40 _0808BE7C: .4byte 0x0000024E -_0808BE80: .4byte gLinkEntity +_0808BE80: .4byte gPlayerEntity diff --git a/asm/object4.s b/asm/object4.s index f31f61f7..206d5222 100644 --- a/asm/object4.s +++ b/asm/object4.s @@ -57,7 +57,7 @@ sub_08082058: @ 0x08082058 sub_08082098: @ 0x08082098 push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r0, _08082100 @ =gLinkState + ldr r0, _08082100 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -65,7 +65,7 @@ sub_08082098: @ 0x08082098 bne _080820AC bl DeleteThisEntity _080820AC: - ldr r5, _08082104 @ =gLinkEntity + ldr r5, _08082104 @ =gPlayerEntity adds r0, r4, #0 bl sub_08079BD8 ldrb r1, [r4, #0x1b] @@ -106,8 +106,8 @@ _080820AC: beq _0808212A b _0808212E .align 2, 0 -_08082100: .4byte gLinkState -_08082104: .4byte gLinkEntity +_08082100: .4byte gPlayerState +_08082104: .4byte gPlayerEntity _08082108: cmp r0, #0x16 beq _08082112 @@ -142,7 +142,7 @@ _0808212E: adds r3, #8 b _080821EE _0808213E: - ldr r2, _0808215C @ =gLinkState + ldr r2, _0808215C @ =gPlayerState ldrb r1, [r2, #2] adds r6, r1, #0 cmp r6, #0 @@ -157,7 +157,7 @@ _0808213E: adds r3, #0x19 b _080821F2 .align 2, 0 -_0808215C: .4byte gLinkState +_0808215C: .4byte gPlayerState _08082160: adds r0, r2, #0 adds r0, #0xa8 diff --git a/asm/object42.s b/asm/object42.s index e56c0e75..eef40f49 100644 --- a/asm/object42.s +++ b/asm/object42.s @@ -86,7 +86,7 @@ _0808DE04: ldrb r0, [r5, #0xf] cmp r0, #0x1e bhi _0808DE1C - ldr r0, _0808DE8C @ =gLinkState + ldr r0, _0808DE8C @ =gPlayerState ldr r0, [r0, #0x30] ldr r1, _0808DE90 @ =0x00001810 ands r0, r1 @@ -96,14 +96,14 @@ _0808DE04: cmp r0, #0 bne _0808DE2A _0808DE1C: - ldr r0, _0808DE8C @ =gLinkState + ldr r0, _0808DE8C @ =gPlayerState ldr r1, [r0, #0x30] ldr r2, _0808DE94 @ =0xFFFFFBFF ands r1, r2 str r1, [r0, #0x30] bl DeleteThisEntity _0808DE2A: - ldr r3, _0808DE98 @ =gLinkEntity + ldr r3, _0808DE98 @ =gPlayerEntity ldr r1, _0808DE9C @ =gUnk_081217B8 ldrb r0, [r3, #0x14] lsrs r0, r0, #1 @@ -141,7 +141,7 @@ _0808DE2A: ands r1, r2 orrs r1, r0 strb r1, [r5, #0x1b] - ldr r0, _0808DE8C @ =gLinkState + ldr r0, _0808DE8C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #3 @@ -152,15 +152,15 @@ _0808DE2A: bl GetNextFrame b _0808DEA4 .align 2, 0 -_0808DE8C: .4byte gLinkState +_0808DE8C: .4byte gPlayerState _0808DE90: .4byte 0x00001810 _0808DE94: .4byte 0xFFFFFBFF -_0808DE98: .4byte gLinkEntity +_0808DE98: .4byte gPlayerEntity _0808DE9C: .4byte gUnk_081217B8 _0808DEA0: bl DeleteThisEntity _0808DEA4: - ldr r1, _0808DEC0 @ =gLinkEntity + ldr r1, _0808DEC0 @ =gPlayerEntity ldrb r0, [r1, #0x14] lsrs r0, r0, #1 cmp r0, #2 @@ -174,7 +174,7 @@ _0808DEA4: strh r0, [r5, #0x32] b _0808DECE .align 2, 0 -_0808DEC0: .4byte gLinkEntity +_0808DEC0: .4byte gPlayerEntity _0808DEC4: adds r0, r1, #0 movs r1, #0 diff --git a/asm/object43.s b/asm/object43.s index 57064728..a8cfb2a0 100644 --- a/asm/object43.s +++ b/asm/object43.s @@ -38,7 +38,7 @@ sub_0808DEE8: @ 0x0808DEE8 rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - ldr r3, _0808DF74 @ =gLinkEntity + ldr r3, _0808DF74 @ =gPlayerEntity ldrb r1, [r3, #0x1b] lsrs r1, r1, #6 lsls r1, r1, #6 @@ -92,7 +92,7 @@ sub_0808DEE8: @ 0x0808DEE8 strb r0, [r5, #0xe] b _0808DFAA .align 2, 0 -_0808DF74: .4byte gLinkEntity +_0808DF74: .4byte gPlayerEntity _0808DF78: ldrb r1, [r5, #0x18] movs r0, #4 @@ -101,7 +101,7 @@ _0808DF78: movs r1, #1 orrs r0, r1 strb r0, [r5, #0x18] - ldr r0, _0808DF9C @ =gLinkState + ldr r0, _0808DF9C @ =gPlayerState adds r0, #0xac ldrh r1, [r0] movs r0, #0x80 @@ -112,7 +112,7 @@ _0808DF78: movs r0, #0x28 b _0808DFA2 .align 2, 0 -_0808DF9C: .4byte gLinkState +_0808DF9C: .4byte gPlayerState _0808DFA0: movs r0, #0x50 _0808DFA2: @@ -129,7 +129,7 @@ sub_0808DFAC: @ 0x0808DFAC ldrb r0, [r4, #0xb] cmp r0, #0 beq _0808E00E - ldr r1, _0808DFF0 @ =gLinkState + ldr r1, _0808DFF0 @ =gPlayerState adds r0, r1, #0 adds r0, #0x21 ldrb r0, [r0] @@ -143,7 +143,7 @@ sub_0808DFAC: @ 0x0808DFAC _0808DFCC: bl DeleteThisEntity _0808DFD0: - ldr r0, _0808DFF0 @ =gLinkState + ldr r0, _0808DFF0 @ =gPlayerState adds r2, r0, #0 adds r2, #0x21 ldrb r0, [r2] @@ -160,7 +160,7 @@ _0808DFD0: ldr r7, _0808DFF4 @ =gUnk_081217D8 b _0808E038 .align 2, 0 -_0808DFF0: .4byte gLinkState +_0808DFF0: .4byte gPlayerState _0808DFF4: .4byte gUnk_081217D8 _0808DFF8: cmp r0, #0 @@ -175,7 +175,7 @@ _0808E008: bl DeleteThisEntity b _0808E038 _0808E00E: - ldr r5, _0808E02C @ =gLinkState + ldr r5, _0808E02C @ =gPlayerState ldrb r0, [r5, #4] cmp r0, #0 bne _0808E01A @@ -190,7 +190,7 @@ _0808E01A: ldr r7, _0808E030 @ =gUnk_081217D0 b _0808E038 .align 2, 0 -_0808E02C: .4byte gLinkState +_0808E02C: .4byte gPlayerState _0808E030: .4byte gUnk_081217D0 _0808E034: bl DeleteThisEntity @@ -210,7 +210,7 @@ _0808E03E: ldrb r0, [r4, #0xb] cmp r0, #0 bne _0808E068 - ldr r0, _0808E080 @ =gLinkState + ldr r0, _0808E080 @ =gPlayerState adds r0, #0xac ldrh r1, [r0] movs r0, #0x80 @@ -233,7 +233,7 @@ _0808E068: strh r0, [r5] b _0808E0E4 .align 2, 0 -_0808E080: .4byte gLinkState +_0808E080: .4byte gPlayerState _0808E084: adds r5, r4, #0 adds r5, #0x72 @@ -282,7 +282,7 @@ _0808E0DA: adds r5, r4, #0 adds r5, #0x6c _0808E0E4: - ldr r2, _0808E144 @ =gLinkEntity + ldr r2, _0808E144 @ =gPlayerEntity ldrb r1, [r2, #0x19] lsrs r1, r1, #6 lsls r1, r1, #6 @@ -331,7 +331,7 @@ _0808E136: b _0808E162 .align 2, 0 _0808E140: .4byte 0x00000115 -_0808E144: .4byte gLinkEntity +_0808E144: .4byte gPlayerEntity _0808E148: ldrh r0, [r5] ldrh r1, [r4, #0x2e] @@ -368,7 +368,7 @@ _0808E17A: ldrb r0, [r4, #0xb] cmp r0, #0 bne _0808E1BA - ldr r0, _0808E1AC @ =gLinkState + ldr r0, _0808E1AC @ =gPlayerState ldrb r1, [r0, #0x1b] movs r0, #0x40 ands r0, r1 @@ -387,7 +387,7 @@ _0808E17A: strb r0, [r4, #0xc] b _0808E1BA .align 2, 0 -_0808E1AC: .4byte gLinkState +_0808E1AC: .4byte gPlayerState _0808E1B0: bl DeleteThisEntity b _0808E1BA @@ -412,7 +412,7 @@ sub_0808E1BC: @ 0x0808E1BC movs r1, #1 orrs r0, r1 strb r0, [r4, #0x18] - ldr r0, _0808E204 @ =gLinkEntity + ldr r0, _0808E204 @ =gPlayerEntity ldrb r0, [r0, #0x14] strb r0, [r4, #0x14] adds r0, r4, #0 @@ -433,7 +433,7 @@ sub_0808E1BC: @ 0x0808E1BC bl InitializeAnimation pop {r4, pc} .align 2, 0 -_0808E204: .4byte gLinkEntity +_0808E204: .4byte gPlayerEntity thumb_func_start sub_0808E208 sub_0808E208: @ 0x0808E208 @@ -442,7 +442,7 @@ sub_0808E208: @ 0x0808E208 bl sub_08079BD8 adds r0, r4, #0 bl GetNextFrame - ldr r0, _0808E240 @ =gLinkState + ldr r0, _0808E240 @ =gPlayerState ldrb r0, [r0, #0x1b] cmp r0, #0 beq _0808E248 @@ -463,7 +463,7 @@ sub_0808E208: @ 0x0808E208 strb r0, [r4, #0x1a] b _0808E24C .align 2, 0 -_0808E240: .4byte gLinkState +_0808E240: .4byte gPlayerState _0808E244: .4byte gScreenTransition _0808E248: bl DeleteThisEntity diff --git a/asm/object5A.s b/asm/object5A.s index 9a35cf11..9bc22d68 100644 --- a/asm/object5A.s +++ b/asm/object5A.s @@ -179,7 +179,7 @@ sub_08092850: @ 0x08092850 ldrb r0, [r2, #0xa] cmp r0, #0 bne _08092888 - ldr r3, _08092878 @ =gLinkEntity + ldr r3, _08092878 @ =gPlayerEntity movs r0, #0x32 ldrsh r1, [r3, r0] movs r4, #0x32 @@ -196,7 +196,7 @@ _0809286E: movs r0, #0x40 b _08092884 .align 2, 0 -_08092878: .4byte gLinkEntity +_08092878: .4byte gPlayerEntity _0809287C: ldrb r0, [r2, #0x19] movs r1, #0x3f diff --git a/asm/object6.s b/asm/object6.s index ca837853..35e27958 100644 --- a/asm/object6.s +++ b/asm/object6.s @@ -60,7 +60,7 @@ sub_0808292C: @ 0x0808292C movs r1, #6 orrs r0, r1 strb r0, [r4, #0x11] - ldr r5, _080829C8 @ =gLinkEntity + ldr r5, _080829C8 @ =gPlayerEntity ldrb r1, [r5, #0x19] lsrs r1, r1, #6 lsls r1, r1, #6 @@ -127,7 +127,7 @@ _080829A4: bl PlaySFX b _080829E2 .align 2, 0 -_080829C8: .4byte gLinkEntity +_080829C8: .4byte gPlayerEntity _080829CC: movs r0, #0 strb r0, [r4, #0xe] @@ -146,7 +146,7 @@ _080829E2: sub_080829E4: @ 0x080829E4 push {r4, r5, lr} adds r5, r0, #0 - ldr r0, _08082A10 @ =gLinkEntity + ldr r0, _08082A10 @ =gPlayerEntity ldrb r1, [r0, #0x1a] lsls r1, r1, #0x1c lsrs r1, r1, #0x1c @@ -166,7 +166,7 @@ sub_080829E4: @ 0x080829E4 bl DeleteEntity b _08082AB4 .align 2, 0 -_08082A10: .4byte gLinkEntity +_08082A10: .4byte gPlayerEntity _08082A14: .4byte gTextBox _08082A18: cmp r1, #5 @@ -256,7 +256,7 @@ _08082AB4: sub_08082AB8: @ 0x08082AB8 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08082B10 @ =gLinkState + ldr r0, _08082B10 @ =gPlayerState ldr r0, [r0, #0x30] movs r5, #0x80 ands r0, r5 @@ -297,7 +297,7 @@ _08082ACC: str r1, [r4, #0x50] b _08082B18 .align 2, 0 -_08082B10: .4byte gLinkState +_08082B10: .4byte gPlayerState _08082B14: ldr r0, [r4, #0x50] str r0, [r1, #0x50] @@ -379,7 +379,7 @@ sub_08082B9C: @ 0x08082B9C movs r1, #2 orrs r0, r1 strb r0, [r6, #0x11] - ldr r5, _08082C34 @ =gLinkEntity + ldr r5, _08082C34 @ =gPlayerEntity ldrb r0, [r5, #0x1a] lsls r0, r0, #0x1c lsrs r0, r0, #0x1c @@ -442,7 +442,7 @@ _08082C2C: bl sub_08082C5C pop {r4, r5, r6, pc} .align 2, 0 -_08082C34: .4byte gLinkEntity +_08082C34: .4byte gPlayerEntity thumb_func_start sub_08082C38 sub_08082C38: @ 0x08082C38 diff --git a/asm/object61.s b/asm/object61.s index d68b2a69..48b66188 100644 --- a/asm/object61.s +++ b/asm/object61.s @@ -11,7 +11,7 @@ Object61: @ 0x08093428 push {r4, lr} adds r4, r0, #0 - ldr r0, _0809345C @ =gLinkState + ldr r0, _0809345C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 lsls r1, r1, #0x11 @@ -22,7 +22,7 @@ Object61: @ 0x08093428 cmp r0, #0 bne _08093446 ldr r1, _08093460 @ =gRoomControls - ldr r0, _08093464 @ =gLinkEntity + ldr r0, _08093464 @ =gPlayerEntity str r0, [r1, #0x30] _08093446: bl DeleteThisEntity @@ -36,9 +36,9 @@ _0809344A: bl _call_via_r1 pop {r4, pc} .align 2, 0 -_0809345C: .4byte gLinkState +_0809345C: .4byte gPlayerState _08093460: .4byte gRoomControls -_08093464: .4byte gLinkEntity +_08093464: .4byte gPlayerEntity _08093468: .4byte gUnk_081228C8 thumb_func_start sub_0809346C @@ -49,7 +49,7 @@ sub_0809346C: @ 0x0809346C strb r0, [r4, #0xc] movs r0, #0xff strb r0, [r4, #0x1f] - ldr r0, _080934C0 @ =gLinkEntity + ldr r0, _080934C0 @ =gPlayerEntity ldrb r1, [r0, #0x1a] lsls r1, r1, #0x1c lsrs r1, r1, #0x1c @@ -85,7 +85,7 @@ _080934B8: bl sub_080934C8 pop {r4, pc} .align 2, 0 -_080934C0: .4byte gLinkEntity +_080934C0: .4byte gPlayerEntity _080934C4: .4byte gRoomControls thumb_func_start sub_080934C8 @@ -115,7 +115,7 @@ sub_080934E0: @ 0x080934E0 rsbs r0, r1, #0 strh r0, [r4] _080934F6: - ldr r0, _08093518 @ =gLinkEntity + ldr r0, _08093518 @ =gPlayerEntity ldrb r0, [r0, #0xd] cmp r0, #2 beq _0809351C @@ -132,7 +132,7 @@ _080934F6: adds r7, r1, #0 b _080935BE .align 2, 0 -_08093518: .4byte gLinkEntity +_08093518: .4byte gPlayerEntity _0809351C: ldrb r2, [r5, #0xf] adds r0, r2, #0 @@ -222,7 +222,7 @@ _080935BA: adds r7, r5, #0 adds r7, #0x72 _080935BE: - ldr r0, _080935E4 @ =gLinkEntity + ldr r0, _080935E4 @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r0, #2 ands r0, r1 @@ -241,7 +241,7 @@ _080935BE: strh r0, [r6] b _080935EA .align 2, 0 -_080935E4: .4byte gLinkEntity +_080935E4: .4byte gPlayerEntity _080935E8: strb r0, [r5, #0x1e] _080935EA: @@ -255,7 +255,7 @@ _080935EA: adds r0, r5, #0 bl sub_080042D0 _080935FE: - ldr r4, _0809364C @ =gLinkEntity + ldr r4, _0809364C @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 bl CopyPosition @@ -291,13 +291,13 @@ _080935FE: bl sub_0806FEBC pop {r4, r5, r6, r7, pc} .align 2, 0 -_0809364C: .4byte gLinkEntity +_0809364C: .4byte gPlayerEntity thumb_func_start sub_08093650 sub_08093650: @ 0x08093650 push {r4, r5, lr} adds r4, r0, #0 - ldr r5, _080936C4 @ =gLinkEntity + ldr r5, _080936C4 @ =gPlayerEntity ldrb r0, [r5, #0x15] lsrs r1, r0, #1 adds r0, r0, r1 @@ -350,13 +350,13 @@ _08093674: bl sub_0806FEBC pop {r4, r5, pc} .align 2, 0 -_080936C4: .4byte gLinkEntity +_080936C4: .4byte gPlayerEntity thumb_func_start sub_080936C8 sub_080936C8: @ 0x080936C8 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08093714 @ =gLinkEntity + ldr r0, _08093714 @ =gPlayerEntity ldr r0, [r0, #0x7c] lsrs r2, r0, #2 movs r3, #0x9c @@ -391,7 +391,7 @@ sub_080936C8: @ 0x080936C8 strh r0, [r1] b _0809375C .align 2, 0 -_08093714: .4byte gLinkEntity +_08093714: .4byte gPlayerEntity _08093718: adds r0, r3, #1 strb r0, [r4, #0xe] diff --git a/asm/object64.s b/asm/object64.s index 26fe67f0..d6abbcb9 100644 --- a/asm/object64.s +++ b/asm/object64.s @@ -187,7 +187,7 @@ _08093F72: cmp r0, #0 beq _08093FB0 ldr r1, [r5, #0x50] - ldr r0, _08093F94 @ =gLinkEntity + ldr r0, _08093F94 @ =gPlayerEntity cmp r1, r0 bne _08093F8E movs r0, #0x7a @@ -197,7 +197,7 @@ _08093F8E: bl DeleteThisEntity b _08093FB0 .align 2, 0 -_08093F94: .4byte gLinkEntity +_08093F94: .4byte gPlayerEntity _08093F98: adds r0, r5, #0 bl GetNextFrame diff --git a/asm/object67.s b/asm/object67.s index 30131c09..6f1acd48 100644 --- a/asm/object67.s +++ b/asm/object67.s @@ -61,7 +61,7 @@ _08094180: cmp r0, r1 bne _08094198 ldr r1, _080941A0 @ =gRoomControls - ldr r0, _080941A4 @ =gLinkEntity + ldr r0, _080941A4 @ =gPlayerEntity str r0, [r1, #0x30] bl DeleteThisEntity _08094198: @@ -69,7 +69,7 @@ _08094198: b _08094394 .align 2, 0 _080941A0: .4byte gRoomControls -_080941A4: .4byte gLinkEntity +_080941A4: .4byte gPlayerEntity _080941A8: ldr r1, _08094228 @ =gUnk_081229D0 ldrb r0, [r4, #0xb] diff --git a/asm/object68.s b/asm/object68.s index dbd14919..795b73d1 100644 --- a/asm/object68.s +++ b/asm/object68.s @@ -57,7 +57,7 @@ _080947B8: str r6, [r5, #0x54] cmp r6, #0 beq _080947EE - ldr r0, _0809480C @ =gLinkEntity + ldr r0, _0809480C @ =gPlayerEntity ldr r4, _08094810 @ =gUnk_08122A18 ldrb r3, [r0, #0x14] movs r1, #6 @@ -88,7 +88,7 @@ _080947EE: bl sub_08094980 b _080948C6 .align 2, 0 -_0809480C: .4byte gLinkEntity +_0809480C: .4byte gPlayerEntity _08094810: .4byte gUnk_08122A18 _08094814: .4byte 0x00004032 _08094818: .4byte 0x00004033 @@ -103,7 +103,7 @@ _08094824: str r6, [r5, #0x54] cmp r6, #0 beq _0809485A - ldr r0, _08094898 @ =gLinkEntity + ldr r0, _08094898 @ =gPlayerEntity ldr r4, _0809489C @ =gUnk_08122A18 ldrb r3, [r0, #0x14] movs r1, #6 @@ -149,14 +149,14 @@ _0809485A: bl sub_08094980 b _080948CA .align 2, 0 -_08094898: .4byte gLinkEntity +_08094898: .4byte gPlayerEntity _0809489C: .4byte gUnk_08122A18 _080948A0: .4byte 0x0000403B _080948A4: .4byte 0x0000403C _080948A8: .4byte 0x00004061 _080948AC: .4byte 0x00004022 _080948B0: - ldr r0, _080948CC @ =gLinkEntity + ldr r0, _080948CC @ =gPlayerEntity movs r1, #0x60 movs r2, #0 bl sub_080A2A20 @@ -171,7 +171,7 @@ _080948C6: _080948CA: pop {r4, r5, r6, pc} .align 2, 0 -_080948CC: .4byte gLinkEntity +_080948CC: .4byte gPlayerEntity thumb_func_start sub_080948D0 sub_080948D0: @ 0x080948D0 diff --git a/asm/object6A.s b/asm/object6A.s index 92e359c4..938eb239 100644 --- a/asm/object6A.s +++ b/asm/object6A.s @@ -199,7 +199,7 @@ sub_08094B94: @ 0x08094B94 adds r4, r0, #0 cmp r4, #0 beq _08094BD2 - ldr r0, _08094BD4 @ =gLinkEntity + ldr r0, _08094BD4 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition ldr r0, _08094BD8 @ =0x0000FFD0 @@ -221,7 +221,7 @@ sub_08094B94: @ 0x08094B94 _08094BD2: pop {r4, pc} .align 2, 0 -_08094BD4: .4byte gLinkEntity +_08094BD4: .4byte gPlayerEntity _08094BD8: .4byte 0x0000FFD0 _08094BDC: .4byte gUnk_0800AEDC @@ -239,7 +239,7 @@ sub_08094BE0: @ 0x08094BE0 adds r4, r0, #0 cmp r4, #0 beq _08094C22 - ldr r0, _08094C28 @ =gLinkEntity + ldr r0, _08094C28 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition ldr r0, _08094C2C @ =0x0000FFF4 @@ -260,7 +260,7 @@ _08094C22: add sp, #4 pop {r4, pc} .align 2, 0 -_08094C28: .4byte gLinkEntity +_08094C28: .4byte gPlayerEntity _08094C2C: .4byte 0x0000FFF4 thumb_func_start sub_08094C30 @@ -773,7 +773,7 @@ _08094FF0: strb r0, [r4, #0xc] adds r0, r4, #0 bl sub_080788E0 - ldr r0, _08095020 @ =gLinkState + ldr r0, _08095020 @ =gPlayerState movs r1, #0xc strb r1, [r0, #0xc] adds r0, #0x38 @@ -783,7 +783,7 @@ _08094FF0: bl sub_08078A90 b _08095086 .align 2, 0 -_08095020: .4byte gLinkState +_08095020: .4byte gPlayerState _08095024: movs r0, #0x36 bl GetInventoryValue @@ -799,7 +799,7 @@ _08095024: strb r0, [r4, #0x18] b _08095086 _08095040: - ldr r0, _0809506C @ =gLinkEntity + ldr r0, _0809506C @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0xc beq _08095086 @@ -819,7 +819,7 @@ _08095040: strb r0, [r4, #0xe] b _08095086 .align 2, 0 -_0809506C: .4byte gLinkEntity +_0809506C: .4byte gPlayerEntity _08095070: ldrb r0, [r4, #0xe] subs r0, #1 @@ -2503,7 +2503,7 @@ sub_08095D54: @ 0x08095D54 adds r4, r0, #0 cmp r4, #0 beq _08095D86 - ldr r0, _08095D88 @ =gLinkEntity + ldr r0, _08095D88 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition adds r1, r4, #0 @@ -2519,7 +2519,7 @@ sub_08095D54: @ 0x08095D54 _08095D86: pop {r4, r5, pc} .align 2, 0 -_08095D88: .4byte gLinkEntity +_08095D88: .4byte gPlayerEntity thumb_func_start sub_08095D8C sub_08095D8C: @ 0x08095D8C @@ -2771,7 +2771,7 @@ _08095F68: _08095F6A: adds r0, r4, #0 bl sub_0801D2B4 - ldr r0, _08095F90 @ =gLinkEntity + ldr r0, _08095F90 @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] movs r0, #1 @@ -2787,7 +2787,7 @@ _08095F6A: movs r0, #0xb5 b _08095FA6 .align 2, 0 -_08095F90: .4byte gLinkEntity +_08095F90: .4byte gPlayerEntity _08095F94: .4byte 0x000008BF _08095F98: adds r1, r4, #0 @@ -2799,7 +2799,7 @@ _08095F98: movs r0, #0xd6 _08095FA6: strb r0, [r4, #0xf] - ldr r0, _08096024 @ =gLinkEntity + ldr r0, _08096024 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition adds r2, r4, #0 @@ -2812,7 +2812,7 @@ _08095FA6: orrs r0, r1 strb r0, [r2] _08095FC2: - ldr r5, _08096024 @ =gLinkEntity + ldr r5, _08096024 @ =gPlayerEntity adds r2, r5, #0 adds r2, #0x5a ldrb r1, [r2] @@ -2844,7 +2844,7 @@ _08095FE0: _08095FFC: bl DeleteThisEntity _08096000: - ldr r0, _08096024 @ =gLinkEntity + ldr r0, _08096024 @ =gPlayerEntity ldrb r0, [r0, #0x1e] ldrb r1, [r4, #0xe] subs r0, r0, r1 @@ -2862,7 +2862,7 @@ _0809601E: pop {r4, r5, pc} .align 2, 0 _08096020: .4byte 0x000008E3 -_08096024: .4byte gLinkEntity +_08096024: .4byte gPlayerEntity thumb_func_start sub_08096028 sub_08096028: @ 0x08096028 diff --git a/asm/object70.s b/asm/object70.s index 6d4536c1..d391dc75 100644 --- a/asm/object70.s +++ b/asm/object70.s @@ -41,7 +41,7 @@ sub_08097438: @ 0x08097438 beq _080974A2 adds r0, r4, #0 bl sub_08004168 - ldr r1, _08097494 @ =gLinkEntity + ldr r1, _08097494 @ =gPlayerEntity ldrb r0, [r1, #0x1b] movs r2, #0xc0 orrs r0, r2 @@ -67,7 +67,7 @@ sub_08097438: @ 0x08097438 strb r0, [r3] b _080974A2 .align 2, 0 -_08097494: .4byte gLinkEntity +_08097494: .4byte gPlayerEntity _08097498: adds r1, r4, #0 adds r1, #0x29 @@ -84,11 +84,11 @@ sub_080974A4: @ 0x080974A4 ldrb r0, [r4, #0xa] cmp r0, #0 bne _08097554 - ldr r3, _08097540 @ =gLinkEntity + ldr r3, _08097540 @ =gPlayerEntity ldr r0, [r3, #0x34] cmp r0, #0 bne _080974E8 - ldr r2, _08097544 @ =gLinkState + ldr r2, _08097544 @ =gPlayerState ldrb r1, [r2, #0x1e] movs r0, #0x40 ands r0, r1 @@ -105,7 +105,7 @@ sub_080974A4: @ 0x080974A4 cmp r0, #4 beq _080974FA _080974D6: - ldr r1, _08097540 @ =gLinkEntity + ldr r1, _08097540 @ =gPlayerEntity ldr r0, [r1, #0x34] cmp r0, #0 bne _080974E8 @@ -114,7 +114,7 @@ _080974D6: movs r2, #0 bl CreateFx _080974E8: - ldr r2, _08097540 @ =gLinkEntity + ldr r2, _08097540 @ =gPlayerEntity ldrb r1, [r2, #0x1b] movs r0, #0x3f ands r0, r1 @@ -123,12 +123,12 @@ _080974E8: strb r0, [r2, #0x1b] bl DeleteThisEntity _080974FA: - ldr r2, _08097540 @ =gLinkEntity + ldr r2, _08097540 @ =gPlayerEntity ldr r0, [r2, #0x2c] str r0, [r4, #0x2c] ldr r0, [r2, #0x30] str r0, [r4, #0x30] - ldr r0, _08097544 @ =gLinkState + ldr r0, _08097544 @ =gPlayerState ldrb r0, [r0, #2] cmp r0, #0 bne _08097584 @@ -158,8 +158,8 @@ _080974FA: strb r0, [r3] b _08097584 .align 2, 0 -_08097540: .4byte gLinkEntity -_08097544: .4byte gLinkState +_08097540: .4byte gPlayerEntity +_08097544: .4byte gPlayerState _08097548: adds r1, r4, #0 adds r1, #0x29 @@ -168,7 +168,7 @@ _08097548: strb r0, [r1] b _08097584 _08097554: - ldr r2, _08097570 @ =gLinkEntity + ldr r2, _08097570 @ =gPlayerEntity ldrb r0, [r2, #0xc] cmp r0, #0x1e beq _08097584 @@ -183,7 +183,7 @@ _08097554: movs r0, #0x80 b _0809757C .align 2, 0 -_08097570: .4byte gLinkEntity +_08097570: .4byte gPlayerEntity _08097574: ldrb r0, [r2, #0x1b] movs r1, #0x3f diff --git a/asm/object79.s b/asm/object79.s index a01bb979..4906d890 100644 --- a/asm/object79.s +++ b/asm/object79.s @@ -11,7 +11,7 @@ Object79: @ 0x08097F84 push {r4, lr} adds r4, r0, #0 - ldr r0, _08097FAC @ =gLinkState + ldr r0, _08097FAC @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -28,7 +28,7 @@ _08097F98: bl _call_via_r1 pop {r4, pc} .align 2, 0 -_08097FAC: .4byte gLinkState +_08097FAC: .4byte gPlayerState _08097FB0: .4byte gUnk_08123410 thumb_func_start sub_08097FB4 @@ -111,7 +111,7 @@ sub_0809803C: @ 0x0809803C ldrb r0, [r4, #0xb] cmp r0, #0 beq _08098082 - ldr r0, _0809806C @ =gLinkEntity + ldr r0, _0809806C @ =gPlayerEntity strb r5, [r0, #0xf] ldrb r0, [r4, #0xc] adds r0, #1 @@ -124,7 +124,7 @@ sub_0809803C: @ 0x0809803C bl PlaySFX b _08098082 .align 2, 0 -_0809806C: .4byte gLinkEntity +_0809806C: .4byte gPlayerEntity _08098070: ldr r2, [r4, #0x50] ldrb r1, [r4, #0xa] @@ -147,7 +147,7 @@ sub_08098084: @ 0x08098084 lsls r0, r0, #0xd cmp r1, r0 bls _080980A8 - ldr r0, _080980A4 @ =gLinkState + ldr r0, _080980A4 @ =gPlayerState ldr r1, [r0, #0x30] movs r2, #0x80 orrs r1, r2 @@ -155,7 +155,7 @@ sub_08098084: @ 0x08098084 bl DeleteThisEntity b _0809812E .align 2, 0 -_080980A4: .4byte gLinkState +_080980A4: .4byte gPlayerState _080980A8: ldrb r0, [r4, #0xa] cmp r0, #0 @@ -231,7 +231,7 @@ _0809812E: sub_08098130: @ 0x08098130 push {r4, lr} adds r4, r0, #0 - ldr r0, _08098160 @ =gLinkEntity + ldr r0, _08098160 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition adds r0, r4, #0 @@ -252,5 +252,5 @@ sub_08098130: @ 0x08098130 str r0, [r4, #0x30] pop {r4, pc} .align 2, 0 -_08098160: .4byte gLinkEntity +_08098160: .4byte gPlayerEntity _08098164: .4byte 0xFFEC0000 diff --git a/asm/object80.s b/asm/object80.s index 14d17bd5..1b158d68 100644 --- a/asm/object80.s +++ b/asm/object80.s @@ -120,13 +120,13 @@ sub_08098BE0: @ 0x08098BE0 sub_08098BE8: @ 0x08098BE8 push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r6, _08098C28 @ =gLinkState + ldr r6, _08098C28 @ =gPlayerState ldr r0, [r6, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 beq _08098C26 - ldr r4, _08098C2C @ =gLinkEntity + ldr r4, _08098C2C @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 bl sub_08098C30 @@ -149,8 +149,8 @@ sub_08098BE8: @ 0x08098BE8 _08098C26: pop {r4, r5, r6, pc} .align 2, 0 -_08098C28: .4byte gLinkState -_08098C2C: .4byte gLinkEntity +_08098C28: .4byte gPlayerState +_08098C2C: .4byte gPlayerEntity thumb_func_start sub_08098C30 sub_08098C30: @ 0x08098C30 diff --git a/asm/object81.s b/asm/object81.s index 97108ec1..a057e7d1 100644 --- a/asm/object81.s +++ b/asm/object81.s @@ -47,7 +47,7 @@ sub_08098C80: @ 0x08098C80 adds r0, r4, #0 adds r0, #0x80 strh r1, [r0] - ldr r0, _08098CCC @ =gLinkState + ldr r0, _08098CCC @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -60,7 +60,7 @@ sub_08098C80: @ 0x08098C80 b _08098CD6 .align 2, 0 _08098CC8: .4byte gRoomControls -_08098CCC: .4byte gLinkState +_08098CCC: .4byte gPlayerState _08098CD0: adds r0, r4, #0 adds r0, #0x38 diff --git a/asm/object87.s b/asm/object87.s index 0cd40793..d90353d1 100644 --- a/asm/object87.s +++ b/asm/object87.s @@ -912,7 +912,7 @@ _0809A616: cmp r0, r1 bne _0809A632 ldr r1, _0809A640 @ =gRoomControls - ldr r0, _0809A644 @ =gLinkEntity + ldr r0, _0809A644 @ =gPlayerEntity str r0, [r1, #0x30] bl DeleteThisEntity _0809A632: @@ -924,7 +924,7 @@ _0809A632: pop {r4, r5, r6, r7, pc} .align 2, 0 _0809A640: .4byte gRoomControls -_0809A644: .4byte gLinkEntity +_0809A644: .4byte gPlayerEntity thumb_func_start sub_0809A648 sub_0809A648: @ 0x0809A648 diff --git a/asm/object89.s b/asm/object89.s index 0e67239c..5e3c18a6 100644 --- a/asm/object89.s +++ b/asm/object89.s @@ -330,9 +330,9 @@ _0809AD3A: cmp r0, #0 bne _0809AD58 ldr r1, _0809AD5C @ =gRoomControls - ldr r0, _0809AD60 @ =gLinkEntity + ldr r0, _0809AD60 @ =gPlayerEntity str r0, [r1, #0x30] - ldr r0, _0809AD64 @ =gLinkState + ldr r0, _0809AD64 @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] @@ -341,8 +341,8 @@ _0809AD58: pop {r4, pc} .align 2, 0 _0809AD5C: .4byte gRoomControls -_0809AD60: .4byte gLinkEntity -_0809AD64: .4byte gLinkState +_0809AD60: .4byte gPlayerEntity +_0809AD64: .4byte gPlayerState thumb_func_start sub_0809AD68 sub_0809AD68: @ 0x0809AD68 diff --git a/asm/object8B.s b/asm/object8B.s index a81bd48e..5f7a52d7 100644 --- a/asm/object8B.s +++ b/asm/object8B.s @@ -394,7 +394,7 @@ _0809B270: sub_0809B274: @ 0x0809B274 push {r4, r5, lr} adds r4, r0, #0 - ldr r3, _0809B290 @ =gLinkEntity + ldr r3, _0809B290 @ =gPlayerEntity adds r2, r4, #0 adds r2, #0x84 ldrb r0, [r2] @@ -406,7 +406,7 @@ sub_0809B274: @ 0x0809B274 beq _0809B29A b _0809B332 .align 2, 0 -_0809B290: .4byte gLinkEntity +_0809B290: .4byte gPlayerEntity _0809B294: cmp r0, #2 beq _0809B30C diff --git a/asm/object8E.s b/asm/object8E.s index 0ab1f65e..063c12a4 100644 --- a/asm/object8E.s +++ b/asm/object8E.s @@ -47,7 +47,7 @@ _0809B878: ldr r0, _0809B8BC @ =gRoomControls str r4, [r0, #0x30] strb r1, [r0, #0xe] - ldr r5, _0809B8C0 @ =gLinkEntity + ldr r5, _0809B8C0 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] movs r2, #0x2e @@ -76,7 +76,7 @@ _0809B89A: b _0809B972 .align 2, 0 _0809B8BC: .4byte gRoomControls -_0809B8C0: .4byte gLinkEntity +_0809B8C0: .4byte gPlayerEntity _0809B8C4: .4byte gScreen _0809B8C8: .4byte 0x0000BFFF _0809B8CC: @@ -126,7 +126,7 @@ _0809B914: ands r0, r1 strh r0, [r2] ldr r1, _0809B940 @ =gRoomControls - ldr r0, _0809B944 @ =gLinkEntity + ldr r0, _0809B944 @ =gPlayerEntity str r0, [r1, #0x30] movs r0, #0x9a lsls r0, r0, #1 @@ -136,7 +136,7 @@ _0809B914: _0809B938: .4byte gScreen _0809B93C: .4byte 0x0000DFFF _0809B940: .4byte gRoomControls -_0809B944: .4byte gLinkEntity +_0809B944: .4byte gPlayerEntity _0809B948: ldrb r0, [r4, #0xe] subs r0, #1 @@ -229,7 +229,7 @@ _0809B9DC: ldr r0, _0809BA24 @ =gRoomControls str r4, [r0, #0x30] strb r1, [r0, #0xe] - ldr r3, _0809BA28 @ =gLinkEntity + ldr r3, _0809BA28 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] movs r2, #0x2e @@ -259,7 +259,7 @@ _0809BA00: b _0809BAC2 .align 2, 0 _0809BA24: .4byte gRoomControls -_0809BA28: .4byte gLinkEntity +_0809BA28: .4byte gPlayerEntity _0809BA2C: .4byte gScreen _0809BA30: .4byte 0x0000BFFF _0809BA34: @@ -304,7 +304,7 @@ _0809BA7C: movs r0, #0x3c strb r0, [r4, #0xe] ldr r1, _0809BA94 @ =gRoomControls - ldr r0, _0809BA98 @ =gLinkEntity + ldr r0, _0809BA98 @ =gPlayerEntity str r0, [r1, #0x30] movs r0, #0x9a lsls r0, r0, #1 @@ -312,7 +312,7 @@ _0809BA7C: b _0809BAC2 .align 2, 0 _0809BA94: .4byte gRoomControls -_0809BA98: .4byte gLinkEntity +_0809BA98: .4byte gPlayerEntity _0809BA9C: ldrb r0, [r4, #0xe] subs r0, #1 @@ -375,7 +375,7 @@ _0809BB04: str r4, [r1, #0x30] movs r0, #1 strb r0, [r1, #0xe] - ldr r3, _0809BB44 @ =gLinkEntity + ldr r3, _0809BB44 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] movs r2, #0x2e @@ -397,7 +397,7 @@ _0809BB2C: b _0809BC68 .align 2, 0 _0809BB40: .4byte gRoomControls -_0809BB44: .4byte gLinkEntity +_0809BB44: .4byte gPlayerEntity _0809BB48: .4byte gScreen _0809BB4C: adds r0, r4, #0 @@ -513,14 +513,14 @@ _0809BC24: movs r0, #4 strb r0, [r4, #0xc] ldr r1, _0809BC40 @ =gRoomControls - ldr r0, _0809BC44 @ =gLinkEntity + ldr r0, _0809BC44 @ =gPlayerEntity str r0, [r1, #0x30] movs r0, #2 strb r0, [r1, #0xe] b _0809BC68 .align 2, 0 _0809BC40: .4byte gRoomControls -_0809BC44: .4byte gLinkEntity +_0809BC44: .4byte gPlayerEntity _0809BC48: adds r0, r4, #0 bl sub_0809BE78 @@ -569,7 +569,7 @@ _0809BC92: ldr r0, _0809BCCC @ =gRoomControls str r4, [r0, #0x30] strb r1, [r0, #0xe] - ldr r3, _0809BCD0 @ =gLinkEntity + ldr r3, _0809BCD0 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] movs r2, #0x2e @@ -593,7 +593,7 @@ _0809BCB4: b _0809BDAE .align 2, 0 _0809BCCC: .4byte gRoomControls -_0809BCD0: .4byte gLinkEntity +_0809BCD0: .4byte gPlayerEntity _0809BCD4: .4byte gScreen _0809BCD8: .4byte 0x000080F0 _0809BCDC: @@ -724,7 +724,7 @@ _0809BDD0: ldr r0, _0809BDF8 @ =gRoomControls str r4, [r0, #0x30] strb r1, [r0, #0xe] - ldr r3, _0809BDFC @ =gLinkEntity + ldr r3, _0809BDFC @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] movs r2, #0x2e @@ -738,7 +738,7 @@ _0809BDF4: b _0809BE70 .align 2, 0 _0809BDF8: .4byte gRoomControls -_0809BDFC: .4byte gLinkEntity +_0809BDFC: .4byte gPlayerEntity _0809BE00: ldrb r0, [r4, #0xe] cmp r0, #0 @@ -771,7 +771,7 @@ _0809BE34: movs r0, #0x3c strb r0, [r4, #0xe] ldr r1, _0809BE4C @ =gRoomControls - ldr r0, _0809BE50 @ =gLinkEntity + ldr r0, _0809BE50 @ =gPlayerEntity str r0, [r1, #0x30] movs r0, #0x9a lsls r0, r0, #1 @@ -779,7 +779,7 @@ _0809BE34: b _0809BE70 .align 2, 0 _0809BE4C: .4byte gRoomControls -_0809BE50: .4byte gLinkEntity +_0809BE50: .4byte gPlayerEntity _0809BE54: ldrb r0, [r4, #0xe] subs r0, #1 diff --git a/asm/object9.s b/asm/object9.s index d9c167c4..210c0dea 100644 --- a/asm/object9.s +++ b/asm/object9.s @@ -11,7 +11,7 @@ Object9: @ 0x0808386C push {r4, lr} adds r4, r0, #0 - ldr r0, _080838C8 @ =gLinkState + ldr r0, _080838C8 @ =gPlayerState adds r0, #0x27 ldrb r1, [r0] rsbs r0, r1, #0 @@ -57,7 +57,7 @@ _080838B6: bl _call_via_r1 pop {r4, pc} .align 2, 0 -_080838C8: .4byte gLinkState +_080838C8: .4byte gPlayerState _080838CC: .4byte gUnk_02022740 _080838D0: .4byte gTextBox _080838D4: .4byte gUnk_03003DF0 @@ -264,7 +264,7 @@ sub_08083A40: @ 0x08083A40 movs r0, #2 strb r0, [r4, #0xc] ldr r0, [r4, #0x54] - ldr r1, _08083A70 @ =gLinkEntity + ldr r1, _08083A70 @ =gPlayerEntity movs r3, #0x2e ldrsh r2, [r0, r3] movs r3, #0x2e @@ -277,7 +277,7 @@ sub_08083A40: @ 0x08083A40 movs r0, #8 b _08083A7C .align 2, 0 -_08083A70: .4byte gLinkEntity +_08083A70: .4byte gPlayerEntity _08083A74: movs r1, #1 adds r2, r4, #0 diff --git a/asm/object91.s b/asm/object91.s index e2e8dac9..faa013cd 100644 --- a/asm/object91.s +++ b/asm/object91.s @@ -945,7 +945,7 @@ sub_0809CAC8: @ 0x0809CAC8 bge _0809CB26 movs r0, #4 strb r0, [r2, #0xe] - ldr r0, _0809CB40 @ =gLinkEntity + ldr r0, _0809CB40 @ =gPlayerEntity str r0, [r2, #0x30] movs r0, #0x9b bl SetLocalFlag @@ -983,7 +983,7 @@ _0809CB38: pop {r4, r5, pc} .align 2, 0 _0809CB3C: .4byte gRoomControls -_0809CB40: .4byte gLinkEntity +_0809CB40: .4byte gPlayerEntity _0809CB44: .4byte gScreenTransition _0809CB48: .4byte 0x00000163 diff --git a/asm/object96.s b/asm/object96.s index be3b6f07..5bf36641 100644 --- a/asm/object96.s +++ b/asm/object96.s @@ -64,7 +64,7 @@ sub_0809D7A8: @ 0x0809D7A8 cmp r0, #0x81 bne _0809D80C bl Random - ldr r1, _0809D820 @ =gLinkEntity + ldr r1, _0809D820 @ =gPlayerEntity ldrb r1, [r1, #0x14] lsls r1, r1, #2 movs r2, #3 @@ -85,7 +85,7 @@ _0809D80C: strb r4, [r5, #0xa] pop {r4, r5, pc} .align 2, 0 -_0809D820: .4byte gLinkEntity +_0809D820: .4byte gPlayerEntity thumb_func_start sub_0809D824 sub_0809D824: @ 0x0809D824 @@ -144,7 +144,7 @@ _0809D888: ldrb r0, [r5, #0xc] adds r0, #1 strb r0, [r5, #0xc] - ldr r0, _0809D8C4 @ =gLinkEntity + ldr r0, _0809D8C4 @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] adds r0, r5, #0 @@ -169,14 +169,14 @@ _0809D8B2: strb r4, [r5, #0xa] pop {r4, r5, r6, pc} .align 2, 0 -_0809D8C4: .4byte gLinkEntity +_0809D8C4: .4byte gPlayerEntity thumb_func_start sub_0809D8C8 sub_0809D8C8: @ 0x0809D8C8 push {r4, r5, r6, lr} adds r5, r0, #0 adds r6, r1, #0 - ldr r0, _0809D8E4 @ =gLinkState + ldr r0, _0809D8E4 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -186,7 +186,7 @@ sub_0809D8C8: @ 0x0809D8C8 bl sub_0800445C b _0809D90A .align 2, 0 -_0809D8E4: .4byte gLinkState +_0809D8E4: .4byte gPlayerState _0809D8E8: adds r0, r5, #0 bl sub_08017850 @@ -234,7 +234,7 @@ sub_0809D93C: @ 0x0809D93C push {r4, r5, lr} adds r4, r0, #0 adds r3, r1, #0 - ldr r2, _0809D9A0 @ =gLinkEntity + ldr r2, _0809D9A0 @ =gPlayerEntity ldrb r0, [r2, #0xc] cmp r0, #6 bne _0809D9A4 @@ -281,7 +281,7 @@ sub_0809D93C: @ 0x0809D93C movs r0, #1 b _0809D9A6 .align 2, 0 -_0809D9A0: .4byte gLinkEntity +_0809D9A0: .4byte gPlayerEntity _0809D9A4: movs r0, #0 _0809D9A6: diff --git a/asm/object97.s b/asm/object97.s index 0582a23e..0e88f13d 100644 --- a/asm/object97.s +++ b/asm/object97.s @@ -350,7 +350,7 @@ _0809DC3C: ldrb r0, [r4, #0xc] adds r0, #1 strb r0, [r4, #0xc] - ldr r0, _0809DC64 @ =gLinkEntity + ldr r0, _0809DC64 @ =gPlayerEntity adds r0, #0x38 ldrb r1, [r0] adds r0, r4, #0 @@ -366,7 +366,7 @@ _0809DC5A: bl sub_0809DB88 pop {r4, pc} .align 2, 0 -_0809DC64: .4byte gLinkEntity +_0809DC64: .4byte gPlayerEntity thumb_func_start sub_0809DC68 sub_0809DC68: @ 0x0809DC68 @@ -923,7 +923,7 @@ sub_0809E0A0: @ 0x0809E0A0 str r4, [r5, #0x54] movs r0, #0 strb r0, [r5, #0xf] - ldr r0, _0809E0CC @ =gLinkEntity + ldr r0, _0809E0CC @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition ldr r0, _0809E0D0 @ =0x0000FFF8 @@ -931,7 +931,7 @@ sub_0809E0A0: @ 0x0809E0A0 _0809E0C8: pop {r4, r5, pc} .align 2, 0 -_0809E0CC: .4byte gLinkEntity +_0809E0CC: .4byte gPlayerEntity _0809E0D0: .4byte 0x0000FFF8 thumb_func_start sub_0809E0D4 @@ -956,7 +956,7 @@ sub_0809E0D4: @ 0x0809E0D4 .align 2, 0 _0809E0F8: .4byte gUnk_02033280 _0809E0FC: - ldr r1, _0809E124 @ =gLinkEntity + ldr r1, _0809E124 @ =gPlayerEntity _0809E0FE: ldrb r0, [r6, #0x18] adds r0, #1 @@ -975,7 +975,7 @@ _0809E0FE: strb r4, [r0, #6] b _0809E1BC .align 2, 0 -_0809E124: .4byte gLinkEntity +_0809E124: .4byte gPlayerEntity _0809E128: .4byte 0x00000123 _0809E12C: .4byte gUnk_02033280 _0809E130: @@ -1106,21 +1106,21 @@ _0809E208: sub_0809E210: @ 0x0809E210 push {r4, lr} adds r1, r0, #0 - ldr r4, _0809E230 @ =gLinkEntity + ldr r4, _0809E230 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5B0 movs r1, #0xfe ands r0, r1 strb r0, [r4, #0x14] - ldr r1, _0809E234 @ =gLinkState + ldr r1, _0809E234 @ =gPlayerState movs r0, #0x80 lsls r0, r0, #1 strh r0, [r1, #8] pop {r4, pc} .align 2, 0 -_0809E230: .4byte gLinkEntity -_0809E234: .4byte gLinkState +_0809E230: .4byte gPlayerEntity +_0809E234: .4byte gPlayerState thumb_func_start sub_0809E238 sub_0809E238: @ 0x0809E238 @@ -1204,7 +1204,7 @@ sub_0809E2C4: @ 0x0809E2C4 lsls r1, r1, #2 ldr r0, _0809E328 @ =gUnk_08124178 adds r1, r1, r0 - ldr r3, _0809E32C @ =gLinkEntity + ldr r3, _0809E32C @ =gPlayerEntity movs r0, #0x2e ldrsh r5, [r3, r0] ldr r4, _0809E330 @ =gRoomControls @@ -1253,7 +1253,7 @@ _0809E2EE: b _0809E346 .align 2, 0 _0809E328: .4byte gUnk_08124178 -_0809E32C: .4byte gLinkEntity +_0809E32C: .4byte gPlayerEntity _0809E330: .4byte gRoomControls _0809E334: .4byte gUnk_08124158 _0809E338: diff --git a/asm/objectA8.s b/asm/objectA8.s index 2cb3b745..c4c396a8 100644 --- a/asm/objectA8.s +++ b/asm/objectA8.s @@ -138,7 +138,7 @@ sub_0809FB90: @ 0x0809FB90 sub_0809FBA4: @ 0x0809FBA4 push {lr} adds r2, r0, #0 - ldr r0, _0809FBC8 @ =gLinkState + ldr r0, _0809FBC8 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -156,7 +156,7 @@ _0809FBC2: strb r0, [r2, #0xc] b _0809FBD2 .align 2, 0 -_0809FBC8: .4byte gLinkState +_0809FBC8: .4byte gPlayerState _0809FBCC: adds r0, r2, #0 bl sub_0806F4E8 @@ -167,7 +167,7 @@ _0809FBD2: sub_0809FBD4: @ 0x0809FBD4 push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _0809FBFC @ =gLinkState + ldr r0, _0809FBFC @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -186,7 +186,7 @@ _0809FBF4: strb r0, [r4, #0xc] b _0809FC22 .align 2, 0 -_0809FBFC: .4byte gLinkState +_0809FBFC: .4byte gPlayerState _0809FC00: adds r0, r4, #0 bl sub_0806F3E4 @@ -198,7 +198,7 @@ _0809FC00: strb r0, [r4, #0x10] movs r0, #5 strb r0, [r4, #0xc] - ldr r0, _0809FC24 @ =gLinkEntity + ldr r0, _0809FC24 @ =gPlayerEntity str r0, [r4, #0x54] ldrb r0, [r4, #0xa] movs r1, #0 @@ -206,7 +206,7 @@ _0809FC00: _0809FC22: pop {r4, r5, pc} .align 2, 0 -_0809FC24: .4byte gLinkEntity +_0809FC24: .4byte gPlayerEntity thumb_func_start sub_0809FC28 sub_0809FC28: @ 0x0809FC28 @@ -338,7 +338,7 @@ _0809FD1C: ldrh r0, [r4, #0x36] subs r0, #1 strh r0, [r4, #0x36] - ldr r1, _0809FD48 @ =gLinkEntity + ldr r1, _0809FD48 @ =gPlayerEntity adds r0, r4, #0 bl sub_080177A0 cmp r0, #0 @@ -351,7 +351,7 @@ _0809FD1C: _0809FD44: pop {r4, pc} .align 2, 0 -_0809FD48: .4byte gLinkEntity +_0809FD48: .4byte gPlayerEntity thumb_func_start sub_0809FD4C sub_0809FD4C: @ 0x0809FD4C @@ -562,7 +562,7 @@ _0809FECA: thumb_func_start sub_0809FECC sub_0809FECC: @ 0x0809FECC - ldr r1, _0809FEDC @ =gLinkEntity + ldr r1, _0809FEDC @ =gPlayerEntity str r1, [r0, #0x54] movs r2, #0 movs r1, #5 @@ -570,4 +570,4 @@ sub_0809FECC: @ 0x0809FECC strb r2, [r0, #0xd] bx lr .align 2, 0 -_0809FEDC: .4byte gLinkEntity +_0809FEDC: .4byte gPlayerEntity diff --git a/asm/objectAB.s b/asm/objectAB.s index 5740f276..a954dd21 100644 --- a/asm/objectAB.s +++ b/asm/objectAB.s @@ -85,7 +85,7 @@ sub_080A0158: @ 0x080A0158 adds r0, r4, #0 movs r1, #0x1e bl sub_0805E4E0 - ldr r1, _080A018C @ =gLinkEntity + ldr r1, _080A018C @ =gPlayerEntity adds r0, r4, #0 movs r2, #0x10 movs r3, #0x10 @@ -97,7 +97,7 @@ sub_080A0158: @ 0x080A0158 _080A018A: pop {r4, pc} .align 2, 0 -_080A018C: .4byte gLinkEntity +_080A018C: .4byte gPlayerEntity thumb_func_start sub_080A0190 sub_080A0190: @ 0x080A0190 @@ -105,9 +105,9 @@ sub_080A0190: @ 0x080A0190 movs r4, #0 movs r1, #1 strb r1, [r0, #0xd] - ldr r1, _080A01B8 @ =gLinkEntity + ldr r1, _080A01B8 @ =gPlayerEntity bl CopyPosition - ldr r2, _080A01BC @ =gLinkState + ldr r2, _080A01BC @ =gPlayerState movs r0, #3 strb r0, [r2, #0xc] adds r0, r2, #0 @@ -120,5 +120,5 @@ sub_080A0190: @ 0x080A0190 str r0, [r2, #0x30] pop {r4, pc} .align 2, 0 -_080A01B8: .4byte gLinkEntity -_080A01BC: .4byte gLinkState +_080A01B8: .4byte gPlayerEntity +_080A01BC: .4byte gPlayerState diff --git a/asm/objectB5.s b/asm/objectB5.s index b01eb974..89ef3f00 100644 --- a/asm/objectB5.s +++ b/asm/objectB5.s @@ -18,12 +18,12 @@ ObjectB5: @ 0x080A0E28 _080A0E36: ldr r0, _080A0E48 @ =gRoomControls str r1, [r0, #0x30] - ldr r0, _080A0E4C @ =gLinkEntity + ldr r0, _080A0E4C @ =gPlayerEntity ldr r3, _080A0E50 @ =0xFFD80000 movs r2, #0 bl PositionRelative pop {pc} .align 2, 0 _080A0E48: .4byte gRoomControls -_080A0E4C: .4byte gLinkEntity +_080A0E4C: .4byte gPlayerEntity _080A0E50: .4byte 0xFFD80000 diff --git a/asm/objectB9.s b/asm/objectB9.s index c8541922..43f746d3 100644 --- a/asm/objectB9.s +++ b/asm/objectB9.s @@ -174,7 +174,7 @@ _080A132E: mov r0, sb adds r0, #0x6a strh r6, [r0] - ldr r0, _080A136C @ =gLinkState + ldr r0, _080A136C @ =gPlayerState adds r0, #0x27 movs r1, #0xff strb r1, [r0] @@ -191,7 +191,7 @@ _080A132E: bl sub_08050384 b _080A1376 .align 2, 0 -_080A136C: .4byte gLinkState +_080A136C: .4byte gPlayerState _080A1370: ldr r1, _080A1384 @ =gUnk_02033280 movs r0, #0 diff --git a/asm/objectBA.s b/asm/objectBA.s index 5be0b70d..07f407a3 100644 --- a/asm/objectBA.s +++ b/asm/objectBA.s @@ -137,7 +137,7 @@ _080A171E: adds r0, #0x39 mov r2, sb strb r2, [r0] - ldr r2, _080A183C @ =gLinkState + ldr r2, _080A183C @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 lsls r1, r1, #0xa @@ -174,7 +174,7 @@ _080A182C: .4byte gRoomControls _080A1830: .4byte gScreen _080A1834: .4byte 0x00001E07 _080A1838: .4byte gScreenTransition -_080A183C: .4byte gLinkState +_080A183C: .4byte gPlayerState _080A1840: .4byte 0x80100000 _080A1844: .4byte gArea _080A1848: .4byte 0x00000864 @@ -202,7 +202,7 @@ sub_080A184C: @ 0x080A184C adds r0, #0x45 strb r2, [r0] _080A1874: - ldr r2, _080A1894 @ =gLinkState + ldr r2, _080A1894 @ =gPlayerState ldr r1, _080A1898 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -218,7 +218,7 @@ _080A1874: strh r0, [r2, #0x18] pop {pc} .align 2, 0 -_080A1894: .4byte gLinkState +_080A1894: .4byte gPlayerState _080A1898: .4byte gRoomControls thumb_func_start sub_080A189C @@ -259,7 +259,7 @@ sub_080A189C: @ 0x080A189C movs r1, #1 bl sub_08080964 _080A18E6: - ldr r2, _080A1904 @ =gLinkState + ldr r2, _080A1904 @ =gPlayerState ldr r1, _080A1908 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -275,7 +275,7 @@ _080A18E6: strh r0, [r2, #0x18] pop {pc} .align 2, 0 -_080A1904: .4byte gLinkState +_080A1904: .4byte gPlayerState _080A1908: .4byte gRoomControls thumb_func_start sub_080A190C @@ -315,7 +315,7 @@ sub_080A190C: @ 0x080A190C movs r1, #0x18 strb r1, [r0] _080A1956: - ldr r2, _080A1974 @ =gLinkState + ldr r2, _080A1974 @ =gPlayerState ldr r1, _080A1978 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -331,10 +331,10 @@ _080A1956: strh r0, [r2, #0x18] b _080A1988 .align 2, 0 -_080A1974: .4byte gLinkState +_080A1974: .4byte gPlayerState _080A1978: .4byte gRoomControls _080A197C: - ldr r1, _080A198C @ =gLinkState + ldr r1, _080A198C @ =gPlayerState ldrh r0, [r2, #0x2e] strh r0, [r1, #0x16] ldr r0, [r3, #8] @@ -343,7 +343,7 @@ _080A197C: _080A1988: pop {r4, pc} .align 2, 0 -_080A198C: .4byte gLinkState +_080A198C: .4byte gPlayerState thumb_func_start sub_080A1990 sub_080A1990: @ 0x080A1990 @@ -381,7 +381,7 @@ sub_080A1990: @ 0x080A1990 movs r1, #1 bl sub_08080964 _080A19D6: - ldr r2, _080A19F4 @ =gLinkState + ldr r2, _080A19F4 @ =gPlayerState ldr r1, _080A19F8 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -397,7 +397,7 @@ _080A19D6: strh r0, [r2, #0x18] pop {pc} .align 2, 0 -_080A19F4: .4byte gLinkState +_080A19F4: .4byte gPlayerState _080A19F8: .4byte gRoomControls thumb_func_start sub_080A19FC @@ -437,7 +437,7 @@ sub_080A19FC: @ 0x080A19FC movs r1, #0x18 strb r1, [r0] _080A1A46: - ldr r2, _080A1A64 @ =gLinkState + ldr r2, _080A1A64 @ =gPlayerState ldr r1, _080A1A68 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -453,10 +453,10 @@ _080A1A46: strh r0, [r2, #0x18] b _080A1A78 .align 2, 0 -_080A1A64: .4byte gLinkState +_080A1A64: .4byte gPlayerState _080A1A68: .4byte gRoomControls _080A1A6C: - ldr r1, _080A1A7C @ =gLinkState + ldr r1, _080A1A7C @ =gPlayerState ldrh r0, [r2, #0x2e] strh r0, [r1, #0x16] ldr r0, [r3, #0xc] @@ -465,7 +465,7 @@ _080A1A6C: _080A1A78: pop {r4, pc} .align 2, 0 -_080A1A7C: .4byte gLinkState +_080A1A7C: .4byte gPlayerState thumb_func_start sub_080A1A80 sub_080A1A80: @ 0x080A1A80 @@ -500,7 +500,7 @@ sub_080A1A80: @ 0x080A1A80 movs r1, #1 bl sub_08080964 _080A1AC0: - ldr r2, _080A1AE0 @ =gLinkState + ldr r2, _080A1AE0 @ =gPlayerState ldr r1, _080A1AE4 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -516,7 +516,7 @@ _080A1AC0: strh r0, [r2, #0x18] pop {pc} .align 2, 0 -_080A1AE0: .4byte gLinkState +_080A1AE0: .4byte gPlayerState _080A1AE4: .4byte gRoomControls thumb_func_start sub_080A1AE8 @@ -550,7 +550,7 @@ sub_080A1AE8: @ 0x080A1AE8 movs r1, #0xc strb r1, [r0] _080A1B24: - ldr r2, _080A1B44 @ =gLinkState + ldr r2, _080A1B44 @ =gPlayerState ldr r1, _080A1B48 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -566,7 +566,7 @@ _080A1B24: strh r0, [r2, #0x18] pop {r4, pc} .align 2, 0 -_080A1B44: .4byte gLinkState +_080A1B44: .4byte gPlayerState _080A1B48: .4byte gRoomControls thumb_func_start sub_080A1B4C @@ -604,7 +604,7 @@ _080A1B80: bl sub_08079F8C cmp r0, #0 beq _080A1BD0 - ldr r3, _080A1BF4 @ =gLinkEntity + ldr r3, _080A1BF4 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r3, r1] cmp r0, #0 @@ -621,7 +621,7 @@ _080A1B80: strb r6, [r4, #0x15] movs r0, #0x60 strh r0, [r4, #0x24] - ldr r2, _080A1BF8 @ =gLinkState + ldr r2, _080A1BF8 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _080A1BFC @ =0xFFFDFFFF ands r0, r1 @@ -634,7 +634,7 @@ _080A1B80: movs r0, #2 bl sub_08078A90 _080A1BD0: - ldr r2, _080A1BF8 @ =gLinkState + ldr r2, _080A1BF8 @ =gPlayerState ldr r1, _080A1C00 @ =gRoomControls movs r3, #0x80 lsls r3, r3, #2 @@ -651,8 +651,8 @@ _080A1BD0: pop {r4, r5, r6, r7, pc} .align 2, 0 _080A1BF0: .4byte gScreenTransition -_080A1BF4: .4byte gLinkEntity -_080A1BF8: .4byte gLinkState +_080A1BF4: .4byte gPlayerEntity +_080A1BF8: .4byte gPlayerState _080A1BFC: .4byte 0xFFFDFFFF _080A1C00: .4byte gRoomControls @@ -1248,7 +1248,7 @@ _080A2066: ldrb r0, [r4] cmp r0, #0 beq _080A20B4 - ldr r0, _080A20A0 @ =gLinkEntity + ldr r0, _080A20A0 @ =gPlayerEntity ldr r2, _080A209C @ =gRoomControls ldrh r1, [r2, #6] movs r3, #0x80 @@ -1270,7 +1270,7 @@ _080A2066: b _080A20B4 .align 2, 0 _080A209C: .4byte gRoomControls -_080A20A0: .4byte gLinkEntity +_080A20A0: .4byte gPlayerEntity _080A20A4: cmp r0, #0x23 bne _080A20B4 @@ -1296,7 +1296,7 @@ _080A20C4: bl sub_08079F8C cmp r0, #0 beq _080A20F8 - ldr r0, _080A20F0 @ =gLinkEntity + ldr r0, _080A20F0 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r0, r1] cmp r0, #0 @@ -1307,7 +1307,7 @@ _080A20C4: ldrb r0, [r0] cmp r0, #0 bne _080A20EC - ldr r0, _080A20F4 @ =gLinkState + ldr r0, _080A20F4 @ =gPlayerState ldrb r1, [r0, #0x14] rsbs r0, r1, #0 orrs r0, r1 @@ -1316,8 +1316,8 @@ _080A20EC: adds r0, r1, #0 b _080A20FA .align 2, 0 -_080A20F0: .4byte gLinkEntity -_080A20F4: .4byte gLinkState +_080A20F0: .4byte gPlayerEntity +_080A20F4: .4byte gPlayerState _080A20F8: movs r0, #0 _080A20FA: diff --git a/asm/objectBlockingStairs.s b/asm/objectBlockingStairs.s index 3e4c1992..ee7430eb 100644 --- a/asm/objectBlockingStairs.s +++ b/asm/objectBlockingStairs.s @@ -92,7 +92,7 @@ sub_08092F68: @ 0x08092F68 mov r7, r8 push {r7} adds r6, r0, #0 - ldr r0, _08092FA4 @ =gLinkEntity + ldr r0, _08092FA4 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r2, #0x2e @@ -118,7 +118,7 @@ _08092F92: bl sub_080932A8 b _080930E6 .align 2, 0 -_08092FA4: .4byte gLinkEntity +_08092FA4: .4byte gPlayerEntity _08092FA8: adds r1, r6, #0 adds r1, #0x7b @@ -172,7 +172,7 @@ _08092FF2: blo _08093040 movs r0, #3 strb r0, [r6, #0xc] - ldr r0, _08093038 @ =gLinkEntity + ldr r0, _08093038 @ =gPlayerEntity ldrb r0, [r0, #0x14] lsls r0, r0, #2 strb r0, [r6, #0x15] @@ -190,10 +190,10 @@ _08092FF2: b _080930E6 .align 2, 0 _08093034: .4byte 0x00004031 -_08093038: .4byte gLinkEntity +_08093038: .4byte gPlayerEntity _0809303C: .4byte 0x0000010F _08093040: - ldr r0, _0809307C @ =gLinkEntity + ldr r0, _0809307C @ =gPlayerEntity ldrb r1, [r0, #0x14] movs r0, #2 ands r0, r1 @@ -222,7 +222,7 @@ _08093040: ldr r0, _08093084 @ =0x0000403D b _080930AA .align 2, 0 -_0809307C: .4byte gLinkEntity +_0809307C: .4byte gPlayerEntity _08093080: .4byte 0x0000402C _08093084: .4byte 0x0000403D _08093088: @@ -288,11 +288,11 @@ sub_080930F4: @ 0x080930F4 bl sub_08093280 b _08093174 _08093104: - ldr r5, _0809315C @ =gLinkState + ldr r5, _0809315C @ =gPlayerState ldrb r0, [r5, #5] cmp r0, #0x12 bne _08093168 - ldr r6, _08093160 @ =gLinkEntity + ldr r6, _08093160 @ =gPlayerEntity adds r0, r6, #0 adds r0, #0x5a ldrb r1, [r0] @@ -331,8 +331,8 @@ _08093104: bl sub_08093248 b _08093174 .align 2, 0 -_0809315C: .4byte gLinkState -_08093160: .4byte gLinkEntity +_0809315C: .4byte gPlayerState +_08093160: .4byte gPlayerEntity _08093164: .4byte 0x0000010F _08093168: ldrb r0, [r4, #0xd] diff --git a/asm/objectC1.s b/asm/objectC1.s index 0a6016cb..a18b4d33 100644 --- a/asm/objectC1.s +++ b/asm/objectC1.s @@ -44,7 +44,7 @@ _080A2598: .4byte gUnk_02034490 sub_080A259C: @ 0x080A259C push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r5, _080A25DC @ =gLinkEntity + ldr r5, _080A25DC @ =gPlayerEntity ldrb r1, [r5, #0x10] movs r7, #0x7f adds r0, r7, #0 @@ -74,7 +74,7 @@ sub_080A259C: @ 0x080A259C beq _080A25E6 b _080A273C .align 2, 0 -_080A25DC: .4byte gLinkEntity +_080A25DC: .4byte gPlayerEntity _080A25E0: cmp r0, #2 beq _080A26B4 @@ -133,7 +133,7 @@ _080A25E6: adds r0, r4, #0 movs r1, #6 bl sub_0805E3A0 - ldr r0, _080A2670 @ =gLinkState + ldr r0, _080A2670 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #8 ands r0, r1 @@ -147,7 +147,7 @@ _080A25E6: adds r1, #3 b _080A2688 .align 2, 0 -_080A2670: .4byte gLinkState +_080A2670: .4byte gPlayerState _080A2674: .4byte 0x0000045B _080A2678: ldrb r0, [r4, #0xa] @@ -217,7 +217,7 @@ _080A26B4: adds r0, r5, #0 adds r0, #0x3d strb r1, [r0] - ldr r1, _080A2768 @ =gLinkState + ldr r1, _080A2768 @ =gPlayerState adds r0, r4, #0 adds r0, #0x6b ldrb r0, [r0] @@ -269,4 +269,4 @@ _080A2762: pop {r4, r5, r6, r7, pc} .align 2, 0 _080A2764: .4byte gTextBox -_080A2768: .4byte gLinkState +_080A2768: .4byte gPlayerState diff --git a/asm/objectOnPillar.s b/asm/objectOnPillar.s index 614b63e8..6829d195 100644 --- a/asm/objectOnPillar.s +++ b/asm/objectOnPillar.s @@ -164,7 +164,7 @@ sub_08096F30: @ 0x08096F30 bl sub_08097144 b _08096F62 _08096F44: - ldr r0, _08096F64 @ =gLinkState + ldr r0, _08096F64 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _08096F50 @@ -182,7 +182,7 @@ _08096F50: _08096F62: pop {pc} .align 2, 0 -_08096F64: .4byte gLinkState +_08096F64: .4byte gPlayerState _08096F68: .4byte gUnk_0812326C thumb_func_start sub_08096F6C @@ -196,7 +196,7 @@ sub_08096F6C: @ 0x08096F6C bne _08096F98 movs r0, #1 strh r0, [r1] - ldr r1, _08096FD8 @ =gLinkEntity + ldr r1, _08096FD8 @ =gPlayerEntity ldrb r0, [r1, #0x14] ldr r2, _08096FDC @ =gUnk_08123274 adds r0, r0, r2 @@ -214,7 +214,7 @@ _08096F98: bl sub_080896B0 cmp r0, #0 beq _08096FD4 - ldr r2, _08096FE0 @ =gLinkState + ldr r2, _08096FE0 @ =gPlayerState movs r3, #0 movs r0, #0x10 strb r0, [r2, #0xc] @@ -226,7 +226,7 @@ _08096F98: movs r1, #1 orrs r0, r1 str r0, [r2, #0x30] - ldr r0, _08096FD8 @ =gLinkEntity + ldr r0, _08096FD8 @ =gPlayerEntity strh r3, [r0, #0x2c] strh r3, [r0, #0x30] ldrb r0, [r0, #0x14] @@ -239,9 +239,9 @@ _08096F98: _08096FD4: pop {r4, pc} .align 2, 0 -_08096FD8: .4byte gLinkEntity +_08096FD8: .4byte gPlayerEntity _08096FDC: .4byte gUnk_08123274 -_08096FE0: .4byte gLinkState +_08096FE0: .4byte gPlayerState thumb_func_start sub_08096FE4 sub_08096FE4: @ 0x08096FE4 diff --git a/asm/objectOnSpinyBeetle.s b/asm/objectOnSpinyBeetle.s index 0fb5ae2b..461d78a1 100644 --- a/asm/objectOnSpinyBeetle.s +++ b/asm/objectOnSpinyBeetle.s @@ -185,7 +185,7 @@ _080986C4: ldrb r0, [r4, #0xa] cmp r0, #0 beq _080986E6 - ldr r0, _080986DC @ =gLinkState + ldr r0, _080986DC @ =gPlayerState adds r0, #0xac ldrh r1, [r0] movs r0, #8 @@ -194,7 +194,7 @@ _080986C4: beq _08098702 b _080986E6 .align 2, 0 -_080986DC: .4byte gLinkState +_080986DC: .4byte gPlayerState _080986E0: ldrb r0, [r4, #0xa] cmp r0, #0 @@ -243,7 +243,7 @@ sub_0809871C: @ 0x0809871C adds r1, #3 movs r0, #1 strb r0, [r1] - ldr r0, _08098754 @ =gLinkEntity + ldr r0, _08098754 @ =gPlayerEntity adds r0, #0x3b ldrb r0, [r0] subs r1, #4 @@ -258,7 +258,7 @@ sub_0809871C: @ 0x0809871C strb r0, [r3, #0xd] bx lr .align 2, 0 -_08098754: .4byte gLinkEntity +_08098754: .4byte gPlayerEntity thumb_func_start nullsub_533 nullsub_533: @ 0x08098758 @@ -329,7 +329,7 @@ sub_080987B4: @ 0x080987B4 sub_080987BC: @ 0x080987BC push {lr} adds r1, r0, #0 - ldr r0, _080987D0 @ =gLinkState + ldr r0, _080987D0 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _080987CE @@ -338,7 +338,7 @@ sub_080987BC: @ 0x080987BC _080987CE: pop {pc} .align 2, 0 -_080987D0: .4byte gLinkState +_080987D0: .4byte gPlayerState thumb_func_start sub_080987D4 sub_080987D4: @ 0x080987D4 @@ -389,7 +389,7 @@ sub_08098810: @ 0x08098810 sub_08098820: @ 0x08098820 push {lr} adds r2, r0, #0 - ldr r0, _0809884C @ =gLinkState + ldr r0, _0809884C @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -411,7 +411,7 @@ _0809883E: strb r0, [r2, #0xc] b _08098856 .align 2, 0 -_0809884C: .4byte gLinkState +_0809884C: .4byte gPlayerState _08098850: adds r0, r2, #0 bl sub_0806F4E8 @@ -437,7 +437,7 @@ sub_08098858: @ 0x08098858 ldr r0, [r4, #0x50] str r1, [r0, #0x54] _08098878: - ldr r0, _0809889C @ =gLinkState + ldr r0, _0809889C @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -455,7 +455,7 @@ _08098892: bl sub_080989C0 b _080988B4 .align 2, 0 -_0809889C: .4byte gLinkState +_0809889C: .4byte gPlayerState _080988A0: adds r0, r4, #0 bl sub_0806F3E4 @@ -473,7 +473,7 @@ _080988B4: sub_080988B8: @ 0x080988B8 push {lr} adds r2, r0, #0 - ldr r0, _080988CC @ =gLinkState + ldr r0, _080988CC @ =gPlayerState ldrb r0, [r0, #0x1c] cmp r0, #0 bne _080988D0 @@ -481,7 +481,7 @@ sub_080988B8: @ 0x080988B8 bl sub_080989C0 b _080988D8 .align 2, 0 -_080988CC: .4byte gLinkState +_080988CC: .4byte gPlayerState _080988D0: ldrb r1, [r2, #0x10] movs r0, #0x7f diff --git a/asm/ocarina.s b/asm/ocarina.s index fcfae82a..0c4433a9 100644 --- a/asm/ocarina.s +++ b/asm/ocarina.s @@ -18,7 +18,7 @@ Ocarina: @ 0x08076B78 ldr r2, [r2] bl _call_via_r2 - ldr r1, _08076B98 @ =gLinkEntity + ldr r1, _08076B98 @ =gPlayerEntity adds r1, #0x7a ldrh r0, [r1] adds r0, #1 @@ -27,14 +27,14 @@ Ocarina: @ 0x08076B78 pop {pc} .align 2, 0 _08076B94: .4byte gOcarinaStates -_08076B98: .4byte gLinkEntity +_08076B98: .4byte gPlayerEntity thumb_func_start OcarinaUse OcarinaUse: @ 0x08076B9C push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r3, _08076BB4 @ =gLinkState + ldr r3, _08076BB4 @ =gPlayerState ldrb r0, [r3, #0xc] cmp r0, #0x18 bne _08076BB8 @@ -42,13 +42,13 @@ OcarinaUse: @ 0x08076B9C bl sub_08077E78 b _08076C1C .align 2, 0 -_08076BB4: .4byte gLinkState +_08076BB4: .4byte gPlayerState _08076BB8: ldrb r1, [r4, #9] movs r0, #0xf orrs r0, r1 strb r0, [r4, #9] - ldr r1, _08076C20 @ =gLinkEntity + ldr r1, _08076C20 @ =gPlayerEntity movs r0, #4 strb r0, [r1, #0x14] ldrb r2, [r1, #0x18] @@ -106,7 +106,7 @@ _08076BB8: _08076C1C: pop {r4, r5, pc} .align 2, 0 -_08076C20: .4byte gLinkEntity +_08076C20: .4byte gPlayerEntity _08076C24: .4byte gUnk_02034490 _08076C28: .4byte 0x00000216 @@ -121,13 +121,13 @@ OcarinaUpdate: @ 0x08076C2C ands r0, r1 cmp r0, #0 beq _08076C6E - ldr r0, _08076C70 @ =gLinkEntity + ldr r0, _08076C70 @ =gPlayerEntity ldrb r2, [r0, #0x10] movs r4, #0 movs r1, #0x80 orrs r1, r2 strb r1, [r0, #0x10] - ldr r2, _08076C74 @ =gLinkState + ldr r2, _08076C74 @ =gPlayerState ldr r1, [r2, #0x30] ldr r3, _08076C78 @ =0xEFFFFFFF ands r1, r3 @@ -144,7 +144,7 @@ OcarinaUpdate: @ 0x08076C2C _08076C6E: pop {r4, r5, r6, pc} .align 2, 0 -_08076C70: .4byte gLinkEntity -_08076C74: .4byte gLinkState +_08076C70: .4byte gPlayerEntity +_08076C74: .4byte gPlayerState _08076C78: .4byte 0xEFFFFFFF _08076C7C: .4byte gUnk_02034490 \ No newline at end of file diff --git a/asm/ocarinaUpdate.s b/asm/ocarinaUpdate.s index 005d7f38..d770dbe3 100644 --- a/asm/ocarinaUpdate.s +++ b/asm/ocarinaUpdate.s @@ -17,13 +17,13 @@ OcarinaUpdate: @ 0x08076C2C ands r0, r1 cmp r0, #0 beq _08076C6E - ldr r0, _08076C70 @ =gLinkEntity + ldr r0, _08076C70 @ =gPlayerEntity ldrb r2, [r0, #0x10] movs r4, #0 movs r1, #0x80 orrs r1, r2 strb r1, [r0, #0x10] - ldr r2, _08076C74 @ =gLinkState + ldr r2, _08076C74 @ =gPlayerState ldr r1, [r2, #0x30] ldr r3, _08076C78 @ =0xEFFFFFFF ands r1, r3 @@ -40,7 +40,7 @@ OcarinaUpdate: @ 0x08076C2C _08076C6E: pop {r4, r5, r6, pc} .align 2, 0 -_08076C70: .4byte gLinkEntity -_08076C74: .4byte gLinkState +_08076C70: .4byte gPlayerEntity +_08076C74: .4byte gPlayerState _08076C78: .4byte 0xEFFFFFFF _08076C7C: .4byte gUnk_02034490 \ No newline at end of file diff --git a/asm/octorokBoss.s b/asm/octorokBoss.s index 1dd73bfd..d713b2b4 100644 --- a/asm/octorokBoss.s +++ b/asm/octorokBoss.s @@ -444,13 +444,13 @@ _08035512: movs r0, #0x96 strb r0, [r1] ldr r1, _08035524 @ =gRoomControls - ldr r0, _08035528 @ =gLinkEntity + ldr r0, _08035528 @ =gPlayerEntity str r0, [r1, #0x30] _08035522: pop {pc} .align 2, 0 _08035524: .4byte gRoomControls -_08035528: .4byte gLinkEntity +_08035528: .4byte gPlayerEntity thumb_func_start sub_0803552C sub_0803552C: @ 0x0803552C @@ -905,7 +905,7 @@ _080358A0: movs r0, #0x3c mov r1, sb strb r0, [r1] - ldr r1, _080358D0 @ =gLinkEntity + ldr r1, _080358D0 @ =gPlayerEntity ldrb r2, [r1, #0x18] subs r0, #0x40 ands r0, r2 @@ -919,7 +919,7 @@ _080358A0: str r4, [r0, #0x30] b _08035974 .align 2, 0 -_080358D0: .4byte gLinkEntity +_080358D0: .4byte gPlayerEntity _080358D4: .4byte gRoomControls _080358D8: movs r1, #0 @@ -1152,7 +1152,7 @@ sub_08035A70: @ 0x08035A70 strb r0, [r2, #0xd] movs r0, #0x3c strb r0, [r1] - ldr r2, _08035AAC @ =gLinkEntity + ldr r2, _08035AAC @ =gPlayerEntity ldrb r3, [r2, #0x18] lsls r1, r3, #0x1e lsrs r1, r1, #0x1e @@ -1168,7 +1168,7 @@ sub_08035A70: @ 0x08035A70 _08035AA8: pop {r4, pc} .align 2, 0 -_08035AAC: .4byte gLinkEntity +_08035AAC: .4byte gPlayerEntity _08035AB0: .4byte gRoomControls thumb_func_start sub_08035AB4 @@ -1184,7 +1184,7 @@ sub_08035AB4: @ 0x08035AB4 lsrs r0, r0, #0x18 cmp r0, #0xff bne _08035AE4 - ldr r1, _08035AE8 @ =gLinkEntity + ldr r1, _08035AE8 @ =gPlayerEntity movs r0, #0x10 strb r0, [r1, #0x15] movs r4, #4 @@ -1199,7 +1199,7 @@ sub_08035AB4: @ 0x08035AB4 _08035AE4: pop {r4, r5, r6, pc} .align 2, 0 -_08035AE8: .4byte gLinkEntity +_08035AE8: .4byte gPlayerEntity thumb_func_start sub_08035AEC sub_08035AEC: @ 0x08035AEC @@ -1218,18 +1218,18 @@ sub_08035AEC: @ 0x08035AEC strb r0, [r3, #0xd] movs r0, #0x2d strb r0, [r2] - ldr r1, _08035B14 @ =gLinkEntity + ldr r1, _08035B14 @ =gPlayerEntity movs r0, #0 strb r0, [r1, #0x14] b _08035B2C .align 2, 0 -_08035B14: .4byte gLinkEntity +_08035B14: .4byte gPlayerEntity _08035B18: lsls r0, r1, #0x18 lsrs r0, r0, #0x18 cmp r0, #0x1e bne _08035B2C - ldr r0, _08035B30 @ =gLinkEntity + ldr r0, _08035B30 @ =gPlayerEntity movs r2, #0x18 rsbs r2, r2, #0 movs r1, #0xc @@ -1237,13 +1237,13 @@ _08035B18: _08035B2C: pop {pc} .align 2, 0 -_08035B30: .4byte gLinkEntity +_08035B30: .4byte gPlayerEntity thumb_func_start sub_08035B34 sub_08035B34: @ 0x08035B34 push {r4, r5, lr} adds r3, r0, #0 - ldr r2, _08035B70 @ =gLinkEntity + ldr r2, _08035B70 @ =gPlayerEntity ldrb r5, [r2, #0x14] cmp r5, #4 bne _08035B7C @@ -1270,7 +1270,7 @@ sub_08035B34: @ 0x08035B34 bl PlaySFX b _08035B92 .align 2, 0 -_08035B70: .4byte gLinkEntity +_08035B70: .4byte gPlayerEntity _08035B74: .4byte gRoomControls _08035B78: .4byte gUnk_02034490 _08035B7C: @@ -1788,7 +1788,7 @@ _08035F78: .4byte gUnk_080CF0C4 sub_08035F7C: @ 0x08035F7C push {r4, r5, lr} adds r4, r0, #0 - ldr r2, _08035FD0 @ =gLinkEntity + ldr r2, _08035FD0 @ =gPlayerEntity ldr r0, [r2, #0x2c] ldr r1, [r4, #0x2c] subs r0, r0, r1 @@ -1828,7 +1828,7 @@ _08035FB6: bl sub_08036C90 b _08036074 .align 2, 0 -_08035FD0: .4byte gLinkEntity +_08035FD0: .4byte gPlayerEntity _08035FD4: adds r0, r4, #0 adds r0, #0x78 @@ -2080,7 +2080,7 @@ sub_08036188: @ 0x08036188 ldrb r0, [r0] cmp r0, #0 beq _080361EA - ldr r4, _080361F0 @ =gLinkEntity + ldr r4, _080361F0 @ =gPlayerEntity ldrb r1, [r4, #0x18] movs r0, #4 rsbs r0, r0, #0 @@ -2112,7 +2112,7 @@ _080361EA: pop {r4, r5, pc} .align 2, 0 _080361EC: .4byte gUnk_080CF0E0 -_080361F0: .4byte gLinkEntity +_080361F0: .4byte gPlayerEntity thumb_func_start sub_080361F4 sub_080361F4: @ 0x080361F4 @@ -2386,7 +2386,7 @@ sub_080363CC: @ 0x080363CC ldrb r2, [r7] cmp r2, #0 bne _080364CC - ldr r5, _08036498 @ =gLinkEntity + ldr r5, _08036498 @ =gPlayerEntity ldr r0, [r5, #0x2c] ldr r1, [r4, #0x2c] subs r0, r0, r1 @@ -2419,7 +2419,7 @@ _0803640C: bl sub_0806FC80 cmp r0, #0 beq _080364AA - ldr r2, _0803649C @ =gLinkState + ldr r2, _0803649C @ =gPlayerState ldr r1, [r2, #0x30] movs r0, #0x80 lsls r0, r0, #4 @@ -2475,8 +2475,8 @@ _0803640C: bl PlaySFX b _080364AA .align 2, 0 -_08036498: .4byte gLinkEntity -_0803649C: .4byte gLinkState +_08036498: .4byte gPlayerEntity +_0803649C: .4byte gPlayerState _080364A0: .4byte gRoomControls _080364A4: ldr r0, _080364C4 @ =0xFFFFF7FF @@ -2548,7 +2548,7 @@ _08036510: ldrb r0, [r1] adds r0, #1 strb r0, [r1] - ldr r1, _0803656C @ =gLinkEntity + ldr r1, _0803656C @ =gPlayerEntity ldrb r2, [r1, #0x18] movs r0, #4 rsbs r0, r0, #0 @@ -2579,7 +2579,7 @@ _08036510: bl PlaySFX b _08036652 .align 2, 0 -_0803656C: .4byte gLinkEntity +_0803656C: .4byte gPlayerEntity _08036570: adds r1, r4, #0 adds r1, #0x79 @@ -2604,7 +2604,7 @@ _0803657A: _08036598: subs r2, r0, #1 strb r2, [r6] - ldr r0, _080365E4 @ =gLinkState + ldr r0, _080365E4 @ =gPlayerState ldr r1, [r0, #0x30] movs r0, #0x80 lsls r0, r0, #4 @@ -2614,7 +2614,7 @@ _08036598: lsrs r0, r0, #0x18 cmp r0, #0x3c bne _080365F8 - ldr r2, _080365E8 @ =gLinkEntity + ldr r2, _080365E8 @ =gPlayerEntity ldr r0, [r2, #0x2c] ldr r1, [r4, #0x2c] subs r0, r0, r1 @@ -2640,8 +2640,8 @@ _08036598: adds r0, #0x30 b _080365F6 .align 2, 0 -_080365E4: .4byte gLinkState -_080365E8: .4byte gLinkEntity +_080365E4: .4byte gPlayerState +_080365E8: .4byte gPlayerEntity _080365EC: adds r0, r4, #0 adds r0, #0x84 @@ -3042,7 +3042,7 @@ sub_080368D8: @ 0x080368D8 ldrb r0, [r0] cmp r0, #0 beq _08036902 - ldr r2, _08036910 @ =gLinkEntity + ldr r2, _08036910 @ =gPlayerEntity ldrb r1, [r2, #0x18] movs r0, #4 rsbs r0, r0, #0 @@ -3066,7 +3066,7 @@ _08036902: strh r1, [r0] pop {pc} .align 2, 0 -_08036910: .4byte gLinkEntity +_08036910: .4byte gPlayerEntity thumb_func_start sub_08036914 sub_08036914: @ 0x08036914 diff --git a/asm/octorokGolden.s b/asm/octorokGolden.s index 751b16af..d0af53ef 100644 --- a/asm/octorokGolden.s +++ b/asm/octorokGolden.s @@ -228,7 +228,7 @@ _08037DC4: bl sub_08037E14 b _08037E0C _08037DEE: - ldr r1, _08037E10 @ =gLinkEntity + ldr r1, _08037E10 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r0, #4 @@ -244,7 +244,7 @@ _08037DEE: _08037E0C: pop {r4, pc} .align 2, 0 -_08037E10: .4byte gLinkEntity +_08037E10: .4byte gPlayerEntity thumb_func_start sub_08037E14 sub_08037E14: @ 0x08037E14 @@ -252,7 +252,7 @@ sub_08037E14: @ 0x08037E14 adds r5, r0, #0 movs r0, #8 strb r0, [r5, #0xe] - ldr r1, _08037E6C @ =gLinkEntity + ldr r1, _08037E6C @ =gPlayerEntity adds r0, r5, #0 bl GetFacingDirection adds r4, r0, #4 @@ -288,7 +288,7 @@ sub_08037E14: @ 0x08037E14 strb r0, [r5, #0x15] b _08037E7A .align 2, 0 -_08037E6C: .4byte gLinkEntity +_08037E6C: .4byte gPlayerEntity _08037E70: .4byte 0x00002004 _08037E74: .4byte gUnk_080CF498 _08037E78: @@ -310,7 +310,7 @@ _08037E8E: sub_08037E90: @ 0x08037E90 push {r4, lr} adds r4, r0, #0 - ldr r1, _08037EA8 @ =gLinkEntity + ldr r1, _08037EA8 @ =gPlayerEntity movs r2, #8 bl sub_0804A044 adds r1, r0, #0 @@ -319,7 +319,7 @@ sub_08037E90: @ 0x08037E90 movs r0, #0 b _08037EC6 .align 2, 0 -_08037EA8: .4byte gLinkEntity +_08037EA8: .4byte gPlayerEntity _08037EAC: movs r0, #2 strb r0, [r4, #0xc] diff --git a/asm/percy.s b/asm/percy.s index 7cd6c8a0..521a10ae 100644 --- a/asm/percy.s +++ b/asm/percy.s @@ -59,7 +59,7 @@ _0806B470: movs r0, #0 strb r1, [r4, #0xc] strb r0, [r2] - ldr r1, _0806B4C8 @ =gLinkEntity + ldr r1, _0806B4C8 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -85,15 +85,15 @@ _0806B4B2: ldrh r3, [r3, #4] adds r0, r4, #0 bl sub_0801DFB4 - ldr r0, _0806B4D0 @ =gLinkState + ldr r0, _0806B4D0 @ =gPlayerState adds r0, #0x8b movs r1, #3 strb r1, [r0] b _0806B4EC .align 2, 0 -_0806B4C8: .4byte gLinkEntity +_0806B4C8: .4byte gPlayerEntity _0806B4CC: .4byte gUnk_08001A7C -_0806B4D0: .4byte gLinkState +_0806B4D0: .4byte gPlayerState _0806B4D4: adds r0, r4, #0 movs r1, #0 @@ -236,7 +236,7 @@ _0806B5E6: bl SetRoomFlag b _0806B600 _0806B5EE: - ldr r0, _0806B5FC @ =gLinkEntity + ldr r0, _0806B5FC @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #8 beq _0806B600 @@ -244,7 +244,7 @@ _0806B5EE: strh r0, [r4, #0x10] b _0806B606 .align 2, 0 -_0806B5FC: .4byte gLinkEntity +_0806B5FC: .4byte gPlayerEntity _0806B600: ldr r1, _0806B608 @ =gUnk_02033280 movs r0, #0 diff --git a/asm/pesto.s b/asm/pesto.s index 0ca10a24..e5c6ca52 100644 --- a/asm/pesto.s +++ b/asm/pesto.s @@ -196,7 +196,7 @@ sub_08024060: @ 0x08024060 strb r0, [r3, #0x10] movs r0, #0x6e strb r0, [r2] - ldr r0, _08024094 @ =gLinkEntity + ldr r0, _08024094 @ =gPlayerEntity ldrb r1, [r0, #0x19] lsrs r1, r1, #6 lsls r1, r1, #6 @@ -210,7 +210,7 @@ _0802408C: bl GetNextFrame pop {pc} .align 2, 0 -_08024094: .4byte gLinkEntity +_08024094: .4byte gPlayerEntity thumb_func_start nullsub_138 nullsub_138: @ 0x08024098 @@ -385,7 +385,7 @@ sub_080241C0: @ 0x080241C0 beq _08024238 b _08024296 _080241D8: - ldr r0, _08024218 @ =gLinkState + ldr r0, _08024218 @ =gPlayerState ldrb r0, [r0, #0xf] movs r2, #0x40 cmp r0, #0 @@ -402,7 +402,7 @@ _080241E4: bl sub_08049FDC cmp r0, #0 beq _08024220 - ldr r0, _0802421C @ =gLinkEntity + ldr r0, _0802421C @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #0x1e beq _08024220 @@ -416,8 +416,8 @@ _080241E4: bl sub_08024A14 b _08024296 .align 2, 0 -_08024218: .4byte gLinkState -_0802421C: .4byte gLinkEntity +_08024218: .4byte gPlayerState +_0802421C: .4byte gPlayerEntity _08024220: ldrb r0, [r4, #0xf] subs r0, #1 @@ -1005,7 +1005,7 @@ _08024670: strb r0, [r2] adds r0, r5, #0 bl sub_080249DC - ldr r2, _080246DC @ =gLinkEntity + ldr r2, _080246DC @ =gPlayerEntity adds r0, r2, #0 adds r0, #0x29 ldrb r0, [r0] @@ -1018,7 +1018,7 @@ _08024670: movs r0, #0x7f ands r0, r1 strb r0, [r2, #0x10] - ldr r2, _080246E0 @ =gLinkState + ldr r2, _080246E0 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 lsls r1, r1, #1 @@ -1037,8 +1037,8 @@ _080246D6: strb r4, [r2] b _08024924 .align 2, 0 -_080246DC: .4byte gLinkEntity -_080246E0: .4byte gLinkState +_080246DC: .4byte gPlayerEntity +_080246E0: .4byte gPlayerState _080246E4: ldr r1, [r5, #0x54] adds r0, r5, #0 @@ -1323,7 +1323,7 @@ _08024902: bl sub_08024A14 b _08024924 _0802490A: - ldr r0, _0802493C @ =gLinkEntity + ldr r0, _0802493C @ =gPlayerEntity movs r7, #0x36 ldrsh r1, [r0, r7] cmp r1, #0 @@ -1349,7 +1349,7 @@ _08024934: mov sb, r4 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0802493C: .4byte gLinkEntity +_0802493C: .4byte gPlayerEntity thumb_func_start sub_08024940 sub_08024940: @ 0x08024940 @@ -1571,7 +1571,7 @@ sub_08024AD8: @ 0x08024AD8 ands r0, r2 cmp r0, #3 bne _08024B12 - ldr r0, _08024B0C @ =gLinkState + ldr r0, _08024B0C @ =gPlayerState ldrb r0, [r0, #0xf] cmp r0, #0 bne _08024B10 @@ -1583,7 +1583,7 @@ sub_08024AD8: @ 0x08024AD8 movs r0, #0 b _08024B34 .align 2, 0 -_08024B0C: .4byte gLinkState +_08024B0C: .4byte gPlayerState _08024B10: movs r1, #1 _08024B12: @@ -1613,7 +1613,7 @@ sub_08024B38: @ 0x08024B38 push {r4, r5, r6, r7, lr} adds r5, r0, #0 movs r7, #0 - ldr r0, _08024B5C @ =gLinkState + ldr r0, _08024B5C @ =gPlayerState ldrb r3, [r0, #0xf] adds r2, r3, #0 adds r1, r0, #0 @@ -1629,7 +1629,7 @@ sub_08024B38: @ 0x08024B38 strb r0, [r1, #0xf] b _08024B62 .align 2, 0 -_08024B5C: .4byte gLinkState +_08024B5C: .4byte gPlayerState _08024B60: strb r7, [r1, #0xf] _08024B62: @@ -2095,9 +2095,9 @@ _08024E9A: .align 2, 0 _08024EC8: .4byte gUnk_02002A40 _08024ECC: - ldr r6, _08024F48 @ =gLinkEntity - bl ResetLink - ldr r2, _08024F4C @ =gLinkState + ldr r6, _08024F48 @ =gPlayerEntity + bl ResetPlayer + ldr r2, _08024F4C @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 lsls r1, r1, #1 @@ -2155,21 +2155,21 @@ _08024ECC: _08024F46: pop {r4, r5, r6, r7, pc} .align 2, 0 -_08024F48: .4byte gLinkEntity -_08024F4C: .4byte gLinkState +_08024F48: .4byte gPlayerEntity +_08024F4C: .4byte gPlayerState thumb_func_start sub_08024F50 sub_08024F50: @ 0x08024F50 push {r4, r5, r6, lr} adds r6, r0, #0 - ldr r2, _08024FDC @ =gLinkState + ldr r2, _08024FDC @ =gPlayerState movs r4, #0 strb r4, [r2, #0xa] ldr r0, [r2, #0x30] ldr r1, _08024FE0 @ =0xFFFFFEFF ands r0, r1 str r0, [r2, #0x30] - ldr r5, _08024FE4 @ =gLinkEntity + ldr r5, _08024FE4 @ =gPlayerEntity adds r0, r6, #0 adds r1, r5, #0 bl CopyPosition @@ -2229,6 +2229,6 @@ sub_08024F50: @ 0x08024F50 strh r0, [r6, #0x24] pop {r4, r5, r6, pc} .align 2, 0 -_08024FDC: .4byte gLinkState +_08024FDC: .4byte gPlayerState _08024FE0: .4byte 0xFFFFFEFF -_08024FE4: .4byte gLinkEntity +_08024FE4: .4byte gPlayerEntity diff --git a/asm/picolyteBottles.s b/asm/picolyteBottles.s index 27471fa9..158b7a27 100644 --- a/asm/picolyteBottles.s +++ b/asm/picolyteBottles.s @@ -21,7 +21,7 @@ PicolyteBottle: @ 0x0806DED0 ldrb r0, [r4, #0xa] cmp r0, #0 bne _0806DEF4 - ldr r2, _0806DEFC @ =gLinkState + ldr r2, _0806DEFC @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r0, r1 @@ -30,7 +30,7 @@ _0806DEF4: pop {r4, pc} .align 2, 0 _0806DEF8: .4byte gUnk_081142BC -_0806DEFC: .4byte gLinkState +_0806DEFC: .4byte gPlayerState thumb_func_start sub_0806DF00 sub_0806DF00: @ 0x0806DF00 diff --git a/asm/pina.s b/asm/pina.s index 8d869270..7697a309 100644 --- a/asm/pina.s +++ b/asm/pina.s @@ -192,7 +192,7 @@ _08063B9E: adds r1, r4, #0 adds r1, #0x69 strb r0, [r1] - ldr r1, _08063BDC @ =gLinkEntity + ldr r1, _08063BDC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -204,7 +204,7 @@ _08063B9E: bl sub_0806F118 b _08063C10 .align 2, 0 -_08063BDC: .4byte gLinkEntity +_08063BDC: .4byte gPlayerEntity _08063BE0: adds r0, r4, #0 movs r1, #0 diff --git a/asm/postman.s b/asm/postman.s index 3bb384b7..86ce9e54 100644 --- a/asm/postman.s +++ b/asm/postman.s @@ -206,7 +206,7 @@ sub_080608E4: @ 0x080608E4 adds r0, r4, #0 adds r0, #0x38 ldrb r1, [r0] - ldr r6, _08060974 @ =gLinkEntity + ldr r6, _08060974 @ =gPlayerEntity cmp r1, #1 bne _0806090A adds r0, r6, #0 @@ -270,7 +270,7 @@ _08060918: _08060970: pop {r4, r5, r6, r7, pc} .align 2, 0 -_08060974: .4byte gLinkEntity +_08060974: .4byte gPlayerEntity _08060978: .4byte gUnk_0810AA70 thumb_func_start Postman_Fusion @@ -314,7 +314,7 @@ CreateZeldaFollower: @ 0x080609AC adds r4, r0, #0 cmp r4, #0 beq _080609E0 - ldr r0, _080609E4 @ =gLinkEntity + ldr r0, _080609E4 @ =gPlayerEntity adds r1, r4, #0 bl CopyPosition ldrb r1, [r4, #0x10] @@ -327,4 +327,4 @@ CreateZeldaFollower: @ 0x080609AC _080609E0: pop {r4, pc} .align 2, 0 -_080609E4: .4byte gLinkEntity +_080609E4: .4byte gPlayerEntity diff --git a/asm/pot.s b/asm/pot.s index e24373d3..ac843f74 100644 --- a/asm/pot.s +++ b/asm/pot.s @@ -6,538 +6,6 @@ .text - - thumb_func_start Pot -Pot: @ 0x0808220C - push {r4, lr} - adds r4, r0, #0 - ldr r1, _08082228 @ =gUnk_0811F090 - ldrb r0, [r4, #0xc] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r1, [r0] - adds r0, r4, #0 - bl _call_via_r1 - adds r4, #0x41 - movs r0, #0 - strb r0, [r4] - pop {r4, pc} - .align 2, 0 -_08082228: .4byte gUnk_0811F090 - - thumb_func_start sub_0808222C -sub_0808222C: @ 0x0808222C - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - adds r4, r0, #0 - ldrb r0, [r4, #0xb] - cmp r0, #1 - bne _0808224C - adds r0, r4, #0 - adds r0, #0x86 - ldrh r0, [r0] - bl CheckFlags - cmp r0, #0 - beq _0808224C - bl DeleteThisEntity -_0808224C: - movs r2, #1 - strb r2, [r4, #0xc] - ldr r0, _08082308 @ =gUnk_080FD338 - str r0, [r4, #0x48] - movs r1, #0 - movs r0, #0x80 - strh r0, [r4, #0x24] - ldrh r0, [r4, #0x32] - adds r0, #3 - strh r0, [r4, #0x32] - strb r1, [r4, #0x16] - ldrb r1, [r4, #0x10] - movs r0, #0x80 - orrs r0, r1 - strb r0, [r4, #0x10] - adds r0, r4, #0 - adds r0, #0x45 - strb r2, [r0] - adds r1, r4, #0 - adds r1, #0x3c - movs r0, #7 - strb r0, [r1] - adds r1, #3 - movs r0, #0x6e - strb r0, [r1] - subs r1, #4 - movs r0, #0x84 - strb r0, [r1] - movs r0, #0x12 - strb r0, [r4, #0x1c] - adds r5, r4, #0 - adds r5, #0x38 - ldrb r0, [r5] - cmp r0, #0 - bne _08082298 - adds r0, r4, #0 - bl sub_08016A30 -_08082298: - movs r1, #0x2e - ldrsh r0, [r4, r1] - ldr r7, _0808230C @ =gRoomControls - ldrh r1, [r7, #6] - subs r0, r0, r1 - asrs r0, r0, #4 - movs r6, #0x3f - ands r0, r6 - movs r2, #0x32 - ldrsh r1, [r4, r2] - ldrh r2, [r7, #8] - subs r1, r1, r2 - asrs r1, r1, #4 - ands r1, r6 - lsls r1, r1, #6 - orrs r0, r1 - ldrb r1, [r5] - bl sub_080001DA - adds r1, r4, #0 - adds r1, #0x70 - strh r0, [r1] - lsls r0, r0, #0x10 - lsrs r0, r0, #0x10 - movs r1, #0x80 - lsls r1, r1, #7 - mov r8, r1 - cmp r0, r8 - bne _080822D6 - bl DeleteThisEntity -_080822D6: - movs r2, #0x2e - ldrsh r1, [r4, r2] - ldrh r0, [r7, #6] - subs r1, r1, r0 - asrs r1, r1, #4 - ands r1, r6 - movs r2, #0x32 - ldrsh r0, [r4, r2] - ldrh r2, [r7, #8] - subs r0, r0, r2 - asrs r0, r0, #4 - ands r0, r6 - lsls r0, r0, #6 - orrs r1, r0 - ldrb r2, [r5] - mov r0, r8 - bl SetTile - adds r0, r4, #0 - movs r1, #5 - bl InitializeAnimation - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_08082308: .4byte gUnk_080FD338 -_0808230C: .4byte gRoomControls - - thumb_func_start sub_08082310 -sub_08082310: @ 0x08082310 - push {r4, r5, r6, r7, lr} - adds r5, r0, #0 - adds r0, #0x41 - ldrb r0, [r0] - movs r6, #0x7f - adds r1, r6, #0 - ands r1, r0 - cmp r1, #0x13 - beq _08082342 - cmp r1, #0x1d - beq _0808234C - adds r0, r5, #0 - bl GetTileTypeByEntity - adds r4, r0, #0 - movs r0, #0x80 - lsls r0, r0, #7 - cmp r4, r0 - bne _08082338 - b _080824F0 -_08082338: - adds r0, #1 - cmp r4, r0 - bhs _08082340 - b _08082484 -_08082340: - b _080823C4 -_08082342: - movs r1, #0 - movs r0, #3 - strb r0, [r5, #0xc] - strb r1, [r5, #0xd] - b _080824F6 -_0808234C: - adds r0, r5, #0 - adds r0, #0x70 - ldrh r0, [r0] - movs r2, #0x2e - ldrsh r1, [r5, r2] - ldr r3, _080823C0 @ =gRoomControls - ldrh r2, [r3, #6] - subs r1, r1, r2 - asrs r1, r1, #4 - movs r4, #0x3f - ands r1, r4 - movs r7, #0x32 - ldrsh r2, [r5, r7] - ldrh r3, [r3, #8] - subs r2, r2, r3 - asrs r2, r2, #4 - ands r2, r4 - lsls r2, r2, #6 - orrs r1, r2 - adds r2, r5, #0 - adds r2, #0x38 - ldrb r2, [r2] - bl SetTile - movs r1, #0 - movs r0, #5 - strb r0, [r5, #0xc] - movs r0, #0xa8 - lsls r0, r0, #0xa - str r0, [r5, #0x20] - adds r0, r5, #0 - adds r0, #0x63 - strb r1, [r0] - ldrb r1, [r5, #0x18] - movs r0, #0x31 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #0x10 - orrs r0, r1 - strb r0, [r5, #0x18] - adds r2, r5, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #0x39 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #0x18 - orrs r0, r1 - strb r0, [r2] - ldrb r1, [r5, #0x10] - adds r0, r6, #0 - ands r0, r1 - strb r0, [r5, #0x10] - adds r0, r5, #0 - bl sub_08082824 - b _080824F6 - .align 2, 0 -_080823C0: .4byte gRoomControls -_080823C4: - ldr r0, _080823D4 @ =0x00004004 - cmp r4, r0 - bls _080823D8 - adds r0, #0x63 - cmp r4, r0 - beq _08082448 - b _08082484 - .align 2, 0 -_080823D4: .4byte 0x00004004 -_080823D8: - ldr r1, _08082438 @ =0xFFFFBFFF - adds r0, r4, r1 - lsls r0, r0, #3 - strb r0, [r5, #0x15] - movs r0, #0x20 - strb r0, [r5, #0xe] - movs r0, #4 - strb r0, [r5, #0xc] - ldr r0, _0808243C @ =gLinkState - ldr r0, [r0, #0x30] - movs r1, #0x80 - ands r0, r1 - cmp r0, #0 - beq _08082400 - ldrh r0, [r5, #0x24] - lsls r0, r0, #0x10 - asrs r0, r0, #0x11 - strh r0, [r5, #0x24] - movs r0, #0x40 - strb r0, [r5, #0xe] -_08082400: - adds r0, r5, #0 - adds r0, #0x70 - ldrh r0, [r0] - movs r2, #0x2e - ldrsh r1, [r5, r2] - ldr r3, _08082440 @ =gRoomControls - ldrh r2, [r3, #6] - subs r1, r1, r2 - asrs r1, r1, #4 - movs r4, #0x3f - ands r1, r4 - movs r6, #0x32 - ldrsh r2, [r5, r6] - ldrh r3, [r3, #8] - subs r2, r2, r3 - asrs r2, r2, #4 - ands r2, r4 - lsls r2, r2, #6 - orrs r1, r2 - adds r2, r5, #0 - adds r2, #0x38 - ldrb r2, [r2] - bl SetTile - ldr r0, _08082444 @ =0x0000010F - bl sub_08004488 - b _080824F6 - .align 2, 0 -_08082438: .4byte 0xFFFFBFFF -_0808243C: .4byte gLinkState -_08082440: .4byte gRoomControls -_08082444: .4byte 0x0000010F -_08082448: - adds r0, r5, #0 - adds r0, #0x70 - ldrh r0, [r0] - movs r7, #0x2e - ldrsh r1, [r5, r7] - ldr r3, _08082480 @ =gRoomControls - ldrh r2, [r3, #6] - subs r1, r1, r2 - asrs r1, r1, #4 - movs r4, #0x3f - ands r1, r4 - movs r6, #0x32 - ldrsh r2, [r5, r6] - ldrh r3, [r3, #8] - subs r2, r2, r3 - asrs r2, r2, #4 - ands r2, r4 - lsls r2, r2, #6 - orrs r1, r2 - adds r2, r5, #0 - adds r2, #0x38 - ldrb r2, [r2] - bl SetTile - bl DeleteThisEntity - b _080824F6 - .align 2, 0 -_08082480: .4byte gRoomControls -_08082484: - adds r0, r5, #0 - bl sub_080002B8 - cmp r0, #0xd - bne _0808249A - adds r0, r5, #0 - movs r1, #0 - movs r2, #0 - bl CreateFx - b _080824D8 -_0808249A: - ldr r0, _080824E4 @ =0x00004005 - cmp r4, r0 - bne _080824D8 - ldr r0, _080824E8 @ =gLinkState - adds r0, #0xab - movs r1, #4 - strb r1, [r0] - adds r0, r5, #0 - adds r0, #0x70 - ldrh r0, [r0] - movs r7, #0x2e - ldrsh r1, [r5, r7] - ldr r3, _080824EC @ =gRoomControls - ldrh r2, [r3, #6] - subs r1, r1, r2 - asrs r1, r1, #4 - movs r4, #0x3f - ands r1, r4 - movs r6, #0x32 - ldrsh r2, [r5, r6] - ldrh r3, [r3, #8] - subs r2, r2, r3 - asrs r2, r2, #4 - ands r2, r4 - lsls r2, r2, #6 - orrs r1, r2 - adds r2, r5, #0 - adds r2, #0x38 - ldrb r2, [r2] - bl SetTile -_080824D8: - adds r0, r5, #0 - movs r1, #0 - bl sub_08082850 - b _080824F6 - .align 2, 0 -_080824E4: .4byte 0x00004005 -_080824E8: .4byte gLinkState -_080824EC: .4byte gRoomControls -_080824F0: - adds r0, r5, #0 - bl sub_08078930 -_080824F6: - pop {r4, r5, r6, r7, pc} - - thumb_func_start sub_080824F8 -sub_080824F8: @ 0x080824F8 - push {lr} - ldr r2, _0808250C @ =gUnk_0811F0A8 - ldrb r1, [r0, #0xd] - lsls r1, r1, #2 - adds r1, r1, r2 - ldr r1, [r1] - bl _call_via_r1 - pop {pc} - .align 2, 0 -_0808250C: .4byte gUnk_0811F0A8 - - thumb_func_start sub_08082510 -sub_08082510: @ 0x08082510 - push {r4, r5, r6, lr} - adds r5, r0, #0 - ldrb r1, [r5, #0x10] - movs r0, #0x80 - movs r2, #0 - orrs r0, r1 - strb r0, [r5, #0x10] - ldr r0, _08082578 @ =gUnk_080FD340 - str r0, [r5, #0x48] - adds r1, r5, #0 - adds r1, #0x3c - movs r0, #7 - strb r0, [r1] - adds r1, #3 - movs r0, #1 - strb r0, [r1] - ldr r0, _0808257C @ =gLinkEntity - adds r0, #0x3b - ldrb r0, [r0] - subs r1, #4 - strb r0, [r1] - adds r0, r5, #0 - adds r0, #0x63 - strb r2, [r0] - adds r0, #0xd - ldrh r0, [r0] - movs r2, #0x2e - ldrsh r1, [r5, r2] - ldr r3, _08082580 @ =gRoomControls - ldrh r2, [r3, #6] - subs r1, r1, r2 - asrs r1, r1, #4 - movs r4, #0x3f - ands r1, r4 - movs r6, #0x32 - ldrsh r2, [r5, r6] - ldrh r3, [r3, #8] - subs r2, r2, r3 - asrs r2, r2, #4 - ands r2, r4 - lsls r2, r2, #6 - orrs r1, r2 - adds r2, r5, #0 - adds r2, #0x38 - ldrb r2, [r2] - bl SetTile - ldrb r0, [r5, #0xd] - adds r0, #1 - strb r0, [r5, #0xd] - pop {r4, r5, r6, pc} - .align 2, 0 -_08082578: .4byte gUnk_080FD340 -_0808257C: .4byte gLinkEntity -_08082580: .4byte gRoomControls - - thumb_func_start nullsub_511 -nullsub_511: @ 0x08082584 - bx lr - .align 2, 0 - - thumb_func_start sub_08082588 -sub_08082588: @ 0x08082588 - adds r0, #0x29 - ldrb r2, [r0] - movs r1, #0x39 - rsbs r1, r1, #0 - ands r1, r2 - movs r2, #0x18 - orrs r1, r2 - strb r1, [r0] - bx lr - .align 2, 0 - - thumb_func_start sub_0808259C -sub_0808259C: @ 0x0808259C - push {r4, lr} - adds r4, r0, #0 - bl sub_080043E8 - cmp r0, #2 - beq _080825B8 - cmp r0, #2 - bhi _080825B2 - cmp r0, #1 - beq _080825BE - b _080825D0 -_080825B2: - cmp r0, #3 - beq _080825C4 - b _080825D0 -_080825B8: - adds r0, r4, #0 - movs r1, #0xb - b _080825C8 -_080825BE: - adds r0, r4, #0 - movs r1, #0 - b _080825C8 -_080825C4: - adds r0, r4, #0 - movs r1, #0xc -_080825C8: - movs r2, #0 - bl CreateFx - b _080825E0 -_080825D0: - ldr r1, _080825DC @ =gLinkEntity - adds r0, r4, #0 - bl sub_08082850 - b _080825E4 - .align 2, 0 -_080825DC: .4byte gLinkEntity -_080825E0: - bl DeleteThisEntity -_080825E4: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_080825E8 -sub_080825E8: @ 0x080825E8 - push {lr} - bl DeleteThisEntity - pop {pc} - - thumb_func_start sub_080825F0 -sub_080825F0: @ 0x080825F0 - push {lr} - adds r1, r0, #0 - ldr r0, _08082604 @ =gLinkState - ldrb r0, [r0, #5] - cmp r0, #0 - bne _08082602 - adds r0, r1, #0 - bl sub_08082608 -_08082602: - pop {pc} - .align 2, 0 -_08082604: .4byte gLinkState - - thumb_func_start sub_08082608 -sub_08082608: @ 0x08082608 - movs r2, #0 - movs r1, #1 - strb r1, [r0, #0xc] - strb r2, [r0, #0xd] - bx lr - .align 2, 0 - thumb_func_start sub_08082614 sub_08082614: @ 0x08082614 push {r4, r5, r6, r7, lr} @@ -562,7 +30,7 @@ _08082638: bne _080826DC movs r0, #1 strb r0, [r5, #0xc] - ldr r0, _080826A4 @ =gLinkState + ldr r0, _080826A4 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -607,7 +75,7 @@ _08082658: bl sub_08082850 b _080826DC .align 2, 0 -_080826A4: .4byte gLinkState +_080826A4: .4byte gPlayerState _080826A8: .4byte gRoomControls _080826AC: movs r0, #0x80 @@ -665,7 +133,7 @@ sub_080826FC: @ 0x080826FC sub_0808270C: @ 0x0808270C push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r0, _08082768 @ =gLinkState + ldr r0, _08082768 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -709,7 +177,7 @@ _0808272A: bl SetTile b _08082776 .align 2, 0 -_08082768: .4byte gLinkState +_08082768: .4byte gPlayerState _0808276C: .4byte gRoomControls _08082770: adds r0, r5, #0 @@ -757,7 +225,7 @@ sub_08082778: @ 0x08082778 ldrb r2, [r2] bl SetTile _080827C4: - ldr r0, _080827EC @ =gLinkState + ldr r0, _080827EC @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -777,7 +245,7 @@ _080827DE: b _080827F6 .align 2, 0 _080827E8: .4byte gRoomControls -_080827EC: .4byte gLinkState +_080827EC: .4byte gPlayerState _080827F0: adds r0, r5, #0 bl sub_0806F3E4 @@ -788,7 +256,7 @@ _080827F6: sub_080827F8: @ 0x080827F8 push {lr} adds r1, r0, #0 - ldr r0, _08082810 @ =gLinkState + ldr r0, _08082810 @ =gPlayerState ldrb r0, [r0, #0x1c] cmp r0, #0 bne _0808280C @@ -798,7 +266,7 @@ sub_080827F8: @ 0x080827F8 _0808280C: pop {pc} .align 2, 0 -_08082810: .4byte gLinkState +_08082810: .4byte gPlayerState thumb_func_start nullsub_512 nullsub_512: @ 0x08082814 diff --git a/asm/pullableLever.s b/asm/pullableLever.s index 538bbf7a..c3092d74 100644 --- a/asm/pullableLever.s +++ b/asm/pullableLever.s @@ -215,7 +215,7 @@ _0809137C: .4byte gUnk_081222B0 sub_08091380: @ 0x08091380 push {r4, r5, r6, r7, lr} adds r4, r0, #0 - ldr r7, _0809142C @ =gLinkEntity + ldr r7, _0809142C @ =gPlayerEntity adds r0, #0x75 ldrb r0, [r0] cmp r0, #0 @@ -267,7 +267,7 @@ _080913E0: ldrb r3, [r4, #0xb] cmp r0, r3 bne _0809142A - ldr r1, _08091434 @ =gLinkState + ldr r1, _08091434 @ =gPlayerState adds r0, r1, #0 adds r0, #0xa8 ldrb r0, [r0] @@ -279,7 +279,7 @@ _080913E0: ands r0, r1 cmp r0, #0 beq _0809142A - ldr r0, _0809142C @ =gLinkEntity + ldr r0, _0809142C @ =gPlayerEntity adds r0, #0x5a ldrb r1, [r0] adds r0, r5, #0 @@ -300,9 +300,9 @@ _080913E0: _0809142A: pop {r4, r5, r6, r7, pc} .align 2, 0 -_0809142C: .4byte gLinkEntity +_0809142C: .4byte gPlayerEntity _08091430: .4byte gUnk_081222B8 -_08091434: .4byte gLinkState +_08091434: .4byte gPlayerState thumb_func_start sub_08091438 sub_08091438: @ 0x08091438 @@ -458,7 +458,7 @@ sub_0809153C: @ 0x0809153C push {r6, r7} sub sp, #4 adds r5, r0, #0 - ldr r6, _080915A8 @ =gLinkEntity + ldr r6, _080915A8 @ =gPlayerEntity ldr r1, _080915AC @ =gUnk_081222C0 ldrb r0, [r5, #0xb] adds r0, r0, r1 @@ -506,7 +506,7 @@ _08091596: beq _080915BA b _080915E0 .align 2, 0 -_080915A8: .4byte gLinkEntity +_080915A8: .4byte gPlayerEntity _080915AC: .4byte gUnk_081222C0 _080915B0: cmp r0, #2 diff --git a/asm/pullableMushroom.s b/asm/pullableMushroom.s index a6ca50ef..9390dd8d 100644 --- a/asm/pullableMushroom.s +++ b/asm/pullableMushroom.s @@ -603,7 +603,7 @@ _0808AE80: sub_0808AE84: @ 0x0808AE84 push {lr} adds r2, r0, #0 - ldr r0, _0808AEA8 @ =gLinkState + ldr r0, _0808AEA8 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _0808AE94 @@ -620,7 +620,7 @@ _0808AE94: bl _call_via_r1 pop {pc} .align 2, 0 -_0808AEA8: .4byte gLinkState +_0808AEA8: .4byte gPlayerState _0808AEAC: .4byte gUnk_081211DC thumb_func_start sub_0808AEB0 @@ -634,7 +634,7 @@ sub_0808AEB0: @ 0x0808AEB0 adds r0, r4, #0 bl sub_0808B1F0 adds r6, r0, #0 - ldr r5, _0808AF10 @ =gLinkState + ldr r5, _0808AF10 @ =gPlayerState adds r2, r5, #0 adds r2, #0x90 ldr r1, _0808AF14 @ =gUnk_081211E4 @@ -650,7 +650,7 @@ sub_0808AEB0: @ 0x0808AEB0 bl GetNextFrame cmp r6, #0x3f bhi _0808AF08 - ldr r0, _0808AF18 @ =gLinkEntity + ldr r0, _0808AF18 @ =gPlayerEntity ldrb r2, [r4, #0x15] movs r1, #0x40 bl sub_080044AE @@ -670,15 +670,15 @@ _0808AF08: strb r0, [r4, #0xf] b _0808AFD0 .align 2, 0 -_0808AF10: .4byte gLinkState +_0808AF10: .4byte gPlayerState _0808AF14: .4byte gUnk_081211E4 -_0808AF18: .4byte gLinkEntity +_0808AF18: .4byte gPlayerEntity _0808AF1C: .4byte 0x0000012F _0808AF20: ldrb r0, [r4, #0xf] cmp r0, #0 beq _0808AFD0 - ldr r2, _0808AF64 @ =gLinkEntity + ldr r2, _0808AF64 @ =gPlayerEntity ldrb r0, [r2, #0xc] cmp r0, #1 bne _0808AFD0 @@ -709,12 +709,12 @@ _0808AF20: strb r0, [r4, #0xd] b _0808AFD0 .align 2, 0 -_0808AF64: .4byte gLinkEntity +_0808AF64: .4byte gPlayerEntity _0808AF68: movs r6, #1 strb r6, [r4, #0xe] str r6, [r4, #0x7c] - ldr r5, _0808AFC8 @ =gLinkEntity + ldr r5, _0808AFC8 @ =gPlayerEntity ldrb r0, [r5, #0x14] lsrs r0, r0, #1 movs r1, #2 @@ -757,7 +757,7 @@ _0808AFB6: strh r0, [r5, #0x32] b _0808AFD0 .align 2, 0 -_0808AFC8: .4byte gLinkEntity +_0808AFC8: .4byte gPlayerEntity _0808AFCC: ldrh r0, [r4, #0x2e] strh r0, [r5, #0x2e] @@ -792,7 +792,7 @@ sub_0808AFF0: @ 0x0808AFF0 ldr r1, [r0] adds r0, r4, #0 bl _call_via_r1 - ldr r0, _0808B058 @ =gLinkState + ldr r0, _0808B058 @ =gPlayerState ldrb r1, [r0, #0x1c] movs r0, #0xf ands r0, r1 @@ -834,7 +834,7 @@ _0808B050: pop {r4, r5, pc} .align 2, 0 _0808B054: .4byte gUnk_081211EC -_0808B058: .4byte gLinkState +_0808B058: .4byte gPlayerState thumb_func_start sub_0808B05C sub_0808B05C: @ 0x0808B05C @@ -843,7 +843,7 @@ sub_0808B05C: @ 0x0808B05C ldrb r0, [r4, #0xa] cmp r0, #0 bne _0808B0AE - ldr r2, _0808B0B8 @ =gLinkEntity + ldr r2, _0808B0B8 @ =gPlayerEntity ldrb r0, [r2, #0x14] lsrs r0, r0, #1 movs r1, #2 @@ -882,7 +882,7 @@ _0808B0AE: strb r0, [r4, #0xd] pop {r4, pc} .align 2, 0 -_0808B0B8: .4byte gLinkEntity +_0808B0B8: .4byte gPlayerEntity thumb_func_start sub_0808B0BC sub_0808B0BC: @ 0x0808B0BC @@ -903,7 +903,7 @@ _0808B0D6: bl GetNextFrame b _0808B162 _0808B0DE: - ldr r6, _0808B148 @ =gLinkEntity + ldr r6, _0808B148 @ =gPlayerEntity ldrb r0, [r6, #0x14] movs r1, #0xe ands r1, r0 @@ -930,7 +930,7 @@ _0808B0DE: ldrb r0, [r6, #0xc] cmp r0, #1 bne _0808B162 - ldr r4, _0808B150 @ =gLinkState + ldr r4, _0808B150 @ =gPlayerState adds r0, r4, #0 adds r0, #0x26 ldrb r0, [r0] @@ -955,9 +955,9 @@ _0808B0DE: strb r0, [r1] b _0808B162 .align 2, 0 -_0808B148: .4byte gLinkEntity +_0808B148: .4byte gPlayerEntity _0808B14C: .4byte gUnk_08126EE4 -_0808B150: .4byte gLinkState +_0808B150: .4byte gPlayerState _0808B154: movs r0, #0x40 strh r0, [r5, #0x24] @@ -994,7 +994,7 @@ _0808B188: ands r0, r1 cmp r0, #0 beq _0808B1B8 - ldr r5, _0808B1AC @ =gLinkEntity + ldr r5, _0808B1AC @ =gPlayerEntity ldr r4, [r3, #0x50] ldrb r1, [r3, #0x14] lsls r2, r1, #1 @@ -1007,12 +1007,12 @@ _0808B188: adds r1, r1, r0 b _0808B1CE .align 2, 0 -_0808B1AC: .4byte gLinkEntity +_0808B1AC: .4byte gPlayerEntity _0808B1B0: .4byte gUnk_081211FC _0808B1B4: .4byte gUnk_081211F5 _0808B1B8: ldr r5, [r3, #0x50] - ldr r4, _0808B1E4 @ =gLinkEntity + ldr r4, _0808B1E4 @ =gPlayerEntity movs r0, #2 eors r0, r1 lsls r0, r0, #1 @@ -1035,7 +1035,7 @@ _0808B1CE: strh r0, [r3, #0x32] pop {r4, r5, pc} .align 2, 0 -_0808B1E4: .4byte gLinkEntity +_0808B1E4: .4byte gPlayerEntity _0808B1E8: .4byte gUnk_081211F4 _0808B1EC: .4byte gUnk_081211FD diff --git a/asm/pushableFurniture.s b/asm/pushableFurniture.s index 64069d3e..13c9d1d7 100644 --- a/asm/pushableFurniture.s +++ b/asm/pushableFurniture.s @@ -510,7 +510,7 @@ _0808FD1A: movs r0, #0x18 _0808FD1C: strb r0, [r4, #0xe] - ldr r0, _0808FD3C @ =gLinkState + ldr r0, _0808FD3C @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -525,7 +525,7 @@ _0808FD30: movs r0, #1 b _0808FD42 .align 2, 0 -_0808FD3C: .4byte gLinkState +_0808FD3C: .4byte gPlayerState _0808FD40: movs r0, #0 _0808FD42: @@ -558,7 +558,7 @@ _0808FD6C: adds r0, #0x70 _0808FD70: ldrh r5, [r0] - ldr r0, _0808FD84 @ =gLinkState + ldr r0, _0808FD84 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -568,7 +568,7 @@ _0808FD70: strh r0, [r4, #0x24] b _0808FDB2 .align 2, 0 -_0808FD84: .4byte gLinkState +_0808FD84: .4byte gPlayerState _0808FD88: strh r1, [r4, #0x24] movs r0, #0x10 @@ -577,7 +577,7 @@ _0808FD8E: adds r0, r4, #0 adds r0, #0x7c ldrh r5, [r0] - ldr r0, _0808FDAC @ =gLinkState + ldr r0, _0808FDAC @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -589,7 +589,7 @@ _0808FD8E: strb r1, [r4, #0xe] b _0808FDB6 .align 2, 0 -_0808FDAC: .4byte gLinkState +_0808FDAC: .4byte gPlayerState _0808FDB0: strh r1, [r4, #0x24] _0808FDB2: @@ -737,13 +737,13 @@ sub_0808FECC: @ 0x0808FECC push {r4, r5, lr} adds r2, r0, #0 movs r4, #1 - ldr r0, _0808FF18 @ =gLinkState + ldr r0, _0808FF18 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 cmp r0, #0 bne _0808FF10 - ldr r3, _0808FF1C @ =gLinkEntity + ldr r3, _0808FF1C @ =gPlayerEntity ldrb r0, [r3, #0xc] cmp r0, #6 bne _0808FF10 @@ -774,8 +774,8 @@ _0808FF12: adds r0, r4, #0 pop {r4, r5, pc} .align 2, 0 -_0808FF18: .4byte gLinkState -_0808FF1C: .4byte gLinkEntity +_0808FF18: .4byte gPlayerState +_0808FF1C: .4byte gPlayerEntity thumb_func_start sub_0808FF20 sub_0808FF20: @ 0x0808FF20 diff --git a/asm/pushableGrave.s b/asm/pushableGrave.s index c94d5a33..89e6e5fb 100644 --- a/asm/pushableGrave.s +++ b/asm/pushableGrave.s @@ -300,7 +300,7 @@ _080977C8: cmp r0, #0 bne _080977E4 ldr r0, _080977E8 @ =gRoomControls - ldr r1, _080977EC @ =gLinkEntity + ldr r1, _080977EC @ =gPlayerEntity str r1, [r0, #0x30] movs r1, #4 strb r1, [r0, #0xe] @@ -308,7 +308,7 @@ _080977E4: pop {r4, pc} .align 2, 0 _080977E8: .4byte gRoomControls -_080977EC: .4byte gLinkEntity +_080977EC: .4byte gPlayerEntity thumb_func_start nullsub_528 nullsub_528: @ 0x080977F0 diff --git a/asm/pushableLever.s b/asm/pushableLever.s index ac80275e..1109088d 100644 --- a/asm/pushableLever.s +++ b/asm/pushableLever.s @@ -69,7 +69,7 @@ sub_08098294: @ 0x08098294 bl sub_08079F8C cmp r0, #0 beq _080982FA - ldr r2, _080982FC @ =gLinkState + ldr r2, _080982FC @ =gPlayerState movs r0, #0x90 strb r0, [r2, #6] movs r0, #5 @@ -78,7 +78,7 @@ sub_08098294: @ 0x08098294 movs r1, #1 orrs r0, r1 str r0, [r2, #0x30] - ldr r1, _08098300 @ =gLinkEntity + ldr r1, _08098300 @ =gPlayerEntity strh r5, [r1, #0x2c] strh r5, [r1, #0x30] ldrb r0, [r1, #0x14] @@ -87,8 +87,8 @@ sub_08098294: @ 0x08098294 _080982FA: pop {r4, r5, pc} .align 2, 0 -_080982FC: .4byte gLinkState -_08098300: .4byte gLinkEntity +_080982FC: .4byte gPlayerState +_08098300: .4byte gPlayerEntity thumb_func_start sub_08098304 sub_08098304: @ 0x08098304 diff --git a/asm/pushableStatue.s b/asm/pushableStatue.s index 370a535f..2e013531 100644 --- a/asm/pushableStatue.s +++ b/asm/pushableStatue.s @@ -136,7 +136,7 @@ sub_080892C4: @ 0x080892C4 bl sub_080895C0 b _080892F6 _080892D8: - ldr r0, _080892F8 @ =gLinkState + ldr r0, _080892F8 @ =gPlayerState ldrb r0, [r0, #5] cmp r0, #0 bne _080892E4 @@ -154,7 +154,7 @@ _080892E4: _080892F6: pop {pc} .align 2, 0 -_080892F8: .4byte gLinkState +_080892F8: .4byte gPlayerState _080892FC: .4byte gUnk_08120CAC thumb_func_start sub_08089300 @@ -168,7 +168,7 @@ sub_08089300: @ 0x08089300 bne _0808932C movs r0, #1 strb r0, [r1] - ldr r1, _0808935C @ =gLinkEntity + ldr r1, _0808935C @ =gPlayerEntity ldrb r0, [r1, #0x14] ldr r2, _08089360 @ =gUnk_08120CB4 adds r0, r0, r2 @@ -203,7 +203,7 @@ _0808932C: beq _0808939A b _080893A0 .align 2, 0 -_0808935C: .4byte gLinkEntity +_0808935C: .4byte gPlayerEntity _08089360: .4byte gUnk_08120CB4 _08089364: .4byte 0x0000400B _08089368: @@ -238,7 +238,7 @@ _080893A0: bl sub_080896B0 cmp r0, #0 beq _080893D6 - ldr r2, _080893D8 @ =gLinkState + ldr r2, _080893D8 @ =gPlayerState movs r3, #0 movs r0, #0x10 strb r0, [r2, #0xc] @@ -250,7 +250,7 @@ _080893A0: movs r1, #1 orrs r0, r1 str r0, [r2, #0x30] - ldr r0, _080893DC @ =gLinkEntity + ldr r0, _080893DC @ =gPlayerEntity strh r3, [r0, #0x2c] strh r3, [r0, #0x30] ldrb r0, [r0, #0x14] @@ -263,8 +263,8 @@ _080893A0: _080893D6: pop {r4, r5, pc} .align 2, 0 -_080893D8: .4byte gLinkState -_080893DC: .4byte gLinkEntity +_080893D8: .4byte gPlayerState +_080893DC: .4byte gPlayerEntity thumb_func_start sub_080893E0 sub_080893E0: @ 0x080893E0 @@ -651,13 +651,13 @@ _080896AC: thumb_func_start sub_080896B0 sub_080896B0: @ 0x080896B0 push {r4, r5, r6, r7, lr} - ldr r0, _08089750 @ =gLinkState + ldr r0, _08089750 @ =gPlayerState ldrb r1, [r0, #5] movs r0, #0x1f ands r0, r1 cmp r0, #0x12 bne _08089768 - ldr r6, _08089754 @ =gLinkEntity + ldr r6, _08089754 @ =gPlayerEntity adds r0, r6, #0 adds r0, #0x5a ldrb r1, [r0] @@ -729,8 +729,8 @@ sub_080896B0: @ 0x080896B0 movs r0, #1 b _0808976A .align 2, 0 -_08089750: .4byte gLinkState -_08089754: .4byte gLinkEntity +_08089750: .4byte gPlayerState +_08089754: .4byte gPlayerEntity _08089758: .4byte gUnk_080B4468 _0808975C: .4byte gUnk_080B4488 _08089760: .4byte gRoomControls diff --git a/asm/respawnLink.s b/asm/respawnPlayer.s similarity index 83% rename from asm/respawnLink.s rename to asm/respawnPlayer.s index 92951a5e..0d488ede 100644 --- a/asm/respawnLink.s +++ b/asm/respawnPlayer.s @@ -6,8 +6,8 @@ .text - thumb_func_start ResetLink -ResetLink: @ 0x08077B2C + thumb_func_start ResetPlayer +ResetPlayer: @ 0x08077B2C push {r4, r5, lr} movs r4, #0 ldr r5, _08077B88 @ =gUnk_03000B80 @@ -19,7 +19,7 @@ _08077B32: adds r4, #1 cmp r4, #2 bls _08077B32 - ldr r2, _08077B8C @ =gLinkState + ldr r2, _08077B8C @ =gPlayerState adds r0, r2, #0 adds r0, #0x3d movs r3, #0 @@ -37,7 +37,7 @@ _08077B32: ldr r1, _08077B90 @ =0xF7FBFFFF ands r0, r1 str r0, [r2, #0x30] - ldr r0, _08077B94 @ =gLinkEntity + ldr r0, _08077B94 @ =gPlayerEntity str r3, [r0, #0x70] ldrb r1, [r2, #2] movs r0, #0xc0 @@ -58,6 +58,6 @@ _08077B86: pop {r4, r5, pc} .align 2, 0 _08077B88: .4byte gUnk_03000B80 -_08077B8C: .4byte gLinkState +_08077B8C: .4byte gPlayerState _08077B90: .4byte 0xF7FBFFFF -_08077B94: .4byte gLinkEntity \ No newline at end of file +_08077B94: .4byte gPlayerEntity \ No newline at end of file diff --git a/asm/rockChuchu.s b/asm/rockChuchu.s index 170f4f65..1d4bcc7b 100644 --- a/asm/rockChuchu.s +++ b/asm/rockChuchu.s @@ -79,7 +79,7 @@ _08022280: @ jump table .4byte _08022356 @ case 23 .4byte _080222F2 @ case 24 _080222E4: - ldr r0, _08022340 @ =gLinkState + ldr r0, _08022340 @ =gPlayerState adds r0, #0xac ldrh r1, [r0] movs r0, #8 @@ -124,7 +124,7 @@ _080222F2: str r5, [r4, #0x54] b _08022356 .align 2, 0 -_08022340: .4byte gLinkState +_08022340: .4byte gPlayerState _08022344: adds r0, r4, #0 adds r0, #0x3f diff --git a/asm/rollobite.s b/asm/rollobite.s index c7c48300..916f1612 100644 --- a/asm/rollobite.s +++ b/asm/rollobite.s @@ -338,7 +338,7 @@ sub_0802088C: @ 0x0802088C movs r1, #0x7f ands r1, r2 strb r1, [r0, #0x10] - ldr r1, _080208B0 @ =gLinkEntity + ldr r1, _080208B0 @ =gPlayerEntity ldrb r1, [r1, #0x14] adds r2, r0, #0 adds r2, #0x85 @@ -351,7 +351,7 @@ sub_0802088C: @ 0x0802088C strb r1, [r0] bx lr .align 2, 0 -_080208B0: .4byte gLinkEntity +_080208B0: .4byte gPlayerEntity thumb_func_start sub_080208B4 sub_080208B4: @ 0x080208B4 @@ -360,7 +360,7 @@ sub_080208B4: @ 0x080208B4 adds r4, r2, #0 adds r4, #0x85 ldrb r0, [r4] - ldr r5, _080208EC @ =gLinkEntity + ldr r5, _080208EC @ =gPlayerEntity ldrb r1, [r5, #0x14] subs r0, r0, r1 lsrs r1, r0, #0x1f @@ -384,7 +384,7 @@ _080208E6: strb r0, [r4] pop {r4, r5, pc} .align 2, 0 -_080208EC: .4byte gLinkEntity +_080208EC: .4byte gPlayerEntity thumb_func_start sub_080208F0 sub_080208F0: @ 0x080208F0 diff --git a/asm/ropeGolden.s b/asm/ropeGolden.s index f61b871f..52f63737 100644 --- a/asm/ropeGolden.s +++ b/asm/ropeGolden.s @@ -125,7 +125,7 @@ sub_0803827C: @ 0x0803827C strb r0, [r4, #0xf] b _080382BC _0803828C: - ldr r5, _080382B8 @ =gLinkEntity + ldr r5, _080382B8 @ =gPlayerEntity adds r0, r4, #0 adds r1, r5, #0 movs r2, #8 @@ -146,7 +146,7 @@ _080382B0: bl sub_080383E4 b _080382E8 .align 2, 0 -_080382B8: .4byte gLinkEntity +_080382B8: .4byte gPlayerEntity _080382BC: adds r0, r4, #0 movs r1, #2 @@ -283,7 +283,7 @@ sub_080383AC: @ 0x080383AC strb r0, [r4, #0xe] adds r0, #0xf8 strh r0, [r4, #0x24] - ldr r1, _080383E0 @ =gLinkEntity + ldr r1, _080383E0 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r0, #4 @@ -300,7 +300,7 @@ sub_080383AC: @ 0x080383AC _080383DC: pop {r4, pc} .align 2, 0 -_080383E0: .4byte gLinkEntity +_080383E0: .4byte gPlayerEntity thumb_func_start sub_080383E4 sub_080383E4: @ 0x080383E4 @@ -313,7 +313,7 @@ sub_080383E4: @ 0x080383E4 movs r0, #0xa0 lsls r0, r0, #2 strh r0, [r4, #0x24] - ldr r1, _0803842C @ =gLinkEntity + ldr r1, _0803842C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r0, #4 @@ -339,4 +339,4 @@ sub_080383E4: @ 0x080383E4 bl InitializeAnimation pop {r4, pc} .align 2, 0 -_0803842C: .4byte gLinkEntity +_0803842C: .4byte gPlayerEntity diff --git a/asm/sittingPerson.s b/asm/sittingPerson.s index 127bf469..006c76a4 100644 --- a/asm/sittingPerson.s +++ b/asm/sittingPerson.s @@ -89,7 +89,7 @@ sub_080637B8: @ 0x080637B8 adds r1, r4, #0 adds r1, #0x69 strb r0, [r1] - ldr r1, _08063800 @ =gLinkEntity + ldr r1, _08063800 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -106,7 +106,7 @@ _080637F2: bl sub_0806F118 b _0806382E .align 2, 0 -_08063800: .4byte gLinkEntity +_08063800: .4byte gPlayerEntity _08063804: adds r0, r4, #0 movs r1, #0 diff --git a/asm/smallTownMinish.s b/asm/smallTownMinish.s index 9b2484b7..378276a4 100644 --- a/asm/smallTownMinish.s +++ b/asm/smallTownMinish.s @@ -33,7 +33,7 @@ _0806E2A8: movs r1, #0 bl sub_0807DD94 _0806E2B0: - ldr r0, _0806E2CC @ =gLinkState + ldr r0, _0806E2CC @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -47,7 +47,7 @@ _0806E2B0: strb r1, [r4, #0x18] b _0806E2DA .align 2, 0 -_0806E2CC: .4byte gLinkState +_0806E2CC: .4byte gPlayerState _0806E2D0: ldrb r1, [r4, #0x18] movs r0, #4 diff --git a/asm/specialFx.s b/asm/specialFx.s index 214abdc2..132bd8f9 100644 --- a/asm/specialFx.s +++ b/asm/specialFx.s @@ -449,7 +449,7 @@ sub_080847E0: @ 0x080847E0 bne _080847F0 bl DeleteThisEntity _080847F0: - ldr r4, _08084818 @ =gLinkEntity + ldr r4, _08084818 @ =gPlayerEntity ldr r3, _0808481C @ =0xFFFD0000 adds r0, r4, #0 adds r1, r5, #0 @@ -465,6 +465,6 @@ _080847F0: pop {r4, r5, pc} .align 2, 0 _08084814: .4byte gRoomControls -_08084818: .4byte gLinkEntity +_08084818: .4byte gPlayerEntity _0808481C: .4byte 0xFFFD0000 _08084820: .4byte 0x0000FFFD diff --git a/asm/spinyBeetle.s b/asm/spinyBeetle.s index 00fc6513..8a910315 100644 --- a/asm/spinyBeetle.s +++ b/asm/spinyBeetle.s @@ -292,34 +292,34 @@ _080339C6: beq _08033A72 movs r1, #0x32 ldrsh r0, [r4, r1] - ldr r1, _080339DC @ =gLinkEntity + ldr r1, _080339DC @ =gPlayerEntity movs r2, #0x32 ldrsh r1, [r1, r2] b _08033A0A .align 2, 0 -_080339DC: .4byte gLinkEntity +_080339DC: .4byte gPlayerEntity _080339E0: - ldr r0, _080339EC @ =gLinkEntity + ldr r0, _080339EC @ =gPlayerEntity movs r1, #0x32 ldrsh r0, [r0, r1] movs r2, #0x32 ldrsh r1, [r4, r2] b _08033A0A .align 2, 0 -_080339EC: .4byte gLinkEntity +_080339EC: .4byte gPlayerEntity _080339F0: - ldr r0, _080339FC @ =gLinkEntity + ldr r0, _080339FC @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r0, r1] movs r2, #0x2e ldrsh r1, [r4, r2] b _08033A0A .align 2, 0 -_080339FC: .4byte gLinkEntity +_080339FC: .4byte gPlayerEntity _08033A00: movs r1, #0x2e ldrsh r0, [r4, r1] - ldr r1, _08033A74 @ =gLinkEntity + ldr r1, _08033A74 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r1, r2] _08033A0A: @@ -378,7 +378,7 @@ _08033A2C: _08033A72: pop {r4, r5, pc} .align 2, 0 -_08033A74: .4byte gLinkEntity +_08033A74: .4byte gPlayerEntity _08033A78: .4byte 0xFFF00000 thumb_func_start sub_08033A7C @@ -942,7 +942,7 @@ _08033EA4: .4byte 0xFFF00000 sub_08033EA8: @ 0x08033EA8 push {lr} adds r2, r0, #0 - ldr r0, _08033EC4 @ =gLinkState + ldr r0, _08033EC4 @ =gPlayerState adds r0, #0xac ldrh r1, [r0] movs r0, #8 @@ -954,7 +954,7 @@ sub_08033EA8: @ 0x08033EA8 movs r0, #0x95 b _08033ECE .align 2, 0 -_08033EC4: .4byte gLinkState +_08033EC4: .4byte gPlayerState _08033EC8: adds r1, r2, #0 adds r1, #0x3f diff --git a/asm/stairsInteract.s b/asm/stairsInteract.s index 5c7e720c..6a20386a 100644 --- a/asm/stairsInteract.s +++ b/asm/stairsInteract.s @@ -28,7 +28,7 @@ sub_080731D8: @ 0x080731D8 orrs r0, r7 strh r0, [r4, #0x2e] strh r2, [r4, #0x2c] - ldr r6, _08073214 @ =gLinkState + ldr r6, _08073214 @ =gPlayerState adds r0, r6, #0 adds r0, #0x38 ldrb r0, [r0] @@ -38,7 +38,7 @@ sub_080731D8: @ 0x080731D8 strb r0, [r4, #0xd] b _0807329A .align 2, 0 -_08073214: .4byte gLinkState +_08073214: .4byte gPlayerState _08073218: ldrb r0, [r4, #0x18] movs r1, #3 @@ -103,7 +103,7 @@ _08073294: adds r0, r4, #0 bl sub_08066DE4 _0807329A: - ldr r2, _080732AC @ =gLinkState + ldr r2, _080732AC @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #8 ands r0, r1 @@ -112,7 +112,7 @@ _0807329A: ldr r0, _080732B0 @ =0x00000404 b _080732B8 .align 2, 0 -_080732AC: .4byte gLinkState +_080732AC: .4byte gPlayerState _080732B0: .4byte 0x00000404 _080732B4: movs r0, #0x82 @@ -123,7 +123,7 @@ _080732B8: movs r0, #0 str r0, [r1, #0x30] bl sub_0807A108 - bl ResetLink + bl ResetPlayer pop {r4, r5, r6, r7, pc} .align 2, 0 _080732CC: .4byte gRoomControls diff --git a/asm/stalfos.s b/asm/stalfos.s index a751e19b..a8bb51a1 100644 --- a/asm/stalfos.s +++ b/asm/stalfos.s @@ -332,7 +332,7 @@ _0803950A: strb r0, [r4, #0xc] movs r0, #0xff strb r0, [r4, #0x15] - ldr r1, _0803952C @ =gLinkEntity + ldr r1, _0803952C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r0, #4 @@ -345,7 +345,7 @@ _0803950A: _0803952A: pop {r4, pc} .align 2, 0 -_0803952C: .4byte gLinkEntity +_0803952C: .4byte gPlayerEntity thumb_func_start sub_08039530 sub_08039530: @ 0x08039530 @@ -847,13 +847,13 @@ sub_080398C0: @ 0x080398C0 bl sub_0806FCB8 cmp r0, #0 beq _08039908 - ldr r1, _08039904 @ =gLinkEntity + ldr r1, _08039904 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection b _08039928 .align 2, 0 _08039900: .4byte gUnk_020000B0 -_08039904: .4byte gLinkEntity +_08039904: .4byte gPlayerEntity _08039908: adds r0, r4, #0 bl sub_08049FA0 diff --git a/asm/steam.s b/asm/steam.s index 912b1189..bb80c5e1 100644 --- a/asm/steam.s +++ b/asm/steam.s @@ -71,7 +71,7 @@ _080981DA: adds r3, #0x68 cmp r0, #0 beq _08098222 - ldr r0, _0809820C @ =gLinkEntity + ldr r0, _0809820C @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] ldr r0, _08098210 @ =gRoomControls @@ -90,7 +90,7 @@ _080981DA: b _08098220 .align 2, 0 _08098208: .4byte 0x00000808 -_0809820C: .4byte gLinkEntity +_0809820C: .4byte gPlayerEntity _08098210: .4byte gRoomControls _08098214: ldrb r1, [r3] diff --git a/asm/stockwell.s b/asm/stockwell.s index 03e0c55a..013f39ac 100644 --- a/asm/stockwell.s +++ b/asm/stockwell.s @@ -352,7 +352,7 @@ sub_080652E4: @ 0x080652E4 strb r0, [r1, #0xe] b _08065308 _080652F4: - ldr r0, _0806530C @ =gLinkEntity + ldr r0, _0806530C @ =gPlayerEntity ldrb r0, [r0, #0xc] cmp r0, #8 beq _08065308 @@ -364,7 +364,7 @@ _080652F4: _08065308: pop {pc} .align 2, 0 -_0806530C: .4byte gLinkEntity +_0806530C: .4byte gPlayerEntity _08065310: .4byte 0x00002C19 thumb_func_start sub_08065314 diff --git a/asm/sturgeon.s b/asm/sturgeon.s index e6413097..6537ba17 100644 --- a/asm/sturgeon.s +++ b/asm/sturgeon.s @@ -71,7 +71,7 @@ _08064B00: orrs r0, r1 strb r0, [r4, #0xc] strb r3, [r2] - ldr r1, _08064B30 @ =gLinkEntity + ldr r1, _08064B30 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -82,7 +82,7 @@ _08064B00: bl sub_0806F118 b _08064B42 .align 2, 0 -_08064B30: .4byte gLinkEntity +_08064B30: .4byte gPlayerEntity _08064B34: adds r0, r4, #0 movs r1, #0 diff --git a/asm/sub_080A276C.s b/asm/sub_080A276C.s index bc815c28..9eac5420 100644 --- a/asm/sub_080A276C.s +++ b/asm/sub_080A276C.s @@ -33,7 +33,7 @@ sub_080A276C: @ 0x080A276C adds r0, r6, #0 movs r1, #6 bl sub_0805EA78 - ldr r4, _080A2828 @ =gLinkEntity + ldr r4, _080A2828 @ =gPlayerEntity adds r0, r4, #0 adds r1, r6, #0 bl CopyPosition @@ -57,7 +57,7 @@ sub_080A276C: @ 0x080A276C ldrb r0, [r0] adds r1, #2 strb r0, [r1] - ldr r1, _080A2834 @ =gLinkState + ldr r1, _080A2834 @ =gPlayerState ldrb r0, [r1, #7] adds r2, r6, #0 adds r2, #0x6b @@ -100,7 +100,7 @@ _080A2820: mov r8, r3 pop {r4, r5, r6, r7, pc} .align 2, 0 -_080A2828: .4byte gLinkEntity +_080A2828: .4byte gPlayerEntity _080A282C: .4byte gUnk_03003DC0 _080A2830: .4byte gUnk_02034490 -_080A2834: .4byte gLinkState \ No newline at end of file +_080A2834: .4byte gPlayerState \ No newline at end of file diff --git a/asm/tingleSiblings.s b/asm/tingleSiblings.s index e8d3f96c..d732fd78 100644 --- a/asm/tingleSiblings.s +++ b/asm/tingleSiblings.s @@ -46,7 +46,7 @@ _08064E1A: movs r0, #0 strb r1, [r4, #0xc] strb r0, [r2] - ldr r1, _08064E48 @ =gLinkEntity + ldr r1, _08064E48 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -57,7 +57,7 @@ _08064E1A: bl sub_0806F118 b _08064E6A .align 2, 0 -_08064E48: .4byte gLinkEntity +_08064E48: .4byte gPlayerEntity _08064E4C: adds r0, r4, #0 movs r1, #0 diff --git a/asm/townMinish.s b/asm/townMinish.s index c0c2d4ce..18494800 100644 --- a/asm/townMinish.s +++ b/asm/townMinish.s @@ -14,7 +14,7 @@ sub_0806AC3C: @ 0x0806AC3C ldrb r0, [r0] cmp r0, #3 bhi _0806ACBA - ldr r4, _0806AC6C @ =gLinkEntity + ldr r4, _0806AC6C @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 movs r2, #0x18 @@ -30,7 +30,7 @@ sub_0806AC3C: @ 0x0806AC3C ands r2, r0 b _0806AC74 .align 2, 0 -_0806AC6C: .4byte gLinkEntity +_0806AC6C: .4byte gPlayerEntity _0806AC70: ldrb r0, [r5, #0x14] lsls r2, r0, #2 @@ -161,7 +161,7 @@ _0806AD44: movs r0, #2 strb r0, [r4, #0xc] strb r1, [r5] - ldr r1, _0806ADAC @ =gLinkEntity + ldr r1, _0806ADAC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection bl sub_0806F5A4 @@ -178,7 +178,7 @@ _0806AD8A: ldrb r0, [r4, #0xa] cmp r0, #1 bne _0806ADEA - ldr r0, _0806ADAC @ =gLinkEntity + ldr r0, _0806ADAC @ =gPlayerEntity ldrb r3, [r0, #0x14] lsrs r3, r3, #1 ldr r0, _0806ADB0 @ =gUnk_081126E4 @@ -192,7 +192,7 @@ _0806AD8A: bl sub_08078850 b _0806ADEA .align 2, 0 -_0806ADAC: .4byte gLinkEntity +_0806ADAC: .4byte gPlayerEntity _0806ADB0: .4byte gUnk_081126E4 _0806ADB4: .4byte gUnk_081126D4 _0806ADB8: diff --git a/asm/treeHidingPortal.s b/asm/treeHidingPortal.s index e579293c..b4c79609 100644 --- a/asm/treeHidingPortal.s +++ b/asm/treeHidingPortal.s @@ -9,14 +9,14 @@ thumb_func_start sub_0809E9A0 sub_0809E9A0: @ 0x0809E9A0 push {r4, r5, r6, lr} - ldr r5, _0809E9B0 @ =gLinkEntity + ldr r5, _0809E9B0 @ =gPlayerEntity ldrb r2, [r5, #0xc] cmp r2, #6 beq _0809E9B4 movs r0, #0 b _0809E9F0 .align 2, 0 -_0809E9B0: .4byte gLinkEntity +_0809E9B0: .4byte gPlayerEntity _0809E9B4: ldrb r0, [r5, #0x14] ands r2, r0 diff --git a/asm/treeItem.s b/asm/treeItem.s index 14b0f577..dde58214 100644 --- a/asm/treeItem.s +++ b/asm/treeItem.s @@ -100,7 +100,7 @@ _08049C28: .4byte 0x0000FFE0 sub_08049C2C: @ 0x08049C2C push {r4, r5, r6, lr} adds r2, r0, #0 - ldr r3, _08049CA4 @ =gLinkEntity + ldr r3, _08049CA4 @ =gPlayerEntity ldrb r0, [r3, #0xc] cmp r0, #6 bne _08049CA8 @@ -163,7 +163,7 @@ _08049C9E: movs r0, #1 b _08049CAA .align 2, 0 -_08049CA4: .4byte gLinkEntity +_08049CA4: .4byte gPlayerEntity _08049CA8: movs r0, #0 _08049CAA: diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s index 0ebd0163..fcbaf7fa 100644 --- a/asm/vaatiArm.s +++ b/asm/vaatiArm.s @@ -969,7 +969,7 @@ sub_08042C34: @ 0x08042C34 ands r1, r0 ldr r0, _08042D14 @ =gUnk_080D12F8 adds r1, r1, r0 - ldr r3, _08042D18 @ =gLinkEntity + ldr r3, _08042D18 @ =gPlayerEntity movs r0, #0x2e ldrsh r2, [r3, r0] movs r0, #0 @@ -1067,7 +1067,7 @@ _08042D0C: pop {r4, r5, r6, r7, pc} .align 2, 0 _08042D14: .4byte gUnk_080D12F8 -_08042D18: .4byte gLinkEntity +_08042D18: .4byte gPlayerEntity _08042D1C: .4byte gRoomControls _08042D20: .4byte gUnk_080D1419 @@ -1330,7 +1330,7 @@ sub_08042EF4: @ 0x08042EF4 lsls r0, r0, #0x18 cmp r0, #0 bne _08042F4E - ldr r0, _08042F38 @ =gLinkEntity + ldr r0, _08042F38 @ =gPlayerEntity movs r2, #0x2e ldrsh r1, [r0, r2] movs r3, #0x32 @@ -1346,7 +1346,7 @@ sub_08042EF4: @ 0x08042EF4 strb r0, [r4, #0xe] b _08042F4E .align 2, 0 -_08042F38: .4byte gLinkEntity +_08042F38: .4byte gPlayerEntity _08042F3C: movs r0, #5 strb r0, [r4, #0xd] @@ -3307,7 +3307,7 @@ _08043DAC: .4byte gUnk_080D13E9 sub_08043DB0: @ 0x08043DB0 push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r0, _08043E48 @ =gLinkState + ldr r0, _08043E48 @ =gPlayerState ldr r0, [r0, #0x30] movs r1, #0x80 ands r0, r1 @@ -3379,7 +3379,7 @@ _08043DFE: strh r1, [r0] b _08043E70 .align 2, 0 -_08043E48: .4byte gLinkState +_08043E48: .4byte gPlayerState _08043E4C: .4byte gRoomControls _08043E50: .4byte gUnk_080D13EC _08043E54: .4byte gScreenTransition diff --git a/asm/vaatiEyesMacro.s b/asm/vaatiEyesMacro.s index 111f7431..4e3d3252 100644 --- a/asm/vaatiEyesMacro.s +++ b/asm/vaatiEyesMacro.s @@ -329,7 +329,7 @@ _0802EED6: ldr r0, [r4, #0x50] adds r1, r4, #0 bl CopyPositionAndSpriteOffset - ldr r1, _0802EF14 @ =gLinkEntity + ldr r1, _0802EF14 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r0, #1 @@ -356,7 +356,7 @@ _0802EF00: strb r0, [r1] pop {r4, pc} .align 2, 0 -_0802EF14: .4byte gLinkEntity +_0802EF14: .4byte gPlayerEntity _0802EF18: .4byte gUnk_080CDE70 thumb_func_start sub_0802EF1C @@ -459,7 +459,7 @@ sub_0802EFB8: @ 0x0802EFB8 ands r5, r6 b _0802EFE0 _0802EFD2: - ldr r0, _0802F01C @ =gLinkEntity + ldr r0, _0802F01C @ =gPlayerEntity adds r1, r4, #0 bl GetFacingDirection adds r5, r0, #4 @@ -496,7 +496,7 @@ _0802EFE0: strb r0, [r4, #0x15] b _0802F044 .align 2, 0 -_0802F01C: .4byte gLinkEntity +_0802F01C: .4byte gPlayerEntity _0802F020: .4byte gRoomControls _0802F024: .4byte gUnk_080B4488 _0802F028: diff --git a/asm/vaatiProjectile.s b/asm/vaatiProjectile.s index b1e67640..9e312e19 100644 --- a/asm/vaatiProjectile.s +++ b/asm/vaatiProjectile.s @@ -76,7 +76,7 @@ sub_0803E0DC: @ 0x0803E0DC rsbs r0, r0, #0 ands r0, r1 strb r0, [r2] - ldr r3, _0803E154 @ =gLinkEntity + ldr r3, _0803E154 @ =gPlayerEntity ldrb r1, [r3, #0x10] adds r0, r6, #0 ands r0, r1 @@ -109,14 +109,14 @@ sub_0803E0DC: @ 0x0803E0DC ands r0, r1 b _0803E16A .align 2, 0 -_0803E154: .4byte gLinkEntity +_0803E154: .4byte gPlayerEntity _0803E158: - ldr r2, _0803E178 @ =gLinkState + ldr r2, _0803E178 @ =gPlayerState ldr r0, [r2, #0x30] ldr r1, _0803E17C @ =0xFFFFFEFF ands r0, r1 str r0, [r2, #0x30] - ldr r2, _0803E180 @ =gLinkEntity + ldr r2, _0803E180 @ =gPlayerEntity ldrb r1, [r2, #0x10] movs r0, #0x80 orrs r0, r1 @@ -128,9 +128,9 @@ _0803E16C: bl sub_0804AA30 pop {r4, r5, r6, pc} .align 2, 0 -_0803E178: .4byte gLinkState +_0803E178: .4byte gPlayerState _0803E17C: .4byte 0xFFFFFEFF -_0803E180: .4byte gLinkEntity +_0803E180: .4byte gPlayerEntity _0803E184: .4byte gUnk_080D0648 thumb_func_start sub_0803E188 @@ -353,7 +353,7 @@ sub_0803E314: @ 0x0803E314 bne _0803E332 movs r0, #1 strb r0, [r4, #0xc] - ldr r1, _0803E33C @ =gLinkEntity + ldr r1, _0803E33C @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection strb r0, [r4, #0x15] @@ -362,7 +362,7 @@ _0803E332: bl GetNextFrame pop {r4, pc} .align 2, 0 -_0803E33C: .4byte gLinkEntity +_0803E33C: .4byte gPlayerEntity thumb_func_start sub_0803E340 sub_0803E340: @ 0x0803E340 @@ -468,7 +468,7 @@ _0803E3F8: .4byte 0xFFFF0000 sub_0803E3FC: @ 0x0803E3FC push {r4, lr} adds r4, r0, #0 - ldr r1, _0803E438 @ =gLinkEntity + ldr r1, _0803E438 @ =gPlayerEntity ldrh r0, [r1, #0x2e] strh r0, [r4, #0x2e] ldrh r0, [r1, #0x32] @@ -495,7 +495,7 @@ _0803E42E: bl sub_0803E2A8 b _0803E442 .align 2, 0 -_0803E438: .4byte gLinkEntity +_0803E438: .4byte gPlayerEntity _0803E43C: adds r0, r2, #0 adds r0, #8 @@ -507,8 +507,8 @@ _0803E442: sub_0803E444: @ 0x0803E444 push {r4, lr} adds r4, r0, #0 - bl ResetLink - ldr r2, _0803E478 @ =gLinkState + bl ResetPlayer + ldr r2, _0803E478 @ =gPlayerState ldrb r1, [r2, #0x1a] movs r0, #0x80 orrs r1, r0 @@ -522,15 +522,15 @@ sub_0803E444: @ 0x0803E444 adds r0, r4, #0 movs r2, #0 bl sub_0806FA90 - ldr r1, _0803E47C @ =gLinkEntity + ldr r1, _0803E47C @ =gPlayerEntity adds r1, #0x63 ldrb r0, [r1] adds r0, #0xe strb r0, [r1] pop {r4, pc} .align 2, 0 -_0803E478: .4byte gLinkState -_0803E47C: .4byte gLinkEntity +_0803E478: .4byte gPlayerState +_0803E47C: .4byte gPlayerEntity thumb_func_start sub_0803E480 sub_0803E480: @ 0x0803E480 @@ -609,7 +609,7 @@ sub_0803E4D8: @ 0x0803E4D8 ands r0, r2 lsls r0, r0, #6 orrs r4, r0 - ldr r0, _0803E520 @ =gLinkEntity + ldr r0, _0803E520 @ =gPlayerEntity adds r5, r0, #0 adds r5, #0x38 ldrb r1, [r5] @@ -625,5 +625,5 @@ _0803E518: pop {r4, r5, pc} .align 2, 0 _0803E51C: .4byte gRoomControls -_0803E520: .4byte gLinkEntity +_0803E520: .4byte gPlayerEntity _0803E524: .4byte 0x00004074 diff --git a/asm/vaatiRebornEnemy.s b/asm/vaatiRebornEnemy.s index 4d9ee088..83d5f0c1 100644 --- a/asm/vaatiRebornEnemy.s +++ b/asm/vaatiRebornEnemy.s @@ -578,7 +578,7 @@ _0803D4FC: ldrb r0, [r0] cmp r0, #4 bls _0803D52E - ldr r1, _0803D544 @ =gLinkEntity + ldr r1, _0803D544 @ =gPlayerEntity ldrh r0, [r1, #0x2e] strh r0, [r4, #0x2e] ldrh r0, [r1, #0x32] @@ -597,7 +597,7 @@ _0803D52E: strb r0, [r4, #0xc] b _0803D54E .align 2, 0 -_0803D544: .4byte gLinkEntity +_0803D544: .4byte gPlayerEntity _0803D548: movs r0, #0 strb r0, [r2] @@ -792,7 +792,7 @@ _0803D68E: ldrb r0, [r5] cmp r0, #0xff bne _0803D6C8 - ldr r1, _0803D6F8 @ =gLinkEntity + ldr r1, _0803D6F8 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection adds r0, #2 @@ -829,7 +829,7 @@ _0803D6EE: bl UpdateAnimationSingleFrame pop {r4, r5, pc} .align 2, 0 -_0803D6F8: .4byte gLinkEntity +_0803D6F8: .4byte gPlayerEntity _0803D6FC: .4byte gUnk_080D04C0 thumb_func_start sub_0803D700 @@ -936,7 +936,7 @@ _0803D78E: ands r0, r1 adds r0, #0x40 strb r0, [r4, #0xf] - ldr r1, _0803D7E0 @ =gLinkEntity + ldr r1, _0803D7E0 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection movs r1, #0x10 @@ -945,7 +945,7 @@ _0803D78E: orrs r0, r1 b _0803D81A .align 2, 0 -_0803D7E0: .4byte gLinkEntity +_0803D7E0: .4byte gPlayerEntity _0803D7E4: ldrb r0, [r6] adds r0, #1 @@ -2070,7 +2070,7 @@ _0803E046: ldrh r0, [r2, #6] adds r1, r0, #0 adds r1, #0x58 - ldr r0, _0803E088 @ =gLinkEntity + ldr r0, _0803E088 @ =gPlayerEntity movs r3, #0x2e ldrsh r0, [r0, r3] cmp r1, r0 @@ -2096,4 +2096,4 @@ _0803E082: pop {r4, r5, pc} .align 2, 0 _0803E084: .4byte gRoomControls -_0803E088: .4byte gLinkEntity +_0803E088: .4byte gPlayerEntity diff --git a/asm/vaatiTransfigured.s b/asm/vaatiTransfigured.s index 66e1aec0..adec010a 100644 --- a/asm/vaatiTransfigured.s +++ b/asm/vaatiTransfigured.s @@ -1486,7 +1486,7 @@ _08040286: _0804029E: cmp r2, #2 bne _08040382 - ldr r1, _080402DC @ =gLinkEntity + ldr r1, _080402DC @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection lsls r0, r0, #1 @@ -1516,7 +1516,7 @@ _080402C6: strb r0, [r4, #0x18] b _08040382 .align 2, 0 -_080402DC: .4byte gLinkEntity +_080402DC: .4byte gPlayerEntity _080402E0: .4byte gUnk_080D0B18 _080402E4: adds r5, r4, #0 @@ -2576,7 +2576,7 @@ _08040AB0: ldrb r0, [r5] cmp r0, #0x8a bne _08040AC8 - ldr r0, _08040AD0 @ =gLinkState + ldr r0, _08040AD0 @ =gPlayerState adds r0, #0xa0 ldrb r0, [r0] cmp r0, #5 @@ -2589,7 +2589,7 @@ _08040AC8: pop {r4, r5, pc} .align 2, 0 _08040ACC: .4byte 0x00000127 -_08040AD0: .4byte gLinkState +_08040AD0: .4byte gPlayerState thumb_func_start sub_08040AD4 sub_08040AD4: @ 0x08040AD4 diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index df92529a..a02a4eb0 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -322,9 +322,9 @@ _08041592: orrs r0, r2 strb r0, [r1] ldr r1, _080415C0 @ =gRoomControls - ldr r0, _080415C4 @ =gLinkEntity + ldr r0, _080415C4 @ =gPlayerEntity str r0, [r1, #0x30] - ldr r0, _080415C8 @ =gLinkState + ldr r0, _080415C8 @ =gPlayerState adds r0, #0x8b movs r1, #1 strb r1, [r0] @@ -332,8 +332,8 @@ _08041592: .align 2, 0 _080415BC: .4byte gScreenTransition _080415C0: .4byte gRoomControls -_080415C4: .4byte gLinkEntity -_080415C8: .4byte gLinkState +_080415C4: .4byte gPlayerEntity +_080415C8: .4byte gPlayerState _080415CC: adds r0, r4, #0 bl sub_08042004 @@ -781,7 +781,7 @@ _08041924: lsrs r2, r0, #0x18 cmp r2, #0 bne _0804197A - ldr r0, _0804196C @ =gLinkEntity + ldr r0, _0804196C @ =gPlayerEntity movs r1, #0x2e ldrsh r0, [r0, r1] movs r5, #0x2e @@ -810,7 +810,7 @@ _08041924: strb r1, [r0, #0xe] b _0804197A .align 2, 0 -_0804196C: .4byte gLinkEntity +_0804196C: .4byte gPlayerEntity _08041970: movs r0, #7 strb r0, [r4, #0xc] @@ -1180,7 +1180,7 @@ sub_08041BE8: @ 0x08041BE8 ldr r2, [r6, #0x64] str r5, [r2, #0x10] ldr r1, _08041CC8 @ =gRoomControls - ldr r0, _08041CCC @ =gLinkEntity + ldr r0, _08041CCC @ =gPlayerEntity str r0, [r1, #0x30] ldr r7, [r2, #0x1c] str r5, [r7, #0x64] @@ -1216,7 +1216,7 @@ _08041CBA: _08041CC0: .4byte 0x000001F5 _08041CC4: .4byte 0x0000016B _08041CC8: .4byte gRoomControls -_08041CCC: .4byte gLinkEntity +_08041CCC: .4byte gPlayerEntity thumb_func_start sub_08041CD0 sub_08041CD0: @ 0x08041CD0 @@ -1761,7 +1761,7 @@ _080420B8: adds r3, r7, #0 b _08042118 _080420E4: - ldr r0, _080420FC @ =gLinkEntity + ldr r0, _080420FC @ =gPlayerEntity movs r4, #0x32 ldrsh r1, [r0, r4] adds r2, r0, #0 @@ -1773,7 +1773,7 @@ _080420E4: adds r3, #0x18 b _0804210C .align 2, 0 -_080420FC: .4byte gLinkEntity +_080420FC: .4byte gPlayerEntity _08042100: .4byte gRoomControls _08042104: movs r1, #0x32 @@ -1817,7 +1817,7 @@ _0804213E: movs r0, #0x32 ldrsh r1, [r4, r0] subs r1, #0x44 - ldr r3, _0804216C @ =gLinkEntity + ldr r3, _0804216C @ =gPlayerEntity movs r2, #0x32 ldrsh r0, [r3, r2] subs r0, r0, r1 @@ -1836,7 +1836,7 @@ _0804213E: ldr r5, [r0, #0x18] b _0804217A .align 2, 0 -_0804216C: .4byte gLinkEntity +_0804216C: .4byte gPlayerEntity _08042170: subs r0, r1, r2 cmp r0, #0x38 @@ -2155,7 +2155,7 @@ sub_080423A4: @ 0x080423A4 _080423CC: .4byte gScreenTransition _080423D0: .4byte gUnk_02002A40 _080423D4: - ldr r2, _08042420 @ =gLinkState + ldr r2, _08042420 @ =gPlayerState adds r0, r2, #0 adds r0, #0xa9 ldrb r0, [r0] @@ -2166,7 +2166,7 @@ _080423D4: ldr r0, [r2, #0x2c] cmp r0, #0 bne _0804241C - ldr r1, _08042424 @ =gLinkEntity + ldr r1, _08042424 @ =gPlayerEntity adds r0, r1, #0 adds r0, #0x7a ldrh r0, [r0] @@ -2194,8 +2194,8 @@ _0804240A: _0804241C: pop {r4, pc} .align 2, 0 -_08042420: .4byte gLinkState -_08042424: .4byte gLinkEntity +_08042420: .4byte gPlayerState +_08042424: .4byte gPlayerEntity thumb_func_start sub_08042428 sub_08042428: @ 0x08042428 @@ -2295,7 +2295,7 @@ _080424C6: ldrb r0, [r0] cmp r0, #0x12 bne _08042502 - ldr r1, _08042504 @ =gLinkEntity + ldr r1, _08042504 @ =gPlayerEntity adds r0, r4, #0 bl GetFacingDirection ldr r1, _08042508 @ =gUnk_080D0EB0 @@ -2309,7 +2309,7 @@ _080424C6: _08042502: pop {r4, pc} .align 2, 0 -_08042504: .4byte gLinkEntity +_08042504: .4byte gPlayerEntity _08042508: .4byte gUnk_080D0EB0 thumb_func_start sub_0804250C diff --git a/asm/wallMaster.s b/asm/wallMaster.s index 8a7f47f4..bf09db0b 100644 --- a/asm/wallMaster.s +++ b/asm/wallMaster.s @@ -69,7 +69,7 @@ _0802A474: adds r0, r2, #0 ands r0, r1 strb r0, [r4, #0x10] - ldr r1, _0802A4D8 @ =gLinkEntity + ldr r1, _0802A4D8 @ =gPlayerEntity ldrh r0, [r1, #0x2e] adds r2, r4, #0 adds r2, #0x7e @@ -114,7 +114,7 @@ _0802A4CE: bl sub_0804AA30 pop {r4, pc} .align 2, 0 -_0802A4D8: .4byte gLinkEntity +_0802A4D8: .4byte gPlayerEntity _0802A4DC: .4byte gUnk_080CD07C thumb_func_start nullsub_142 @@ -353,7 +353,7 @@ sub_0802A69C: @ 0x0802A69C push {r4, lr} adds r4, r0, #0 bl sub_0802A7D0 - ldr r2, _0802A6E4 @ =gLinkState + ldr r2, _0802A6E4 @ =gPlayerState ldrb r1, [r2, #0xa] movs r0, #0x80 orrs r1, r0 @@ -361,7 +361,7 @@ sub_0802A69C: @ 0x0802A69C ldrb r1, [r2, #0x1a] orrs r0, r1 strb r0, [r2, #0x1a] - ldr r1, _0802A6E8 @ =gLinkEntity + ldr r1, _0802A6E8 @ =gPlayerEntity adds r0, r4, #0 adds r0, #0x7e ldrh r0, [r0] @@ -386,8 +386,8 @@ sub_0802A69C: @ 0x0802A69C subs r0, r2, #1 b _0802A6EE .align 2, 0 -_0802A6E4: .4byte gLinkState -_0802A6E8: .4byte gLinkEntity +_0802A6E4: .4byte gPlayerState +_0802A6E8: .4byte gPlayerEntity _0802A6EC: adds r0, r2, #1 _0802A6EE: @@ -419,7 +419,7 @@ _0802A712: adds r1, #0x63 movs r0, #3 strb r0, [r1] - ldr r2, _0802A730 @ =gLinkEntity + ldr r2, _0802A730 @ =gPlayerEntity ldrb r1, [r2, #0x18] subs r0, #7 ands r0, r1 @@ -427,7 +427,7 @@ _0802A712: _0802A72E: pop {r4, pc} .align 2, 0 -_0802A730: .4byte gLinkEntity +_0802A730: .4byte gPlayerEntity thumb_func_start sub_0802A734 sub_0802A734: @ 0x0802A734 @@ -457,7 +457,7 @@ _0802A768: ldr r1, _0802A784 @ =0xFFFE0000 adds r0, r0, r1 str r0, [r4, #0x34] - ldr r1, _0802A788 @ =gLinkState + ldr r1, _0802A788 @ =gPlayerState ldrb r0, [r1, #0xa] movs r2, #0x80 orrs r0, r2 @@ -469,7 +469,7 @@ _0802A780: pop {r4, pc} .align 2, 0 _0802A784: .4byte 0xFFFE0000 -_0802A788: .4byte gLinkState +_0802A788: .4byte gPlayerState thumb_func_start sub_0802A78C sub_0802A78C: @ 0x0802A78C diff --git a/asm/wallMaster2.s b/asm/wallMaster2.s index 4113319c..71bc9e54 100644 --- a/asm/wallMaster2.s +++ b/asm/wallMaster2.s @@ -66,7 +66,7 @@ _0802CC9A: adds r0, r4, #0 movs r1, #1 bl InitializeAnimation - ldr r2, _0802CCD4 @ =gLinkEntity + ldr r2, _0802CCD4 @ =gPlayerEntity ldrb r1, [r2, #0x10] adds r0, r5, #0 ands r0, r1 @@ -86,7 +86,7 @@ _0802CCCA: bl sub_0804AA30 pop {r4, r5, pc} .align 2, 0 -_0802CCD4: .4byte gLinkEntity +_0802CCD4: .4byte gPlayerEntity _0802CCD8: .4byte gUnk_080CD6FC thumb_func_start nullsub_151 @@ -286,7 +286,7 @@ _0802CE58: sub_0802CE68: @ 0x0802CE68 push {r4, r5, lr} adds r4, r0, #0 - ldr r2, _0802CED4 @ =gLinkState + ldr r2, _0802CED4 @ =gPlayerState ldrb r1, [r2, #0xa] movs r0, #0x80 orrs r1, r0 @@ -299,7 +299,7 @@ sub_0802CE68: @ 0x0802CE68 lsls r1, r1, #1 orrs r0, r1 str r0, [r2, #0x30] - ldr r5, _0802CED8 @ =gLinkEntity + ldr r5, _0802CED8 @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r5, r0] movs r0, #0x32 @@ -335,8 +335,8 @@ _0802CEAC: strb r0, [r4, #0xe] b _0802CEF0 .align 2, 0 -_0802CED4: .4byte gLinkState -_0802CED8: .4byte gLinkEntity +_0802CED4: .4byte gPlayerState +_0802CED8: .4byte gPlayerEntity _0802CEDC: movs r0, #1 ands r0, r1 @@ -394,7 +394,7 @@ _0802CF28: orrs r1, r0 strb r1, [r4, #0x18] _0802CF4A: - ldr r1, _0802CF60 @ =gLinkState + ldr r1, _0802CF60 @ =gPlayerState ldrb r0, [r1, #0xa] movs r2, #0x80 orrs r0, r2 @@ -406,7 +406,7 @@ _0802CF5A: pop {r4, pc} .align 2, 0 _0802CF5C: .4byte 0xFFFE0000 -_0802CF60: .4byte gLinkState +_0802CF60: .4byte gPlayerState thumb_func_start sub_0802CF64 sub_0802CF64: @ 0x0802CF64 diff --git a/asm/warpPoint.s b/asm/warpPoint.s index 1c537321..7f3eba57 100644 --- a/asm/warpPoint.s +++ b/asm/warpPoint.s @@ -102,7 +102,7 @@ _0808B4F8: strb r2, [r4, #0xc] movs r0, #0x60 strb r0, [r4, #0xf] - ldr r1, _0808B52C @ =gLinkEntity + ldr r1, _0808B52C @ =gPlayerEntity ldrh r0, [r4, #0x2e] strh r0, [r1, #0x2e] ldrh r0, [r4, #0x32] @@ -118,7 +118,7 @@ _0808B4F8: _0808B528: pop {r4, pc} .align 2, 0 -_0808B52C: .4byte gLinkEntity +_0808B52C: .4byte gPlayerEntity thumb_func_start sub_0808B530 sub_0808B530: @ 0x0808B530 @@ -190,7 +190,7 @@ sub_0808B590: @ 0x0808B590 movs r0, #0x60 strb r0, [r4, #0xf] bl sub_08077B20 - ldr r1, _0808B5DC @ =gLinkEntity + ldr r1, _0808B5DC @ =gPlayerEntity ldrh r0, [r4, #0x2e] strh r0, [r1, #0x2e] ldrh r0, [r4, #0x32] @@ -209,7 +209,7 @@ sub_0808B590: @ 0x0808B590 bl PlaySFX b _0808B5E6 .align 2, 0 -_0808B5DC: .4byte gLinkEntity +_0808B5DC: .4byte gPlayerEntity _0808B5E0: .4byte 0x00000113 _0808B5E4: strb r0, [r4, #0xe] @@ -230,14 +230,14 @@ sub_0808B5E8: @ 0x0808B5E8 strb r0, [r4, #0xc] movs r0, #1 strb r0, [r4, #0xe] - ldr r1, _0808B60C @ =gLinkEntity + ldr r1, _0808B60C @ =gPlayerEntity movs r0, #4 strb r0, [r1, #0x14] movs r0, #0x10 strb r0, [r1, #0x15] b _0808B67E .align 2, 0 -_0808B60C: .4byte gLinkEntity +_0808B60C: .4byte gPlayerEntity _0808B610: movs r5, #0 movs r0, #0x60 @@ -277,7 +277,7 @@ _0808B64E: ands r0, r1 cmp r0, #0 bne _0808B66E - ldr r0, _0808B668 @ =gLinkEntity + ldr r0, _0808B668 @ =gPlayerEntity ldrb r0, [r0, #0x14] cmp r0, #4 bne _0808B66C @@ -287,14 +287,14 @@ _0808B64E: bls _0808B66E b _0808B672 .align 2, 0 -_0808B668: .4byte gLinkEntity +_0808B668: .4byte gPlayerEntity _0808B66C: movs r5, #1 _0808B66E: cmp r5, #0 beq _0808B67E _0808B672: - ldr r0, _0808B680 @ =gLinkEntity + ldr r0, _0808B680 @ =gPlayerEntity ldrb r1, [r0, #0x14] adds r1, #2 movs r2, #6 @@ -303,7 +303,7 @@ _0808B672: _0808B67E: pop {r4, r5, pc} .align 2, 0 -_0808B680: .4byte gLinkEntity +_0808B680: .4byte gPlayerEntity thumb_func_start sub_0808B684 sub_0808B684: @ 0x0808B684 @@ -386,7 +386,7 @@ _0808B710: bne _0808B724 b _0808B72A _0808B718: - ldr r2, _0808B738 @ =gLinkEntity + ldr r2, _0808B738 @ =gPlayerEntity ldrb r1, [r2, #0x18] movs r0, #4 rsbs r0, r0, #0 @@ -397,7 +397,7 @@ _0808B724: cmp r0, #0 beq _0808B736 _0808B72A: - ldr r0, _0808B738 @ =gLinkEntity + ldr r0, _0808B738 @ =gPlayerEntity ldrb r1, [r0, #0x14] adds r1, #2 movs r2, #6 @@ -406,7 +406,7 @@ _0808B72A: _0808B736: pop {pc} .align 2, 0 -_0808B738: .4byte gLinkEntity +_0808B738: .4byte gPlayerEntity thumb_func_start sub_0808B73C sub_0808B73C: @ 0x0808B73C @@ -431,7 +431,7 @@ sub_0808B73C: @ 0x0808B73C movs r1, #1 bl InitializeAnimation _0808B766: - ldr r5, _0808B78C @ =gLinkEntity + ldr r5, _0808B78C @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r5, r0] movs r0, #0x32 @@ -450,7 +450,7 @@ _0808B766: strb r1, [r4, #0x18] b _0808B7C0 .align 2, 0 -_0808B78C: .4byte gLinkEntity +_0808B78C: .4byte gPlayerEntity _0808B790: movs r0, #0x2e ldrsh r1, [r5, r0] @@ -486,7 +486,7 @@ _0808B7C0: sub_0808B7C8: @ 0x0808B7C8 push {r4, r5, lr} adds r5, r0, #0 - ldr r2, _0808B824 @ =gLinkState + ldr r2, _0808B824 @ =gPlayerState ldr r0, [r2, #0x30] movs r1, #0x80 ands r0, r1 @@ -497,7 +497,7 @@ sub_0808B7C8: @ 0x0808B7C8 ldrb r0, [r0] cmp r0, #0x12 beq _0808B82C - ldr r4, _0808B828 @ =gLinkEntity + ldr r4, _0808B828 @ =gPlayerEntity adds r0, r4, #0 adds r0, #0x45 ldrb r0, [r0] @@ -528,8 +528,8 @@ _0808B81E: movs r0, #1 b _0808B82E .align 2, 0 -_0808B824: .4byte gLinkState -_0808B828: .4byte gLinkEntity +_0808B824: .4byte gPlayerState +_0808B828: .4byte gPlayerEntity _0808B82C: movs r0, #0 _0808B82E: diff --git a/asm/waterDrop.s b/asm/waterDrop.s index fe057fbd..ab7e2153 100644 --- a/asm/waterDrop.s +++ b/asm/waterDrop.s @@ -193,7 +193,7 @@ _0802A392: sub_0802A39C: @ 0x0802A39C push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r4, _0802A3EC @ =gLinkEntity + ldr r4, _0802A3EC @ =gPlayerEntity movs r0, #0x2e ldrsh r1, [r4, r0] ldr r2, _0802A3F0 @ =gRoomControls @@ -232,7 +232,7 @@ sub_0802A39C: @ 0x0802A39C ands r0, r1 b _0802A402 .align 2, 0 -_0802A3EC: .4byte gLinkEntity +_0802A3EC: .4byte gPlayerEntity _0802A3F0: .4byte gRoomControls _0802A3F4: .4byte gScreen _0802A3F8: .4byte gUnk_02001A40 diff --git a/asm/whirlwind.s b/asm/whirlwind.s index 4f7366c0..4b9a42e2 100644 --- a/asm/whirlwind.s +++ b/asm/whirlwind.s @@ -133,7 +133,7 @@ _08092D92: beq _08092E84 adds r0, r5, #0 bl GetNextFrame - ldr r6, _08092E04 @ =gLinkState + ldr r6, _08092E04 @ =gPlayerState ldr r0, [r6, #0x30] movs r3, #0x80 ands r0, r3 @@ -144,7 +144,7 @@ _08092D92: ldrb r0, [r0] cmp r0, #0 bne _08092E84 - ldr r4, _08092E08 @ =gLinkEntity + ldr r4, _08092E08 @ =gPlayerEntity ldrb r2, [r4, #0xc] cmp r2, #4 beq _08092DC8 @@ -183,16 +183,16 @@ _08092DC8: bgt _08092E84 b _08092E16 .align 2, 0 -_08092E04: .4byte gLinkState -_08092E08: .4byte gLinkEntity +_08092E04: .4byte gPlayerState +_08092E08: .4byte gPlayerEntity _08092E0C: - ldr r0, _08092E88 @ =gLinkEntity + ldr r0, _08092E88 @ =gPlayerEntity movs r1, #0x36 ldrsh r0, [r0, r1] cmp r0, #0 beq _08092E84 _08092E16: - ldr r4, _08092E88 @ =gLinkEntity + ldr r4, _08092E88 @ =gPlayerEntity adds r0, r5, #0 adds r1, r4, #0 bl CopyPosition @@ -208,7 +208,7 @@ _08092E16: movs r0, #0x80 orrs r0, r1 strb r0, [r4, #0x10] - ldr r1, _08092E8C @ =gLinkState + ldr r1, _08092E8C @ =gPlayerState movs r0, #0x1f strb r0, [r1, #0xc] ldrb r2, [r5, #0xb] @@ -244,8 +244,8 @@ _08092E16: _08092E84: pop {r4, r5, r6, pc} .align 2, 0 -_08092E88: .4byte gLinkEntity -_08092E8C: .4byte gLinkState +_08092E88: .4byte gPlayerEntity +_08092E8C: .4byte gPlayerState _08092E90: .4byte 0x00000153 thumb_func_start sub_08092E94 @@ -253,7 +253,7 @@ sub_08092E94: @ 0x08092E94 push {r4, lr} adds r4, r0, #0 bl UpdateAnimationSingleFrame - ldr r1, _08092ED0 @ =gLinkEntity + ldr r1, _08092ED0 @ =gPlayerEntity adds r0, r4, #0 movs r2, #0xc movs r3, #0xc @@ -279,4 +279,4 @@ sub_08092E94: @ 0x08092E94 _08092ECE: pop {r4, pc} .align 2, 0 -_08092ED0: .4byte gLinkEntity +_08092ED0: .4byte gPlayerEntity diff --git a/asm/windTribeTeleporter.s b/asm/windTribeTeleporter.s index 44a400f8..b5630d2f 100644 --- a/asm/windTribeTeleporter.s +++ b/asm/windTribeTeleporter.s @@ -49,7 +49,7 @@ sub_080A0F44: @ 0x080A0F44 bl sub_080A11C0 cmp r0, #0 beq _080A0FA4 - ldr r1, _080A0FAC @ =gLinkEntity + ldr r1, _080A0FAC @ =gPlayerEntity ldrh r0, [r5, #0x2e] movs r4, #0 strh r0, [r1, #0x2e] @@ -72,7 +72,7 @@ _080A0FA4: pop {r4, r5, r6, pc} .align 2, 0 _080A0FA8: .4byte gUnk_080FD460 -_080A0FAC: .4byte gLinkEntity +_080A0FAC: .4byte gPlayerEntity thumb_func_start sub_080A0FB0 sub_080A0FB0: @ 0x080A0FB0 @@ -87,7 +87,7 @@ sub_080A0FB0: @ 0x080A0FB0 ldrb r0, [r0] cmp r0, #0 bne _080A0FFE - ldr r1, _080A0FF4 @ =gLinkEntity + ldr r1, _080A0FF4 @ =gPlayerEntity ldrh r0, [r5, #0x2e] movs r4, #0 strh r0, [r1, #0x2e] @@ -105,7 +105,7 @@ sub_080A0FB0: @ 0x080A0FB0 strb r4, [r5, #0xd] b _080A0FFE .align 2, 0 -_080A0FF4: .4byte gLinkEntity +_080A0FF4: .4byte gPlayerEntity _080A0FF8: adds r0, r5, #0 adds r0, #0x68 @@ -221,7 +221,7 @@ _080A10C2: ands r0, r1 cmp r0, #0 bne _080A10D4 - ldr r0, _080A10DC @ =gLinkEntity + ldr r0, _080A10DC @ =gPlayerEntity ldrb r1, [r0, #0x14] adds r1, #2 movs r2, #6 @@ -231,7 +231,7 @@ _080A10D4: pop {r4, pc} .align 2, 0 _080A10D8: .4byte gScreenTransition -_080A10DC: .4byte gLinkEntity +_080A10DC: .4byte gPlayerEntity thumb_func_start sub_080A10E0 sub_080A10E0: @ 0x080A10E0 @@ -311,7 +311,7 @@ _080A1162: ands r0, r1 cmp r0, #0 bne _080A11BA - ldr r0, _080A117C @ =gLinkEntity + ldr r0, _080A117C @ =gPlayerEntity ldrb r1, [r0, #0x14] adds r1, #2 movs r2, #6 @@ -320,9 +320,9 @@ _080A1162: b _080A11BA .align 2, 0 _080A1178: .4byte gScreenTransition -_080A117C: .4byte gLinkEntity +_080A117C: .4byte gPlayerEntity _080A1180: - ldr r4, _080A11A0 @ =gLinkEntity + ldr r4, _080A11A0 @ =gPlayerEntity ldrb r3, [r4, #0x14] cmp r3, #4 beq _080A11A8 @@ -338,27 +338,27 @@ _080A1180: strb r0, [r4, #0x14] b _080A11BA .align 2, 0 -_080A11A0: .4byte gLinkEntity +_080A11A0: .4byte gPlayerEntity _080A11A4: .4byte gScreenTransition _080A11A8: movs r0, #0 movs r1, #1 strb r1, [r2, #0xc] strb r0, [r2, #0xd] - ldr r0, _080A11BC @ =gLinkState + ldr r0, _080A11BC @ =gPlayerState adds r0, #0x8b strb r1, [r0] bl UnfreezeTime _080A11BA: pop {r4, pc} .align 2, 0 -_080A11BC: .4byte gLinkState +_080A11BC: .4byte gPlayerState thumb_func_start sub_080A11C0 sub_080A11C0: @ 0x080A11C0 push {lr} adds r1, r0, #0 - ldr r0, _080A11D8 @ =gLinkEntity + ldr r0, _080A11D8 @ =gPlayerEntity movs r2, #0x36 ldrsh r0, [r0, r2] cmp r0, #0 @@ -367,7 +367,7 @@ sub_080A11C0: @ 0x080A11C0 bl sub_08017850 b _080A11DE .align 2, 0 -_080A11D8: .4byte gLinkEntity +_080A11D8: .4byte gPlayerEntity _080A11DC: movs r0, #0 _080A11DE: diff --git a/asm/wizzrobeFire.s b/asm/wizzrobeFire.s index f1f59e33..944a21cb 100644 --- a/asm/wizzrobeFire.s +++ b/asm/wizzrobeFire.s @@ -234,7 +234,7 @@ _0802FCC6: strb r0, [r2, #0x18] b _0802FDCA _0802FCDE: - ldr r1, _0802FD14 @ =gLinkEntity + ldr r1, _0802FD14 @ =gPlayerEntity adds r0, r4, #0 movs r2, #0xa0 movs r3, #0xa0 @@ -258,7 +258,7 @@ _0802FCDE: strb r0, [r2, #0x15] b _0802FDCA .align 2, 0 -_0802FD14: .4byte gLinkEntity +_0802FD14: .4byte gPlayerEntity _0802FD18: ldrb r0, [r4, #0xe] subs r0, #1 diff --git a/asm/wizzrobeIce.s b/asm/wizzrobeIce.s index 7f92bd73..850e6675 100644 --- a/asm/wizzrobeIce.s +++ b/asm/wizzrobeIce.s @@ -261,7 +261,7 @@ _0802FF9E: strb r0, [r2, #0x18] b _080300A2 _0802FFB6: - ldr r1, _0802FFEC @ =gLinkEntity + ldr r1, _0802FFEC @ =gPlayerEntity adds r0, r4, #0 movs r2, #0xa0 movs r3, #0xa0 @@ -285,7 +285,7 @@ _0802FFB6: strb r0, [r2, #0x15] b _080300A2 .align 2, 0 -_0802FFEC: .4byte gLinkEntity +_0802FFEC: .4byte gPlayerEntity _0802FFF0: ldrb r0, [r4, #0xe] subs r0, #1 @@ -424,7 +424,7 @@ sub_080300E8: @ 0x080300E8 lsls r0, r0, #2 adds r1, #0x6c adds r0, r0, r1 - ldr r2, _08030114 @ =gLinkEntity + ldr r2, _08030114 @ =gPlayerEntity ldrh r1, [r0] strh r1, [r2, #0x2e] ldrh r0, [r0, #2] @@ -436,7 +436,7 @@ _0803010C: pop {pc} .align 2, 0 _08030110: .4byte gScreenTransition -_08030114: .4byte gLinkEntity +_08030114: .4byte gPlayerEntity thumb_func_start sub_08030118 sub_08030118: @ 0x08030118 diff --git a/asm/wizzrobeWind.s b/asm/wizzrobeWind.s index 55bd91a6..01d74385 100644 --- a/asm/wizzrobeWind.s +++ b/asm/wizzrobeWind.s @@ -286,7 +286,7 @@ _0802F69E: strb r0, [r2, #0x18] b _0802F7A2 _0802F6B6: - ldr r1, _0802F6EC @ =gLinkEntity + ldr r1, _0802F6EC @ =gPlayerEntity adds r0, r4, #0 movs r2, #0xa0 movs r3, #0xa0 @@ -310,7 +310,7 @@ _0802F6B6: strb r0, [r2, #0x15] b _0802F7A2 .align 2, 0 -_0802F6EC: .4byte gLinkEntity +_0802F6EC: .4byte gPlayerEntity _0802F6F0: ldrb r0, [r4, #0xe] subs r0, #1 diff --git a/asm/zeldaFollower.s b/asm/zeldaFollower.s index 42000df5..d6465b1b 100644 --- a/asm/zeldaFollower.s +++ b/asm/zeldaFollower.s @@ -13,7 +13,7 @@ sub_08068318: @ 0x08068318 mov r6, r8 push {r6, r7} mov r8, r0 - ldr r4, _08068414 @ =gLinkEntity + ldr r4, _08068414 @ =gPlayerEntity ldrh r1, [r4, #0x2e] ldr r3, _08068418 @ =0xFFFF0000 adds r0, r3, #0 @@ -29,7 +29,7 @@ sub_08068318: @ 0x08068318 ands r3, r7 orrs r3, r0 adds r7, r3, #0 - ldr r0, _08068420 @ =gLinkState + ldr r0, _08068420 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] lsls r0, r0, #0x10 @@ -138,10 +138,10 @@ _080683E6: strb r0, [r4] b _080684A8 .align 2, 0 -_08068414: .4byte gLinkEntity +_08068414: .4byte gPlayerEntity _08068418: .4byte 0xFFFF0000 _0806841C: .4byte 0x0000FFFF -_08068420: .4byte gLinkState +_08068420: .4byte gPlayerState _08068424: .4byte 0xFF00FFFF _08068428: .4byte 0xC0FFFFFF _0806842C: .4byte 0x3FFFFFFF @@ -175,7 +175,7 @@ _08068450: mov sb, r1 b _080684A8 _08068466: - ldr r1, _0806851C @ =gLinkEntity + ldr r1, _0806851C @ =gPlayerEntity movs r2, #0x2e ldrsh r0, [r1, r2] movs r3, #0x32 @@ -270,7 +270,7 @@ _0806850C: strb r0, [r4] b _08068526 .align 2, 0 -_0806851C: .4byte gLinkEntity +_0806851C: .4byte gPlayerEntity _08068520: mov r0, r8 bl UpdateAnimationSingleFrame @@ -325,7 +325,7 @@ sub_08068578: @ 0x08068578 mov r5, r8 push {r5, r6, r7} adds r7, r0, #0 - ldr r4, _08068664 @ =gLinkEntity + ldr r4, _08068664 @ =gPlayerEntity ldrh r1, [r4, #0x2e] ldr r3, _08068668 @ =0xFFFF0000 adds r0, r3, #0 @@ -340,7 +340,7 @@ sub_08068578: @ 0x08068578 ldrh r0, [r4, #0x36] ands r3, r6 orrs r3, r0 - ldr r0, _08068670 @ =gLinkState + ldr r0, _08068670 @ =gPlayerState adds r0, #0xa8 ldrb r0, [r0] lsls r0, r0, #0x10 @@ -437,10 +437,10 @@ _08068614: mov sl, r5 pop {r4, r5, r6, r7, pc} .align 2, 0 -_08068664: .4byte gLinkEntity +_08068664: .4byte gPlayerEntity _08068668: .4byte 0xFFFF0000 _0806866C: .4byte 0x0000FFFF -_08068670: .4byte gLinkState +_08068670: .4byte gPlayerState _08068674: .4byte 0xFF00FFFF _08068678: .4byte 0xC0FFFFFF _0806867C: .4byte 0x3FFFFFFF diff --git a/baserom.gba.pal b/baserom.gba.pal deleted file mode 100644 index 0d552603..00000000 Binary files a/baserom.gba.pal and /dev/null differ diff --git a/baserom.gba.spr b/baserom.gba.spr deleted file mode 100644 index d61cdcb9..00000000 Binary files a/baserom.gba.spr and /dev/null differ diff --git a/calcrom.pl b/calcrom.pl index 7472ab23..8de8661b 100644 --- a/calcrom.pl +++ b/calcrom.pl @@ -58,7 +58,13 @@ while (my $line = <$file>) } elsif ($dir eq 'data') { - $data += $size; + if ($basename =~ /(strings)/) + { + $srcdata += $size; + } + else { + $data += $size; + } } } } diff --git a/charmap.txt b/charmap.txt index 960ff778..cc729a02 100644 --- a/charmap.txt +++ b/charmap.txt @@ -101,6 +101,7 @@ UNK_0105 = 01 05 UNK_0106 = 01 06 UNK_0107 = 01 07 COLOR = 02 @ use a color listed below right after +UNK_0300DB = 03 00 DB UNK_03005F = 03 00 5F UNK_03008D = 03 00 8D UNK_03008E = 03 00 8E @@ -180,6 +181,7 @@ UNK_03020C = 03 02 0C UNK_03020D = 03 02 0D UNK_03020E = 03 02 0E UNK_03021A = 03 02 1A +UNK_0300CC = 03 00 CC @ UNK_030D = 03 0D @ UNK_0412 = 04 12 UNK_0413 = 04 13 @@ -190,7 +192,12 @@ UNK_041006 = 04 10 06 UNK_041007 = 04 10 07 UNK_04100C = 04 10 0C UNK_041206 = 04 12 06 +UNK_041506 = 04 15 06 CHOICE_UNK = 05 1D 06 +CHOICE_3003 = 05 30 03 +CHOICE_3109 = 05 31 09 +CHOICE_310A = 05 31 0A +CHOICE_310B = 05 31 0B CHOICE_030D = 05 03 0D CHOICE_0309 = 05 03 09 CHOICE_0301 = 05 03 01 @@ -248,9 +255,33 @@ CHOICE_058F = 05 05 8F CHOICE_057C = 05 05 7C CHOICE_057D = 05 05 7D CHOICE_057E = 05 05 7E +CHOICE_2C0C = 05 2C 0C +CHOICE_2C17 = 05 2C 17 +CHOICE_2C1D = 05 2C 1D +CHOICE_2D0A = 05 2D 0A +CHOICE_311A = 05 31 1A +CHOICE_3120 = 05 31 20 +CHOICE_3126 = 05 31 26 +CHOICE_3208 = 05 32 08 +CHOICE_465F = 05 46 5F +CHOICE_463F = 05 46 3F +CHOICE_4636 = 05 46 36 +CHOICE_460B = 05 46 0B +CHOICE_4613 = 05 46 13 +CHOICE_461B = 05 46 1B +CHOICE_4624 = 05 46 24 +CHOICE_462D = 05 46 2D +CHOICE_4603 = 05 46 03 +CHOICE_4006 = 05 40 06 +CHOICE_4205 = 05 42 05 +CHOICE_4219 = 05 42 19 +CHOICE_421A = 05 42 1A +CHOICE_431E = 05 43 1E +CHOICE_4317 = 05 43 17 PLAYER = 06 00 STR_VAR_1 = 06 01 STR_VAR_2 = 06 02 +STR_VAR_3 = 06 03 UNK_070584 = 07 05 84 UNK_070506 = 07 05 06 UNK_070585 = 07 05 85 @@ -269,12 +300,33 @@ UNK_072913 = 07 29 13 UNK_072915 = 07 29 15 UNK_072B0F = 07 2B 0F UNK_072C14 = 07 2C 14 +UNK_072D00 = 07 2D 00 +UNK_073102 = 07 31 02 +UNK_07310E = 07 31 0E +UNK_073128 = 07 31 28 +UNK_073129 = 07 31 29 +UNK_07312A = 07 31 2A +UNK_074902 = 07 49 02 +UNK_074A04 = 07 4A 04 +UNK_074667 = 07 46 67 +UNK_074666 = 07 46 66 +UNK_074660 = 07 46 60 +UNK_074661 = 07 46 61 +UNK_074662 = 07 46 62 +UNK_074663 = 07 46 63 +UNK_074664 = 07 46 64 +UNK_074665 = 07 46 65 +UNK_074502 = 07 45 02 +UNK_074506 = 07 45 06 +UNK_074302 = 07 43 02 +UNK_074402 = 07 44 02 UNK_08FF = 08 FF BUTTON_A = 0C 00 BUTTON_B = 0C 01 LEFT = 0C 02 RIGHT = 0C 03 -UNK_BUTTON = 0C05 +BUTTON_UP = 0C 04 +UNK_BUTTON = 0C 05 DPAD = 0C 08 T_07 = 0F 07 T_08 = 0F 08 @@ -289,12 +341,15 @@ T_10 = 0F 10 T_11 = 0F 11 '&' = 0F 0D '/' = 0F 15 +SYM_SHELL = 0F 12 SYM_UNK = 0F 16 +SYM_UNK2 = 0F 1F @ colors WHITE = 00 GREEN = 01 RED = 02 YELLOW = 03 +BLUE = 04 @ sound and music diff --git a/data/data_089FC6C4.s b/data/data_089FC6C4.s index 49abd2e9..dff47dfe 100644 --- a/data/data_089FC6C4.s +++ b/data/data_089FC6C4.s @@ -4,6 +4,9 @@ .section .rodata .align 2 +gUnk_089FB780:: @ 089FB780 + .incbin "baserom.gba", 0x9FB780, 0x0000F44 + gUnk_089FC6C4:: @ 089FC6C4 .incbin "baserom.gba", 0x9FC6C4, 0x0000090 diff --git a/data/strings.s b/data/strings.s index 439d207e..dd55a9ba 100644 --- a/data/strings.s +++ b/data/strings.s @@ -5305,23 +5305,354 @@ gUnk_089B9555:: @ 089B9555 .string "I had no intentions of selling it, but\n" .string "you DO seem desperate.\n" .string "I'll tell you what... I'" -gUnk_089DEE20:: @ 089DEE20 - .incbin "baserom.gba", 0x9DEE20, 0x00011F7 - -gUnk_089E0017:: @ 089E0017 - .incbin "baserom.gba", 0x9E0017, 0x00002E9 - -gUnk_089E0300:: @ 089E0300 - .incbin "baserom.gba", 0x9E0300, 0x0000455 - -gUnk_089E0755:: @ 089E0755 - .incbin "baserom.gba", 0x9E0755, 0x00004AD - -gUnk_089E0C02:: @ 089E0C02 - .incbin "baserom.gba", 0x9E0C02, 0x00008FD + .string "ll sell you\n" + .string "that {COLOR}{GREEN}bottle {COLOR}{WHITE}for {STR_VAR_1} Rupees!\n" + .string "{UNK_072C14}$" + .string "Oh, the {COLOR}{GREEN}quiver{COLOR}{WHITE}? Yes, it's {STR_VAR_1} Rupees!\n" + .string "It holds many {COLOR}{GREEN}arrows{COLOR}{WHITE}, as you can see.\n" + .string "{UNK_072C14}$" + .string "{COLOR}{GREEN}10 arrows{COLOR}{WHITE} for {STR_VAR_1} Rupees.\n" + .string "An astounding bargain, you'll agree.\n" + .string "{UNK_072C14}$" + .string "{COLOR}{GREEN}30 bombs{COLOR}{WHITE} for {STR_VAR_1} Rupees! Yes,\n" + .string "for you, I give you my bulk rate!\n" + .string "{UNK_072C14}$" + .string "{COLOR}{GREEN}30 arrows {COLOR}{WHITE}for {STR_VAR_1} Rupees!\n" + .string "You can't beat that with a stick!\n" + .string "{UNK_072C14}$" + .string "You {COLOR}{YELLOW}already have a fine shield{COLOR}{WHITE}!\n" + .string "Honestly, who needs TWO {COLOR}{GREEN}shields{COLOR}{WHITE}?!$" + .string "{UNK_0301F4}Ah, my friend, you're far too clever by\n" + .string "half, but you won't be haggling with me!$" + .string "Why do you bother shopping if you're\n" + .string "not going to have enough Rupees?\n" + .string "When you have more money, perhaps\n" + .string "we can discuss this further.$" + .string "You don't seem to have enough room\n" + .string "for anything more. Hm. A pity.$" + .string "{UNK_0301F4}Much obliged, my good lad! Please,\n" + .string "do not hesitate to stop by again!$" + .string "{UNK_0301F4}Well! You ARE a big spender,\n" + .string "aren't you? Thank you!$" + .string "{UNK_0301F4}Have I told you how much I appreciate\n" + .string "your continued patronage?\n" + .string "Because I do.$" + .string "{UNK_0301F4}Hello! Is anyone back there?\n" + .string "No? Ah, well... I guess not.\n" + .string "How odd.$" + .string "{UNK_0301F4}Egad! I knew there was someone here!\n" + .string "When did you find your way back here?\n" + .string "This area is for employees only. That is\n" + .string "to say, me and me alone!$" + .string "Will you buy it?\n" + .string "{CHOICE_FF}Buy {CHOICE_2C0C}Don't buy$" + .string "$" + .string "{UNK_0301F4}I'm sorry, my good lad, but\n" + .string "that is not for sale!\n" + .string "That bottle contains food\n" + .string "for my dear little dog, Fifi...\n" + .string "What? You just want the {COLOR}{GREEN}bottle{COLOR}{WHITE}?\n" + .string "That's highly unusual...\n" + .string "Well, fine. If you feed Fifi, then\n" + .string "I guess {COLOR}{YELLOW}you can have the bottle{COLOR}{WHITE}.\n" + .string "How does that sound?\n" + .string " {CHOICE_FF}I'll do it {CHOICE_2C17}No, thanks$" + .string "Fine, fine. It's up to you.$" + .string "Excellent, excellent. He's at my\n" + .string "home right now. Thank you SO much.$" + .string "Allow me to mark the location of my\n" + .string "home here on your map.$" + .string "Bring whatever piece you like.\n" + .string "\n" + .string "The shape you like is simply\n" + .string "a matter of personal taste, goro!$" + .string "All gone! Come again.$" + .string "Yes, Kinstones!\n" + .string "Each one is different, goro!\n" + .string "This Kinstone costs {STR_VAR_1} Rupees. \n" + .string " {CHOICE_FF}Buy {CHOICE_2C1D}Don't buy$" + .string "No deal? Goro! Too bad! But come\n" + .string "again. I will always have good pieces!$" + .string "You don't have enough Rupees...\n" + .string "Come back with more money, goro.$" + .string "You have too many pieces! I can't\n" + .string "sell you any until you make room!$" + .string "Thank you, goro. Come back anytime\n" + .string "and buy the rest!$" + .string "No more, no more, but come back\n" + .string "again. I promise to find more, goro!$" + .string "I believe there should be a {COLOR}{YELLOW}doggie\n" + .string "dish{COLOR}{WHITE} for my dog back at my house.\n" + .string "Just face the {COLOR}{YELLOW}dish{COLOR}{WHITE} and press {RIGHT} to\n" + .string "dump the food into little Fifi's bowl.$" + .string "{UNK_0300D1}My master, {COLOR}{RED}Stockwell{COLOR}{WHITE}, has been coming\n" + .string "home far too late to play with me...\n" + .string "I'm so lonely.$" + .string "That {COLOR}{GREEN}boomerang{COLOR}{WHITE} is a real bargain\n" + .string "at {STR_VAR_1} Rupees.\n" + .string "{UNK_072C14}$" + .string "That {COLOR}{GREEN}big bomb bag{COLOR}{WHITE} is a real bargain\n" + .string "at {STR_VAR_1} Rupees.\n" + .string "{UNK_072C14}$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x38, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, 0xf3, 0x01, 0x00, 0x00, 0x7b, 0x02, 0x00, 0x00, 0x27, 0x03, 0x00, 0x00, 0x51, 0x03, 0x00, 0x00, 0x1d, 0x04, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x5c, 0x05, 0x00, 0x00, 0xe0, 0x05, 0x00, 0x00, 0x47, 0x06, 0x00, 0x00 + .string "{CHOICE_FF}Buy {CHOICE_2D0A}Don't buy$" + .string "Ahh, welcome.\n" + .string "\n" + .string "Care for some of Granny's\n" + .string "homemade {COLOR}{GREEN}blue potion{COLOR}{WHITE}?\n" + .string "One sip, and you're full of energy!\n" + .string "Please, look around...$" + .string "That's Granny's homemade\n" + .string "{COLOR}{GREEN}blue potion{COLOR}{WHITE}, my dear!\n" + .string "I'll fill your bottle for 60 Rupees.\n" + .string "What do you say?\n" + .string "{UNK_072D00}$" + .string "Ever heard of Granny's\n" + .string "homemade {COLOR}{GREEN}blue potion{COLOR}{WHITE}?\n" + .string "One sip, and you're full of energy!\n" + .string "\n" + .string "Fill a {COLOR}{GREEN}bottle {COLOR}{WHITE}and carry it around with\n" + .string "you! After all, it's only 60 Rupees!\n" + .string "Will you buy some?\n" + .string "{UNK_072D00}$" + .string "Granny's stuff is the best! This is my\n" + .string "traditional {COLOR}{GREEN}red potion{COLOR}{WHITE}!\n" + .string "Shall I fill your {COLOR}{GREEN}bottle{COLOR}{WHITE} for...\n" + .string "150 Rupees? What do you say?\n" + .string "{UNK_072D00}$" + .string "Once you've tried my new {COLOR}{GREEN}red potion{COLOR}{WHITE},\n" + .string "you'll never go back to the {COLOR}{GREEN}blue{COLOR}{WHITE} stuff!\n" + .string "Shall I fill your {COLOR}{GREEN}bottle {COLOR}{WHITE}for 150 Rupees?\n" + .string "What do you say, my pretty young boy?\n" + .string "{UNK_072D00}$" + .string "Come back when you need more...\n" + .string "Hehehehe!$" + .string "Ah, yes! A fine choice, my dear!\n" + .string "That's a limited-time article!\n" + .string "One whiff, and you're wide-awake! That\n" + .string "is why it's called a {COLOR}{GREEN}wake-up mushroom{COLOR}{WHITE}!\n" + .string "Would you like to buy it for 60 Rupees?\n" + .string "{CHOICE_FF}Buy {CHOICE_FF}Don't buy$" + .string "You've got an eye for fine goods!\n" + .string "\n" + .string "That, my dear, is my highly regarded,\n" + .string "homemade {COLOR}{GREEN}blue potion{COLOR}{WHITE}!$" + .string "Ahh, welcome.\n" + .string "\n" + .string "Back for Granny's famous {COLOR}{GREEN}red{COLOR}{WHITE}\n" + .string "and {COLOR}{GREEN}blue potions{COLOR}{WHITE}?\n" + .string "One sip, and you're full of energy!\n" + .string "Which do you like, deary, red or blue?$" + .string "None for you? Well, remember that when\n" + .string "you run out of pep later! Hehehehe!$" + .string "I can't sell it to you!\n" + .string "You don't have enough Rupees!\n" + .string "Come back when you've got the money!\n" + .string "My potions are always waiting!\n" + .string "Hehehehe!$" + .string "You {COLOR}{YELLOW}don't have an empty bottle{COLOR}{WHITE} that I\n" + .string "can fill with medicine!\n" + .string "Come back with an {COLOR}{GREEN}empty bottle{COLOR}{WHITE}!\n" + .string "$" + .string "Heheheh... Just face the sleepy\n" + .string "snoozer and press {RIGHT}...\n" + .string "That'll pop his eyes right open!\n" + .string "POP!$" + .byte 0xff, 0xff, 0xff, 0x68, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x93, 0x00, 0x00, 0x00, 0xa6, 0x00, 0x00, 0x00, 0xb9, 0x00, 0x00, 0x00, 0xd3, 0x00, 0x00, 0x00, 0xee, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x18, 0x01, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x5a, 0x01, 0x00, 0x00, 0x6c, 0x01, 0x00, 0x00, 0x87, 0x01, 0x00, 0x00, 0x9b, 0x01, 0x00, 0x00, 0xb5, 0x01, 0x00, 0x00, 0xc7, 0x01, 0x00, 0x00, 0xdf, 0x01, 0x00, 0x00, 0xf3, 0x01, 0x00, 0x00, 0x0a, 0x02, 0x00, 0x00, 0x22, 0x02, 0x00, 0x00, 0x3d, 0x02, 0x00, 0x00, 0x56, 0x02, 0x00, 0x00, 0x72, 0x02, 0x00, 0x00, 0x8c, 0x02, 0x00, 0x00, 0x00 + .string "Wallet 300 Rupees$" + .string "Arrow Quiver 300 Rupees$" + .string "10 Bombs 30 Rupees$" + .string "30 Bombs 80 Rupees$" + .string "10 Remote Bombs 40 Rupees$" + .string "30 Remote Bombs 100 Rupees$" + .string "Shield 40 Rupees$" + .string "Mirror Shield 350 Rupees$" + .string "10 Arrows 20 Rupees$" + .string "30 Arrows 50 Rupees$" + .string "Figurine Ticket 15 Rupees$" + .string "Bottle 200 Rupees$" + .string "Magic Boomerang" + .string " 350 Rupees$" + .string "Fire Rod 350 Rupees$" + .string "Sleeping Shroom 50 Rupees$" + .string "Brioche 10 Rupees$" + .string "Slice of Cake 10 Rupees$" + .string "Croissant 20 Rupees$" + .string "Slice of Pie 20 Rupees$" + .string "Red Top Piece 30 Rupees$" + .string "Red Bottom Piece 30 Rupees$" + .string "Blue Top Piece 30 Rupees$" + .string "Blue Bottom Piece 30 Rupees$" + .string "Green Top Piece 30 Rupees$" + .string "Dog Food$" + .byte 0xff, 0xff, 0xff, 0x6c, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x44, 0x01, 0x00, 0x00, 0xb2, 0x01, 0x00, 0x00, 0xf9, 0x01, 0x00, 0x00, 0x87, 0x02, 0x00, 0x00, 0x88, 0x02, 0x00, 0x00, 0x6f, 0x03, 0x00, 0x00, 0xa1, 0x03, 0x00, 0x00, 0xdd, 0x03, 0x00, 0x00, 0x88, 0x04, 0x00, 0x00, 0xb8, 0x07, 0x00, 0x00, 0x44, 0x08, 0x00, 0x00, 0xb1, 0x08, 0x00, 0x00, 0xb9, 0x09, 0x00, 0x00, 0x10, 0x0a, 0x00, 0x00, 0xe0, 0x0a, 0x00, 0x00, 0xc3, 0x0b, 0x00, 0x00, 0x6b, 0x0c, 0x00, 0x00, 0xbc, 0x0c, 0x00, 0x00, 0x80, 0x0d, 0x00, 0x00, 0x07, 0x0e, 0x00, 0x00, 0x3e, 0x10, 0x00, 0x00, 0xb0, 0x11, 0x00, 0x00, 0xf7, 0x11, 0x00, 0x00, 0x74, 0x12, 0x00, 0x00, 0x00 + .string "In my youth, I was called {COLOR}{RED}Gregal the\n" + .string "Great{COLOR}{WHITE}! I was even a little famous...\n" + .string "But lately my limbs have grown heavy,\n" + .string "and I can't even stand up...$" + .string "Goodness! We rarely get visitors here.\n" + .string "Tell me, how did you get here?$" + .string "I can't believe {COLOR}{RED}old Gregal{COLOR}{WHITE} is sick.\n" + .string "He was looking so healthy.\n" + .string "I guess something just took\n" + .string "hold of him...$" + .string "Nobody believes me, but I " + .string "saw a ghost\n" + .string "that has taken hold of Granddad!$" + .string "Once, my grandfather used something\n" + .string "called a {COLOR}{GREEN}Gust Jar{COLOR}{WHITE} to fight monsters...\n" + .string "He was a miiiighty hero, they say.\n" + .string "But now he's sick in bed...$" + .string "$" + .string "What? An evil spirit had taken hold of\n" + .string "me? And you drove it away?\n" + .string "You... You might be right!... I can\n" + .string "already feel my energy returning!\n" + .string "I'll be able to get out of bed soon!\n" + .string "What's your name? ...{PLAYER}?\n" + .string "Thank you, my boy. You saved me.$" + .string "If you're in the area, come by for\n" + .string "a quick visit!$" + .string "If you find yourself in the area again,\n" + .string "drop by and see us.$" + .string "Well, well, well!\n" + .string "\n" + .string "Look at how the color has come back to\n" + .string "his face! How can I ever thank you?\n" + .string "I still have a hard time believing he'd\n" + .string "been possessed by a monster, though.$" + .string "Welcome, welcome. Long, long ago, and\n" + .string "then an age before that...\n" + .string "Our tribe abandoned the place you call\n" + .string "the {COLOR}{RED}Wind Ruins{COLOR}{WHITE}...\n" + .string "With our magic, we moved our palace up\n" + .string "into the skies. We are the {COLOR}{RED}Wind Tribe{COLOR}{WHITE}.\n" + .string "We have been watching, and we know all\n" + .string "that happens on your surface world.\n" + .string "We know a small boy collects {COLOR}{GREEN}elements\n" + .string "{COLOR}{WHITE}to lift the curse from a princess.{COLOR}{GREEN}\n" + .string "{COLOR}{WHITE}We know of {COLOR}{RED}Vaati {COLOR}{WHITE}and his evil acts...\n" + .string "The" + .string " winds tell us these things.{COLOR}{RED}\n" + .string "{COLOR}{WHITE}The {COLOR}{GREEN}Wind Element{COLOR}{WHITE} that you seek lies\n" + .string "deep in the {COLOR}{RED}Palace of Winds {COLOR}{WHITE}above me.\n" + .string "{COLOR}{YELLOW}When the blade has been infused with\n" + .string "the four elements, the way to the\n" + .string "light force shall open.{COLOR}{WHITE} So it is told\n" + .string "in the legends of the Wind Tribe.\n" + .string "Vaati himself may already know this.\n" + .string "\n" + .string "Surface dwellers are not permitted to\n" + .string "enter our palace, but you are special.\n" + .string "You may continue to the roof.$" + .string "There is a {COLOR}{YELLOW}tornado {COLOR}{WHITE}atop this house.\n" + .string "Enter it to go to the {COLOR}{RED}Palace of Winds{COLOR}{WHITE}.\n" + .string "Revive the sacred blade and\n" + .string "rescue the princess quickly.$" + .string "Oh, it's {PLAYER}!\n" + .string "Thank you for your help earlier!\n" + .string "I've got something else good for you,\n" + .string "so here, please take it!$" + .string "Ohh, if it isn't old {PLAYER}!\n" + .string "\n" + .string "My quest to match Kinstones has taken\n" + .string "me all the way up here.\n" + .string "I'm not sure you've noticed yet, but\n" + .string "we're on top of the clouds!\n" + .string "The Wind Tribe lives here!\n" + .string "\n" + .string "They protect the path to the {COLOR}{RED}Palace\n" + .string "of Winds{COLOR}{WHITE}, where the {COLOR}{GREEN}Wind Element{COLOR}{WHITE} lies!$" + .string "Well, well, well!\n" + .string "{PLAYER}!\n" + .string "Thanks for helping! Because of you, my\n" + .string "gramps is all better now!$" + .string "We of the Wind Tribe are very skilled\n" + .string "at finding {COLOR}{GREEN}Kinstone pieces{COLOR}{WHITE}. \n" + .string "So skilled in fact, that we have more of\n" + .string "them than we can manage!\n" + .string "We can't even store them all. I wish\n" + .string "someone would ta" + .string "ke a few from us.$" + .string "Oh, it's you!\n" + .string "\n" + .string "I thought I'd never make it back here,\n" + .string "but thanks to your Kinstone, I did!\n" + .string "If you're looking for something, go talk\n" + .string "to the elderly woman on the 4th floor.\n" + .string "The winds carry all sort of valuable\n" + .string "information to her.$" + .string "There is a device in the {COLOR}{RED}palace {COLOR}{WHITE}that\n" + .string "allows one to fly in the sky.\n" + .string "When I get bigger, I want to explore\n" + .string "the {COLOR}{RED}palace {COLOR}{WHITE}and find it...\n" + .string "But I'm too scared right now!$" + .string "Up on the roof, there's a huge whirlwind\n" + .string "that can take you up to the {COLOR}{RED}palace{COLOR}{WHITE}.$" + .string "In this tower dwell the people of the\n" + .string "Wind Tribe.\n" + .string "We left your surface world long ago to\n" + .string "serve a greater duty.\n" + .string "We now protect the gate to the {COLOR}{RED}Palace\n" + .string "of Winds{COLOR}{WHITE}, where the {COLOR}{GREEN}Wind Element{COLOR}{WHITE} lies.$" + .string "Although we are of the Wind Tribe, we,\n" + .string "too, once lived on the surface.\n" + .string "Once, the place you call the {COLOR}{RED}Wind Ruins{COLOR}{WHITE}\n" + .string "was, to us, a home.$" + .string "Wahh! You surprised me!\n" + .string "\n" + .string "Normally, surface dwellers can't walk\n" + .string "on the clouds like we do!\n" + .string "My sister and I went to the {COLOR}{YELLOW}Picori\n" + .string "Festival{COLOR}{WHITE} in Hyrule Town,\n" + .string "and when we came back, there\n" + .string "were monsters everywhere!\n" + .string "I bet if I could just fuse a {COLOR}{GREEN}Kinstone{COLOR}{WHITE},\n" + .string "I could call a good homeward wind...\n" + .string "But there are monsters about, so I\n" + .string "can't search for Kinstones.\n" + .string "And even if I could, I still can't\n" + .string "find anyone to fuse them with!\n" + .string "But you look pretty strong!\n" + .string "\n" + .string "Do you think you could maybe search\n" + .string "for {COLOR}{GREEN}Kinstones {COLOR}{WHITE}for me?\n" + .string "If you do, I'll tell you about a good\n" + .string "spot for {COLOR}{YELLOW}fusing{COLOR}{WHITE}!$" + .string "Oh, this is bad. This is really bad...\n" + .string "\n" + .string "Oh, hey! Wow... Look at that!\n" + .string "\n" + .string "I've never seen a surface dweller walk\n" + .string "on clouds before!\n" + .string "You must be quite pure of heart!\n" + .string "\n" + .string "Maybe one such as you would listen to\n" + .string "my tale of woe.\n" + .string "You see, I went down to the surface\n" + .string "with my sister for the {COLOR}{YELLOW}Picori Festival{COLOR}{WHITE}...\n" + .string "But on our way home, we lost the wind\n" + .string "entirely! Now, we can't get home!$" + .string "I hear that {COLOR}{GREEN}Kinstone pieces {COLOR}{WHITE}are\n" + .string "sometimes hidden among the clouds!$" + .string "The {COLOR}{RED}Picori Festival {COLOR}{WHITE}in Hyrule Town was\n" + .string "really fun and all...\n" + .string "But how unlucky to be stranded here,\n" + .string "unable to return home!$" + .string "This is the home of the {COLOR}{RED}Wind Tribe{COLOR}{WHITE}.\n" + .string "We left the surface long ago.\n" + .string "Now, we guard the entrance to the\n" + .string "{COLOR}{RED}Palace of Winds{COLOR}{WHITE}...\n" + .string "...In this palace, the {COLOR}{GREEN}Wind\n" + .string "Element {COLOR}{WHITE}resides.\n" + .string "But...that hole you just came out of...\n" + .string "Does that lead to the world below?\n" + .string "Oh, it appeared after you {COLOR}{YELLOW}fused\n" + .string "Kinstones{COLOR}{WHITE}? That's amazing.$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x54, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x1a, 0x01, 0x00 gUnk_089E14FF:: @ 089E14FF - .incbin "baserom.gba", 0x9E14FF, 0x0001811 + .incbin "baserom.gba", 0x9E14FF, 0x1811 gUnk_089E2D10:: @ 089E2D10 .incbin "baserom.gba", 0x9E2D10, 0x0004F8E @@ -5340,55 +5671,1782 @@ gUnk_089EB89D:: @ 089EB89D gUnk_089EC66B:: @ 089EC66B .incbin "baserom.gba", 0x9EC66B, 0x000282D - -gUnk_089EEE98:: @ 089EEE98 - .incbin "baserom.gba", 0x9EEE98, 0x000004C - -gUnk_089EEEE4:: @ 089EEEE4 - .incbin "baserom.gba", 0x9EEEE4, 0x000000A - -gUnk_089EEEEE:: @ 089EEEEE - .incbin "baserom.gba", 0x9EEEEE, 0x0000008 - -gUnk_089EEEF6:: @ 089EEEF6 - .incbin "baserom.gba", 0x9EEEF6, 0x000110A - -gUnk_089F0000:: @ 089F0000 - .incbin "baserom.gba", 0x9F0000, 0x0000009 - -gUnk_089F0009:: @ 089F0009 - .incbin "baserom.gba", 0x9F0009, 0x0000049 - -gUnk_089F0052:: @ 089F0052 - .incbin "baserom.gba", 0x9F0052, 0x0000638 - -gUnk_089F068A:: @ 089F068A - .incbin "baserom.gba", 0x9F068A, 0x00001A8 - -gUnk_089F0832:: @ 089F0832 - .incbin "baserom.gba", 0x9F0832, 0x00017D5 - -gUnk_089F2007:: @ 089F2007 - .incbin "baserom.gba", 0x9F2007, 0x0000312 - -gUnk_089F2319:: @ 089F2319 - .incbin "baserom.gba", 0x9F2319, 0x000012C - -gUnk_089F2445:: @ 089F2445 - .incbin "baserom.gba", 0x9F2445, 0x0002110 - -gUnk_089F4555:: @ 089F4555 - .incbin "baserom.gba", 0x9F4555, 0x0004081 - -gUnk_089F85D6:: @ 089F85D6 - .incbin "baserom.gba", 0x9F85D6, 0x00009B4 - -gUnk_089F8F8A:: @ 089F8F8A - .incbin "baserom.gba", 0x9F8F8A, 0x00027F6 - -gUnk_089FB780:: @ 089FB780 - .incbin "baserom.gba", 0x9FB780, 0x0000F44 - - - - + .string "n sometime! If I'm\n" + .string "awake, I'll fuse {COLOR}{YELLOW}Kinstones{COLOR}{WHITE} with you!$" + .string "I know! Do you want to {COLOR}{YELLOW}fuse Kins" + .string "tones{COLOR}{WHITE}\n" + .string "with me? I have a very special one!$" + .string "I'm really blazing away on these shoes\n" + .string "for Princess Zelda!$" + .string "?!\n" + .string "Huh? What now?!\n" + .string "There are more new shoes!\n" + .string "You probably won't believe this, but...\n" + .string "I have a strange habit of making\n" + .string "shoes in my sleep!\n" + .string "So you must have come here because\n" + .string "you want some of my shoes, right?\n" + .string "Tell you what: because you were nice\n" + .string "enough to wake me, you can have 'em!\n" + .string "Hold on a sec, though. I just want\n" + .string "to finish this one last bit...$" + .string "$" + .string "{UNK_030204}Those {COLOR}{GREEN}Pegasus Boots {COLOR}{WHITE}will make you\n" + .string "want to dash everywhere!\n" + .string "It's really fun to run headlong into\n" + .string "stuff and really shake things up!$" + .string "{UNK_0301FC}My {COLOR}{GREEN}Pegasus Boots {COLOR}{WHITE}are so comfortable!\n" + .string "\n" + .string "They'll make your little piggies\n" + .string "squeal with delight!$" + .string "{UNK_0301F8}Thanks for wearing my shoes with such\n" + .string "pride, valued customer!$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "{UNK_030204}Hey, hey! You're {PLAYER}, right?\n" + .string "\n" + .string "You're the one who brought the sword\n" + .string "to {COLOR}{RED}Master Melari{COLOR}{WHITE}!\n" + .string "You're on a quest to help the princess,\n" + .string "aren't you?\n" + .string "I wish I could go on a quest, but\n" + .string "then who'd make {COLOR}{RED}Rem{COLOR}{WHITE}'s shoes for him?$" + .string "{UNK_0301FC}Ho, ho! You need {COLOR}{GREEN}Pegasus Boots{COLOR}{WHITE}?\n" + .string "Why, you're just in time!\n" + .string "We made a pair just now while\n" + .string "{COLOR}{RED}Rem {COLOR}{WHITE}was sleeping.\n" + .string "But only {COLOR}{RED}Rem {COLOR}{WHITE}can put the\n" + .string "finishing touches on them...$" + .string "{UNK_0301F8}Ha, ha! That sleepyhead {COLOR}{RED}Rem {COLOR}{WHITE}is nearly\n" + .string "impossible to wake up...\n" + .string "If you want to wake him, you'll need\n" + .string "to get an item from {COLOR}{RED}Syrup{COLOR}{WHITE}'s hut.\n" + .string "It's a little bit of a trek, but\n" + .string "we'll mark it on your map for you.$" + .string "{UNK_030204}Hey, hey! {COLOR}{RED}Rem {COLOR}{WHITE}has some other urgent\n" + .string "business he should be working on...\n" + .string "So please, wake him up as soon as\n" + .string "you can! Time's a-wastin'!$" + .string "{UNK_0301FA}Ho, ho! We've done all we can with\n" + .string "these shoes.\n" + .string "You'll need to go to {COLOR}{RED}Syrup{COLOR}{WHITE}'s hut so\n" + .string "Rem can put on the finishing touches.$" + .string "{UNK_0301F8}Ha, ha! {COLOR}{RED}Syrup{COLOR}{WHITE}'s hut is north of the\n" + .string "{COLOR}{RED}Minish Woods{COLOR}{WHITE}. Just check your {COLOR}{GREEN}map{COLOR}{WHITE}.$" + .string "I'll make you shoes! So why don't you\n" + .string "come back later?$" + .string "The magic hag may have something\n" + .string "good.$" + .string "Sometimes we help him make shoes.$" + .string "$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0xc1, 0x00, 0x00, 0x00, 0x4b, 0x01, 0x00, 0x00, 0x8c, 0x01, 0x00, 0x00, 0xc1, 0x01, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x3b, 0x02, 0x00, 0x00, 0x59, 0x02, 0x00, 0x00, 0xc2, 0x02, 0x00, 0x00, 0xdb, 0x02, 0x00, 0x00, 0x0e, 0x03, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00, 0x75, 0x03, 0x00, 0x00, 0xa6, 0x03, 0x00, 0x00, 0xf2, 0x03, 0x00, 0x00, 0x20, 0x05, 0x00, 0x00, 0x5e, 0x05, 0x00, 0x00, 0x6c, 0x05, 0x00, 0x00, 0x74, 0x05, 0x00, 0x00, 0x84, 0x05, 0x00, 0x00, 0xc0, 0x05, 0x00, 0x00, 0xfa, 0x05, 0x00, 0x00, 0x38, 0x06, 0x00, 0x00, 0x0d, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xb5, 0x08, 0x00, 0x00, 0x03, 0x09, 0x00, 0x00, 0x75, 0x09, 0x00, 0x00, 0x4a, 0x0a, 0x00, 0x00, 0xf0, 0x0a, 0x00, 0x00, 0x15, 0x0b, 0x00, 0x00, 0x30, 0x0b, 0x00, 0x00, 0xb0, 0x0b, 0x00, 0x00, 0xcd, 0x0b, 0x00, 0x00, 0xea, 0x0b, 0x00, 0x00, 0x1e, 0x0c, 0x00, 0x00, 0x4a, 0x0c, 0x00, 0x00, 0x94, 0x0c, 0x00, 0x00, 0xf3, 0x0c, 0x00, 0x00, 0x3c, 0x0d, 0x00, 0x00, 0x8a, 0x0d, 0x00, 0x00, 0x8b, 0x0d, 0x00, 0x00, 0x8c, 0x0d, 0x00, 0x00, 0x8d, 0x0d, 0x00, 0x00, 0x8e, 0x0d, 0x00, 0x00, 0x8f, 0x0d, 0x00, 0x00, 0x90, 0x0d, 0x00, 0x00, 0x91, 0x0d, 0x00, 0x00, 0x00 + .string "Hi there, and welcome to the\n" + .string "Happy Hearth! Need a rest, kid?\n" + .string "Well, we can take care of that--and\n" + .string "even throw in a {COLOR}{GREEN}present {COLOR}{WHITE}to boot!\n" + .string "{UNK_074502}$" + .string "{CHOICE_FF}Forget it {CHOICE_FF}{STR_VAR_1} Rupee room\n" + .string "{CHOICE_FF}{STR_VAR_2} Rupee room {CHOICE_FF}{STR_VAR_3} Rupee room$" + .string "...Right. {STR_VAR_1} Rupees.\n" + .string "The cheap room it is, then.\n" + .string "{UNK_074506}$" + .string "Yessir!\n" + .string "{STR_VAR_1} Rupees gets you a regular room!\n" + .string "{UNK_074506}$" + .string "Well now! Come from a good family, do\n" + .string "we? A luxury room for {STR_VAR_1} Rupees!\n" + .string "{UNK_074506}$" + .string "All payment up front, please!$" + .string "What's this?!\n" + .string "Son, you've got no cash!\n" + .string "Come back when you grow up\n" + .string "and get a job!\n" + .string "Now off with you! Shoo!$" + .string "Thanks!\n" + .string "Enjoy your stay!$" + .string "Ho, now! You don't want to stay?\n" + .string "Well, come again!$" + .string "That's the exit!\n" + .string "Enjoy your stay!$" + .string "And how was your stay?\n" + .string "Did you find your present?\n" + .string "Please come again!$" + .string "It seems you really get what\n" + .string "you pay for here...$" + .string "But I guess you don't really know the\n" + .string "difference until you try each room...$" + .string "Hey, what do you know about that\n" + .string "{COLOR}{GREEN}light force{COLOR}{WHITE} stuff?\n" + .string "People are saying it's some kind of\n" + .string "treasure that can grant you any wish.\n" + .string "Anyway, now the king's in a big huff\n" + .string "trying to find it.\n" + .string "It's strange, though. He never struck\n" + .string "me as the greedy type before.\n" + .string "It's almost like he's a different\n" + .string "person now...$" + .string "What's with the king lately?\n" + .string "He was never like that before...$" + .string "Yaaay! Yaaay!$" + .string "Waaait!$" + .string "Hey!!! Wait up!$" + .string "It's so nice to be here at last!\n" + .string "And such a big town it is!$" + .string "Staying in this inn forever\n" + .string "would start to be a bother...$" + .string "We need to find a nice, quiet place\n" + .string "where we can settle down.$" + .string "The {COLOR}{RED}king {COLOR}{WHITE}is just terrible lately!\n" + .string "Things are going crazy around here!\n" + .string "Would you believe a guard came into my\n" + .string "house the other day?\n" + .string "It's true! And get this! He demanded\n" + .string "that I give him some kind of {QT}{COLOR}{GREEN}force{COLOR}{WHITE}{QT}!$" + .string "Normal people can't enter the\n" + .string "{COLOR}{RED}Royal Valley{COLOR}{WHITE}.\n" + .string "There's a cryptic forest that leads\n" + .string "into it, and people get lost there.\n" + .string "The secret to finding your way through\n" + .string "is reading all the signs!\n" + .string "You'll never make it unless you read\n" + .string "each one carefully.$" + .string "You want to go to the tomb of\n" + .string "{COLOR}{RED}King Gustaf of Hyrule{COLOR}{WHITE}?\n" + .string "Then you'd probably better talk\n" + .string "to {COLOR}{RED}Dampé{COLOR}{WHITE}.\n" + .string "He's the gravedigger at the cemetery.\n" + .string "Nobody knows the {COLOR}{RED}Royal Crypt {COLOR}{WHITE}better!$" + .string "Have you stayed in the best room yet?\n" + .string "I'm trying to figure out where to stay.$" + .string "The source of water in Hyrule? You\n" + .string "must mean the spring at {COLOR}{RED}Veil Falls{COLOR}{WHITE}.\n" + .string "That's where all our water comes from.$" + .string "I can't say this in front of the kids...\n" + .string "I don't want to alarm them, you know?\n" + .string "But...{COLOR}{RED}H" + .string "yrule Castle {COLOR}{WHITE}has been looking\n" + .string "pretty weird lately.\n" + .string "I can't say exactly " + .string "what it is, though.\n" + .string "It's just...different. Strange.$" + .string "I saw it! I saw it with my own two eyes!\n" + .string "\n" + .string "There were monsters inside\n" + .string "of {COLOR}{RED}Hyrule Castle{COLOR}{WHITE}!\n" + .string "I've heard rumors that some people who\n" + .string "went to the castle never came back!$" + .string "School let out early today!\n" + .string "Lucky!{T_0B}$" + .string "Hey! Wait up! Wait for me!$" + .string "I've got no choice.\n" + .string "I guess I'll take shelter here...\n" + .string "I know I can hold my own, but those are\n" + .string "some fierce monsters out there...$" + .string "My mom's a wife, not a wolf.$" + .string "My mom's a wife, not a fife!$" + .string "I can't believe she found a place!\n" + .string "I am so jealous.$" + .string "Maybe I should go pay her\n" + .string "a visit sometime.$" + .string "Things just aren't the same around\n" + .string "here now that it's just the two of us.$" + .string "I hate being here all alone!\n" + .string "\n" + .string "I wish I could find a nice place\n" + .string "to live, like the others did...$" + .string "It's no fun being here alone. Maybe\n" + .string "I should look for a nice house, too.$" + .string "Being all alone is...well, lonely. I'm\n" + .string "going to find myself a nice home, too.$" + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x01, 0x00, 0x00, 0xa1, 0x01, 0x00, 0x00, 0x32, 0x02, 0x00, 0x00, 0x71, 0x02, 0x00, 0x00, 0x9b, 0x03, 0x00, 0x00, 0xba, 0x04, 0x00, 0x00, 0xe9, 0x04, 0x00, 0x00, 0xbc, 0x05, 0x00, 0x00, 0x3c, 0x06, 0x00, 0x00, 0x3d, 0x06, 0x00, 0x00, 0xcb, 0x06, 0x00, 0x00, 0x0c, 0x07, 0x00, 0x00, 0xd8, 0x07, 0x00, 0x00, 0x38, 0x09, 0x00, 0x00, 0x67, 0x09, 0x00, 0x00, 0xff, 0x09, 0x00, 0x00, 0x33, 0x0a, 0x00, 0x00, 0x34, 0x0a, 0x00, 0x00, 0xae, 0x0a, 0x00, 0x00, 0xed, 0x0a, 0x00, 0x00, 0xc8, 0x0b, 0x00, 0x00, 0x1d, 0x0d, 0x00, 0x00, 0x4c, 0x0d, 0x00, 0x00, 0xe8, 0x0d, 0x00, 0x00, 0x21, 0x0e, 0x00, 0x00, 0x22, 0x0e, 0x00, 0x00, 0x95, 0x0e, 0x00, 0x00, 0xd4, 0x0e, 0x00, 0x00, 0xe1, 0x0f, 0x00, 0x00, 0xe2, 0x10, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0xaa, 0x11, 0x00, 0x00, 0x01, 0x12, 0x00, 0x00, 0x02, 0x12, 0x00, 0x00, 0x03, 0x12, 0x00, 0x00, 0x9f, 0x12, 0x00, 0x00, 0xde, 0x12, 0x00, 0x00, 0xca, 0x13, 0x00, 0x00, 0xe1, 0x14, 0x00, 0x00, 0x10, 0x15, 0x00, 0x00, 0xa9, 0x15, 0x00, 0x00, 0x56, 0x16, 0x00, 0x00, 0x57, 0x16, 0x00, 0x00, 0x58, 0x16, 0x00, 0x00, 0xed, 0x16, 0x00, 0x00, 0x2c, 0x17, 0x00, 0x00, 0x25, 0x18, 0x00, 0x00, 0x46, 0x19, 0x00, 0x00, 0x75, 0x19, 0x00, 0x00, 0x0e, 0x1a, 0x00, 0x00, 0x95, 0x1a, 0x00, 0x00, 0x72, 0x1b, 0x00, 0x00, 0x73, 0x1b, 0x00, 0x00, 0x08, 0x1c, 0x00, 0x00, 0x47, 0x1c, 0x00, 0x00, 0x4f, 0x1d, 0x00, 0x00, 0x60, 0x1e, 0x00, 0x00, 0x8f, 0x1e, 0x00, 0x00, 0x28, 0x1f, 0x00, 0x00, 0xb6, 0x1f, 0x00, 0x00, 0x9f, 0x20, 0x00, 0x00, 0xa0, 0x20, 0x00, 0x00, 0x71, 0x21, 0x00, 0x00, 0xb0, 0x21, 0x00, 0x00, 0xe3, 0x22, 0x00, 0x00, 0xe8, 0x23, 0x00, 0x00, 0x17, 0x24, 0x00, 0x00, 0xee, 0x24, 0x00, 0x00, 0x8b, 0x25, 0x00, 0x00, 0xc4, 0x26, 0x00, 0x00, 0xc5, 0x26, 0x00, 0x00, 0x74, 0x27, 0x00, 0x00, 0xb3, 0x27, 0x00, 0x00, 0xf4, 0x28, 0x00, 0x00, 0x9f, 0x29, 0x00, 0x00, 0xa0, 0x29, 0x00, 0x00, 0xa1, 0x29, 0x00, 0x00, 0xa2, 0x29, 0x00, 0x00, 0xa3, 0x29, 0x00, 0x00, 0xa4, 0x29, 0x00, 0x00, 0xa5, 0x29, 0x00, 0x00, 0x53, 0x2a, 0x00, 0x00, 0x92, 0x2a, 0x00, 0x00, 0xb2, 0x2b, 0x00, 0x00, 0x75, 0x2c, 0x00, 0x00, 0x76, 0x2c, 0x00, 0x00, 0x77, 0x2c, 0x00, 0x00, 0x78, 0x2c, 0x00, 0x00, 0x79, 0x2c, 0x00, 0x00, 0x7a, 0x2c, 0x00, 0x00, 0x7b, 0x2c, 0x00, 0x00, 0x3d, 0x2d, 0x00, 0x00, 0x7c, 0x2d, 0x00, 0x00, 0x9f, 0x2f, 0x00, 0x00, 0x80, 0x30, 0x00, 0x00, 0xc4, 0x31, 0x00, 0x00, 0xe7, 0x31, 0x00, 0x00, 0x62, 0x32, 0x00, 0x00, 0x8e, 0x32, 0x00, 0x00, 0xd0, 0x32, 0x00, 0x00, 0x3a, 0x33, 0x00, 0x00, 0x81, 0x33, 0x00, 0x00, 0xc3, 0x33, 0x00, 0x00, 0x20, 0x34, 0x00, 0x00, 0x00, 0x03, 0x00, 0xd0 + .string "I am {COLOR}{RED}Swiftblade{COLOR}{WHITE}, finest swordsman\n" + .string "in all of Hyrule!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, I guarantee that\n" + .string "you will increase your skill dramatically!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "We shall start with the most basic\n" + .string "of all techniques!\n" + .string "I shall" + .string " teach you...the {COLOR}{GREEN}Spin Attack{COLOR}{WHITE}!\n" + .string "{COLOR}{GREEN}\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "Press and hold your sword button...\n" + .string "{COLOR}{YELLOW}Second!!{COLOR}{WHITE}\n" + .string "Build up enough power...\n" + .string "{COLOR}{YELLOW}Third!!{COLOR}{WHITE}\n" + .string "Releeeease your destructive might!!\n" + .string "That's all, young swordsman!!\n" + .string "\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_4603}No$" + .string "Haha! Very good!\n" + .string "You are a very quick student.\n" + .string "But one must FEEL the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "I call " + .string "this the {COLOR}{YELLOW}Swiftblade Possession\n" + .string "technique{COLOR}{WHITE} of training!\n" + .string "Watch this!!\n" + .string "Urrngh!!\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074660}$" + .string "Yes!! Fine work! You're a quick study.\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "If you ever forget this technique,\n" + .string "you can review it with this {COLOR}{GREEN}scroll{COLOR}{WHITE}!\n" + .string "You may view it anytime from\n" + .string "the Quest Status screen!$" + .string "There are no more techniques I can\n" + .string "teach you {COLOR}{YELLOW}with your current sword{COLOR}{WHITE}!{COLOR}{YELLOW}\n" + .string "{COLOR}{WHITE}Come again when you have\n" + .string "{COLOR}{GREEN}a new sword{COLOR}{WHITE} in hand!$" + .string "$" + .string "{UNK_0300D0}Mn! A new {COLOR}{GREEN}sword{COLOR}{WHITE}! Fantastic! And you\n" + .string "seem to have acquired new skills with it!\n" + .string "Yes! I am ready to {COLOR}{YELLOW}train {COLOR}{WHITE}you again,\n" + .string "young swordsman!$" + .string "So? Will you accept this new {COLOR}{YELLOW}training{COLOR}{WHITE}?\n" + .string " {CHOICE_FF}Yes {CHOICE_465F}No, thanks$" + .string "I will now teach you a technique called\n" + .string "the Rock Breaker, so pay attention!\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "Swing your sword to break pots!\n" + .string "Actually, that's all there is, young\n" + .string "swordsman!!\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_460B}No$" + .string "Yes! Haha! Good!\n" + .string "\n" + .string "If you had said you didn't understand,\n" + .string "I would have serious doubts about you!\n" + .string "Yes, but one must feel the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "That is the secret of the {COLOR}{YELLOW}Swiftblade\n" + .string "Possession technique{COLOR}{WHITE} of training!\n" + .string "Watch this!!\n" + .string "Gunnghh!!\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074661}$" + .string "Yes!! Fine work! Fantastic, even!\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "If you ever forget this technique,\n" + .string "you can review it with this {COLOR}{GREEN}scroll{COLOR}{WHITE}!$" + .string "Come again when you learn\n" + .string "to {COLOR}{YELLOW}run like the wind{COLOR}{WHITE}!$" + .string "$" + .string "{UNK_0300D0}Ah! Yes! You have the {COLOR}{GREEN}Pegasus Boots{COLOR}{WHITE}!\n" + .string "And you seem to have more skill, too!\n" + .string "Yes! I am ready to {COLOR}{YELLOW}train {COLOR}{WHITE}you again!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "You will now learn a new technique,\n" + .string "the {COLOR}{GREEN}Dash Attack{COLOR}{WHITE}!\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "Equip the Pegasus Boots!\n" + .string "{COLOR}{YELLOW}Second!!{COLOR}{WHITE}\n" + .string "Equip your sword!\n" + .string "{COLOR}{YELLOW}Third!!{COLOR}{WHITE}\n" + .string "Run like crazy!\n" + .string "That's all, young swordsman!!\n" + .string "\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_4613}No$" + .string "Yes! Yes!\n" + .string "You are my finest student!\n" + .string "Just equip your sword and the Pegasus\n" + .string "Boots to any button you like!\n" + .string "But one must feel the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "This is the {COLOR}{YELLOW}Swiftblade Possession\n" + .string "technique{COLOR}{WHITE} of training!\n" + .string "Watch this!!\n" + .string "Urrngh!!\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074662}$" + .string "Yes!! Fine work! You learn quickly!\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "If you ever forget this technique,\n" + .string "you can learn again from this {COLOR}{GREEN}scroll{COLOR}{WHITE}!$" + .string "Come again when {COLOR}{YELLOW}you can jump farther\n" + .string "{COLOR}{WHITE}than any other!$" + .string "$" + .string "{UNK_0300D0}Aha! Yes! You have the {COLOR}{GREEN}Roc's Cape{COLOR}{WHITE}!\n" + .string "And you have acquired new skill!\n" + .string "Yes! I am ready to {COLOR}{YELLOW}train {COLOR}{WHITE}you again!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "Now I will teach you a new technique,\n" + .string "the {COLOR}{GREEN}Down Thrust{COLOR}{WHITE}!\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "Equip the Roc's Cape!!\n" + .string "{COLOR}{YELLOW}Second!!{COLOR}{WHITE}\n" + .string "Equip the sword!!\n" + .string "{COLOR}{YELLOW}Third!!{COLOR}{WHITE}\n" + .string "Jump!! Then...\n" + .string "{COLOR}{YELLOW}Fourth!!{COLOR}{WHITE}\n" + .string "At your jump's peak, swing the sword!\n" + .string "That's all, young swordsman!!\n" + .string "\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_461B}No$" + .string "Yes! You see it, do you not?!\n" + .string "\n" + .string "But one must feel the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "Witness...the {COLOR}{YELLOW}Swiftblade Possession\n" + .string "technique{COLOR}{WHITE} of training!\n" + .string "Urrngh!!\n" + .string "\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074663}$" + .string "Yes!! Fine work! You know the way!\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "If you ever forget this technique,\n" + .string "you can review it with this {COLOR}{GREEN}scroll{COLOR}{WHITE}!$" + .string "Ha! There is nothing more I can teach\n" + .string "you, young master!\n" + .string "Now, you must train yourself!$" + .string "$" + .string "$" + .string "{UNK_0300D0}Believe not what others tell you! I am\n" + .string "the true master swordsman of Hyrule!\n" + .string "My name is {COLOR}{RED}Grayblade{COLOR}{WHITE}, and if you {COLOR}{YELLOW}train{COLOR}{WHITE}\n" + .string "with me, you will learn much!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "You will learn the amazing\n" + .string "{COLOR}{GREEN}Roll Attack{COLOR}{WHITE}!!{COLOR}{GREEN}\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "Roll with {DPAD} and {RIGHT}...\n" + .string "{COLOR}{YELLOW}Second!!{COLOR}{WHITE}\n" + .string "As soon as you get up...\n" + .string "{COLOR}{YELLOW}Third!!{COLOR}{WHITE}\n" + .string "Scream {QT}Hiyaa!{QT} and swing your sword!\n" + .string "That's all, young swordsman!!\n" + .string "\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_4624}No$" + .string "Hoho! Well answered!\n" + .string "You have much promise!\n" + .string "But one must feel the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "This is the {COLOR}{YELLOW}Grayblade Possession\n" + .string "technique{COLOR}{WHITE} of training!\n" + .string "Watch this!!\n" + .string "Urrngh!!\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074664}$" + .string "Yes!! Fine work! You know the way!\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "If you ever forget this technique,\n" + .string "you can review it with this {COLOR}{GREEN}scroll{COLOR}{WHITE}!$" + .string "Now, there is nothing left for me\n" + .string "to teach you.\n" + .string "Your training must continue within\n" + .string "the realm of your MIND...\n" + .string "After all, the way of the sword requires\n" + .string "much discipline!! Yes!$" + .string "$" + .string "$" + .string "{UNK_0300D0}You are in the presence of the true\n" + .string "master swordsman of Hyrule,{COLOR}{RED} Grimblade{COLOR}{WHITE}!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, you will become\n" + .string "a true master swordsman!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "You will learn the meaning of power\n" + .string "with this technique, the {COLOR}{GREEN}Sword Beam{COLOR}{WHITE}!{COLOR}{GREEN}\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "When your hearts are full...\n" + .string "{COLOR}{YELLOW}Second!!{COLOR}{WHITE}\n" + .string "Swing your mighty sword!!!\n" + .string "That's...really all there is to it,\n" + .string "young swordsman!!\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_462D}No$" + .string "But this is only the beginning!\n" + .string "Now comes the real thing!\n" + .string "One must feel the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "This is the {COLOR}{YELLOW}Grimblade Possession\n" + .string "technique{COLOR}{WHITE} of training!\n" + .string "Watch this!!\n" + .string "Urrngh!!\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074665}$" + .string "Yes!! Fine work! You know the way!\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "If you ever forget this technique,\n" + .string "you can review it with this {COLOR}{GREEN}scroll{COLOR}{WHITE}!$" + .string "Now there is nothing more that\n" + .string "I can teach you!!\n" + .string "Your training from now on is\n" + .string "all in your mind!!\n" + .string "The way of the sword is eternal! Yes!$" + .string "{UNK_0300D0}You have found the true master\n" + .string "swordsman of Hyrule,{COLOR}{RED} Grimblade{COLOR}{WHITE}!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, I will teach you\n" + .string "skills you've never imagined!\n" + .string "But the room is dark, and I cannot see\n" + .string "your face! We cannot train like this!!$" + .string "$" + .string "{UNK_0300D0}You have found the true master\n" + .string "swordsman of Hyrule,{COLOR}{RED} Waveblade{COLOR}{WHITE}!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, I will teach you\n" + .string "skills that will make you a master!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}her" + .string "e?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "Now you will learn a dangerous\n" + .string "technique for desperate times!\n" + .string "The {COLOR}{GREEN}Peril Beam{COLOR}{WHITE}!\n" + .string "\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "You must have only one heart left...\n" + .string "{COLOR}{YELLOW}Second!! {COLOR}{WHITE}Use your last ounce of\n" + .string "strength to swing your sword!\n" + .string "That's all, young swordsman!!\n" + .string "\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_4636}No$" + .string "So...\n" + .string "There is no turning back now...\n" + .string "For one must feel the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "This is the {COLOR}{YELLOW}Waveblade Possession\n" + .string "technique{COLOR}{WHITE} of training!\n" + .string "Watch this!!\n" + .string "Urrngh!!\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074666}$" + .string "Yes!! Fine work!\n" + .string "You know the way!\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "If you ever forget this technique,\n" + .string "you can review it with this {COLOR}{GREEN}scroll{COLOR}{WHITE}!$" + .string "Now there is nothing " + .string "more that\n" + .string "I can teach you!!\n" + .string "Your training from now on is\n" + .string "all in your mind!!\n" + .string "The way of the sword leads\n" + .string "ever upward! Yes!$" + .string "You have found the true master\n" + .string "swordsman of Hyrule,{COLOR}{RED} Waveblade{COLOR}{WHITE}!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, I will teach\n" + .string "you things you've never seen!\n" + .string "Hmn?\n" + .string "\n" + .string "It seems you are not ready\n" + .string "to train h" + .string "ere!\n" + .string "Come back when you have\n" + .string "{COLOR}{GREEN}more than 10 hearts{COLOR}{WHITE}!$" + .string "$" + .string "{UNK_0300D0}Though my body may perish, I am still\n" + .string "the true master swordsman of Hyrule...\n" + .string "{COLOR}{RED}Swiftblade the First, Spirit of the\n" + .string "Swordsman{COLOR}{WHITE}!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, I will teach you\n" + .string "skills that are out of this world!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "This is a technique that only I have\n" + .string "mastered...\n" + .string "Only one who holds the sacred blade\n" + .string "can perform...the {COLOR}{GREEN}Great Spin Attack{COLOR}{WHITE}!{COLOR}{GREEN}\n" + .string "{COLOR}{YELLOW}First!!{COLOR}{WHITE}\n" + .string "Do a Spin Attack...\n" + .string "{COLOR}{YELLOW}Second!!{COLOR}{WHITE}\n" + .string "Press the button repeatedly!\n" + .string "Repeatedly! Repeatedly, do you hear\n" + .string "me? That's all, young swordsman!!\n" + .string "Do you understand?\n" + .string " {CHOICE_FF}Yes {CHOICE_463F}No$" + .string "Wohohoho!\n" + .string "But it is not so easy!\n" + .string "One must feel the technique,\n" + .string "not just hear about it!\n" + .string "That's why I will now possess your body\n" + .string "so as to demonstrate the technique!\n" + .string "This is the {COLOR}{YELLOW}Spooky Possession\n" + .string "technique{COLOR}{WHITE} of training!\n" + .string "Watch this!!\n" + .string "Urrngh!!\n" + .string "Poe...Zeh...SHUN!!!$" + .string "Phew...\n" + .string "Now! You must try it {COLOR}{YELLOW}yourself{COLOR}{WHITE}!\n" + .string "{UNK_074667}$" + .string "Yes!! Fine work!\n" + .string "You know the way!\n" + .string "You have passed the test of\n" + .string "{COLOR}{RED}Swiftblade the First {COLOR}{WHITE}with such ease!\n" + .string "I will now give you this {COLOR}{GREEN}Tiger Scroll{COLOR}{WHITE}!\n" + .string "\n" + .string "If you ever forget this technique,\n" + .string "you can review this {COLOR}{GREEN}scroll{COLOR}{WHITE}!$" + .string "Now there is nothing more that\n" + .string "I can teach you!!\n" + .string "Your training from now on is\n" + .string "all in your mind!!\n" + .string "The way begins with the sword and ends\n" + .string "with the sword! Yes!$" + .string "{UNK_0300D0}Though my body may perish, I am still\n" + .string "the true master swordsman of Hyrule...\n" + .string "{COLOR}{RED}Swiftblade the First, Spirit of the\n" + .string "Swordsman{COLOR}{WHITE}!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, I will teach you\n" + .string "skills that are out of this world!\n" + .string "Hmn?\n" + .string "\n" + .string "It seems you are not yet ready\n" + .string "to train with me!\n" + .string "Come back when you have\n" + .string "{COLOR}{GREEN}all 7 Tiger Scrolls{COLOR}{WHITE}!$" + .string "$" + .string "{UNK_0300D0}Swordsmanship is spirit!\n" + .string "\n" + .string "I am the finest or maybe second-finest\n" + .string "swordsman in all of Hyrule, {COLOR}{RED}Scarblade{COLOR}{WHITE}!\n" + .string "{COLOR}{YELLOW}Training {COLOR}{WHITE}with me will forever\n" + .string "transform your swordsmanship!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "Yes!\n" + .string "Then I will teach you how to more\n" + .string "quickly unleash your {COLOR}{GREEN}Spin Attack{COLOR}{WHITE},\n" + .string "which you have already learned!\n" + .string "I take visualization {COLOR}{YELLOW}training {COLOR}{WHITE}very\n" + .string "seriously, I'll have you know!\n" + .string "Now, quietly close your eyes...\n" + .string "\n" + .string "Visualize {COLOR}{YELLOW}your sword moving at an\n" + .string "unthinkable speed{COLOR}{WHITE}...\n" + .string "Wuoooooohhhh!!!!{COLOR}{YELLOW}\n" + .string "\n" + .string "{COLOR}{WHITE}SSSSSSPINNNNNNNNINNNNNNG...$" + .string "Mnuhhh...\n" + .string "\n" + .string "Now, you can perform your Spin Attack\n" + .string "{COLOR}{YELLOW}much faster{COLOR}{WHITE}, my student!{COLOR}{YELLOW}\n" + .string "{COLOR}{WHITE}This is the heart of the sword!\n" + .string "\n" + .string "All begins with belief...\n" + .string "Commit yourself to the blade!$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "{UNK_0300D0}The spirit and the sword are one!\n" + .string "\n" + .string "I am the nearly best swordsman\n" + .string "in Hyrule, {COLOR}{RED}Splitblade{COLOR}{WHITE}!\n" + .string "If you {COLOR}{YELLOW}train {COLOR}{WHITE}with me, you will discover\n" + .string "the secrets of your hidden power!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "Mnnh!\n" + .string "\n" + .string "Now I will teach you how to fill your\n" + .string "{COLOR}{GREEN}Split Gauge{COLOR}{WHITE} faster than ever!\n" + .string "I take visualization {COLOR}{YELLOW}training {COLOR}{WHITE}very\n" + .string "seriously, I'll have you know!\n" + .string "Now, quietly close your eyes...\n" + .string "\n" + .string "Visualize {COLOR}{YELLOW}your body splitting even\n" + .string "faster than ever before{COLOR}{WHITE}...\n" + .string "Wuoooooohhhh!!!!{COLOR}{YELLOW}\n" + .string "\n" + .string "{COLOR}{WHITE}Spuh--Liii--TING!$" + .string "Mnuhhh...\n" + .string "\n" + .string "Now you will {COLOR}{YELLOW}fill your Split\n" + .string "Gauge much faster{COLOR}{WHITE}, my student!{COLOR}{YELLOW}\n" + .string "{COLOR}{WHITE}This is the truth of the sword!\n" + .string "\n" + .string "And truth is almost the exact opposite\n" + .string "of not-truth!\n" + .string "Commit yourself to the blade!$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "$" + .string "{UNK_0300D0}Mastery of the sword is mastery\n" + .string "of the soul!\n" + .string "I am kinda like almost the best\n" + .string "swordsman in Hyrule, {COLOR}{RED}Greatblade{COLOR}{WHITE}!\n" + .string "{COLOR}{YELLOW}Training {COLOR}{WHITE}with me will totally change\n" + .string "your sword skill forever and stuff!$" + .string "So? Would you like to {COLOR}{YELLOW}train {COLOR}{WHITE}here?\n" + .string " {CHOICE_FF}Please {CHOICE_465F}No, thanks$" + .string "Yes!\n" + .string "All right, I'll teach you how to prolong\n" + .string "the duration of the {COLOR}{GREEN}Great Spin Attack{COLOR}{WHITE},\n" + .string "which you have already learned!\n" + .string "I take visualization {COLOR}{YELLOW}training {COLOR}{WHITE}very\n" + .string "seriously, I'll have you know!\n" + .string "Now, quietly close your eyes...\n" + .string "\n" + .string "Visualize {COLOR}{YELLOW}your sword continuing to move\n" + .string "longer than ever possible{COLOR}{WHITE}...\n" + .string "Wuoooooohhhh!!!!\n" + .string "{COLOR}{YELLOW}\n" + .string "{COLOR}{WHITE}SSSSSSPINNNNNNNNINNNNNNG...{COLOR}{YELLOW}\n" + .string "{COLOR}{WHITE}SSSSSSPINNNNNNNNINNNNNNG...\n" + .string "SSSSSSPINNNNNNNNINNNNNNG...\n" + .string "SSSSSSPINNNNNNNNINNNNNNG...\n" + .string "SSSSSSPINNNNNNNNINNNNNNG...\n" + .string "SSSSSSPINNNNNNNNINNNNNNG...\n" + .string "SSSSSSPINNNNNNNNINNNNNNG...\n" + .string "SSSSSSPINNNNNNNNINNNNNNG!!!$" + .string "Mnuhhh...\n" + .string "\n" + .string "Now your Great Spin Attack will last\n" + .string "{COLOR}{YELLOW}longer than before{COLOR}{WHITE}, my student!{COLOR}{YELLOW}\n" + .string "{COLOR}{WHITE}This is the truth of the sword!\n" + .string "\n" + .string "When you doubt another, you bring\n" + .string "clouds into the mind's skies!\n" + .string "Commit yourself to the blade and stuff!$" + .string "Mastery of the sword is mastery\n" + .string "of the soul!\n" + .string "I am kinda like almost the best\n" + .string "swordsman in Hyrule, {COLOR}{RED}Greatblade{COLOR}{WHITE}!\n" + .string "{COLOR}{YELLOW}Training {COLOR}{WHITE}with me will totally change\n" + .string "your sword skill forever and stuff!\n" + .string "Hmn?\n" + .string "\n" + .string "Dude... I don't think you're even\n" + .string "ready to train here!\n" + .string "Come back when you have learned the\n" + .string "{COLOR}{GREEN}highest technique{COLOR}{WHITE} of the sword!$" + .string "Is that so? Then you go now! Shoo!$" + .string "Press and hold your sword button.\n" + .string "Build up enough power.\n" + .string "Then, release your destructive might!!\n" + .string "That's all there is to it!$" + .string "Break the pots with your sword!\n" + .string "That's all!$" + .string "Equip the Pegasus Boots and your\n" + .string "sword, and then run like crazy!!$" + .string "Equip the Roc's Cape and the sword!!\n" + .string "Jump!!\n" + .string "When you reach your jump's peak,\n" + .string "swing the sword! That's all!$" + .string "Roll with {DPAD} and {RIGHT}, and then swing\n" + .string "your sword as you start to get up!$" + .string "When your hearts are full...swing your\n" + .string "sword with all your might!$" + .string "When you have only one heart left...\n" + .string "\n" + .string "Swing the sword with the last\n" + .string "of your waning strength!$" + .string "Perform a Spin Attack...and hit the\n" + .string "button! Again! Again! Again! Again!$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb8, 0x00, 0x00, 0x00, 0xb9, 0x00, 0x00, 0x00, 0x73, 0x01, 0x00, 0x00, 0xa0, 0x01, 0x00, 0x00, 0xd2, 0x01, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x21, 0x02, 0x00, 0x00, 0x75, 0x02, 0x00, 0x00, 0x9b, 0x02, 0x00, 0x00, 0xb5, 0x02, 0x00, 0x00, 0xf9, 0x02, 0x00, 0x00, 0xfa, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00, 0xb9, 0x03, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0x5c, 0x04, 0x00, 0x00, 0x91, 0x04, 0x00, 0x00, 0x5f, 0x05, 0x00, 0x00, 0x9d, 0x05, 0x00, 0x00, 0xdb, 0x05, 0x00, 0x00, 0x19, 0x06, 0x00, 0x00, 0x9f, 0x06, 0x00, 0x00, 0xf1, 0x06, 0x00, 0x00, 0x35, 0x07, 0x00, 0x00, 0x49, 0x07, 0x00, 0x00, 0x8d, 0x07, 0x00, 0x00, 0x8e, 0x07, 0x00, 0x00, 0xd4, 0x07, 0x00, 0x00, 0x0b, 0x08, 0x00, 0x00, 0x53, 0x08, 0x00, 0x00, 0x80, 0x08, 0x00, 0x00, 0x81, 0x08, 0x00, 0x00, 0xe5, 0x08, 0x00, 0x00, 0x28, 0x09, 0x00, 0x00, 0x7a, 0x09, 0x00, 0x00, 0xb5, 0x09, 0x00, 0x00, 0xb6, 0x09, 0x00, 0x00, 0x91, 0x0a, 0x00, 0x00, 0xc6, 0x0b, 0x00, 0x00, 0x6e, 0x0c, 0x00, 0x00, 0xfa, 0x0c, 0x00, 0x00, 0x80, 0x0d, 0x00, 0x00, 0xf0, 0x0d, 0x00, 0x00, 0x4f, 0x0e, 0x00, 0x00, 0xac, 0x0e, 0x00, 0x00, 0xad, 0x0e, 0x00, 0x00, 0x00 + .string "{UNK_0301FC}If you want to get across the swamp,\n" + .string "you need to be swift on your feet.\n" + .string "You know, a friend of mine makes shoes\n" + .string "in Hyrule's shoe shop.\n" + .string "I'm pretty sure he can make\n" + .string "{COLOR}{GREEN}Pegasus Boots{COLOR}{WHITE}...$" + .string "{UNK_0301FB}Would you like to fuse\n" + .string "Kinstones with me?$" + .string "{UNK_0301FE}You don't want to? You don't\n" + .string "even want to try?$" + .string "{UNK_0301FF}We did it! They fit perfectly! You know\n" + .string "what that means? Good luck for us!$" + .string "$" + .string "{UNK_0301F7}I found some amazingly rare {COLOR}{GREEN}Kinstone{COLOR}{WHITE}\n" + .string "pieces! At least, I think they're rare!$" + .string "{UNK_0301F8}Oh?! You want to fuse pieces? Yay!$" + .string "{UNK_0301F9}You don't want to try?$" + .string "{UNK_0301FA}Look at that! A perfect match!\n" + .string "I can't wait to see what happens!$" + .string "$" + .string "{UNK_0301FE}Hmmm... I found a {COLOR}{GREEN}Kinstone {COLOR}{WHITE}piece over\n" + .string "there.\n" + .string "I've never seen anything like it.\n" + .string "It must be a really rare one...$" + .string "{UNK_0301FF}You want to fuse pieces? Do you think\n" + .string "you have one that matches mine?$" + .string "{UNK_0301FD}Mmmm... I guess it's hard to find\n" + .string "a match for such a rare piece...$" + .string "{UNK_0301FB}Hmm! It fits perfectly!\n" + .string "\n" + .string "How could you have a piece that fits\n" + .string "my ultra-rare one so well!?$" + .string "{UNK_0301FB}I think this is a really\n" + .string "rare {COLOR}{GREEN}Kinstone piece{COLOR}{WHITE}!$" + .string "{UNK_030205}Hey, look at this {COLOR}{GREEN}Kinstone piece{COLOR}{WHITE}!\n" + .string "Have you ever seen one like this?\n" + .string "What? You don't know what a {COLOR}{GREEN}Kinstone\n" + .string "piece{COLOR}{WHITE} is? Well, tell you what...\n" + .string "Why don't you come back and see me\n" + .string "when you get one, OK?$" + .string "{UNK_030200}What's that? You want to {COLOR}{YELLOW}fuse\n" + .string "Kinstone pieces{COLOR}{WHITE} with me?$" + .string "{UNK_0301FA}I guess it's hard to find\n" + .string "a match for such a rare piece...$" + .string "{UNK_0301F9}Whaa! It fits! You must have had\n" + .string "a really rare piece, too!$" + .string "{UNK_0301FD}What? You don't know what a {COLOR}{GREEN}Kinstone\n" + .string "piece{COLOR}{WHITE} is? Well, tell you what...\n" + .string "Why don't you come back and see me\n" + .string "when you get one, OK?$" + .string "{UNK_0301FA}A visitor! How rare... I don't have much\n" + .string "to offer, but you're welcome to stay.$" + .string "{UNK_030200}What's that? You want to fuse\n" + .string "{COLOR}{GREEN}Kinstone pieces {COLOR}{WHITE}with me? Sure.$" + .string "{UNK_030201}You're quitting?$" + .string "{UNK_030202}We did it! They fit perfectly!\n" + .string "Maybe I'll get some luck finally!$" + .string "$" + .string "{UNK_030205}You moved the rock for me? Great!\n" + .string "I thought I'd never get outside!$" + .string "{UNK_0301FE}Oh, you want to fuse with me?\n" + .string "Now let's see here...$" + .string "{UNK_0301FB}I guess it'll be a while before I find\n" + .string "a piece that fits this one...$" + .string "{UNK_0301FC}Look! They fit!\n" + .string "How lucky! Amazing, even!$" + .string "$" + .string "{UNK_0301F9}What's your problem?\n" + .string "\n" + .string "Mmmm! You're staring at my amazingly\n" + .string "rare {COLOR}{GREEN}Kinstone piece{COLOR}{WHITE}, aren't you?!$" + .string "{UNK_0301FA}How dare you! You want to fuse\n" + .string "my precious {COLOR}{GREEN}Kinstone piece{COLOR}{WHITE}?!$" + .string "{UNK_0301FD}Phew... Sweet little {COLOR}{GREEN}Kinstone piece{COLOR}{WHITE}.\n" + .string "It's OK. No one's gonna hurt you...{T_0B}$" + .string "{UNK_030202}Ahh... They fit...\n" + .string "My poor little {COLOR}{GREEN}Kinstone piece{COLOR}{WHITE}...$" + .string "$" + .string "{UNK_030203}Hey! Your clothes... You must be\n" + .string "human! Oh, I just LOVE human fashion!\n" + .string "I just can't help feeling that humans\n" + .string "are more sophisticated than {COLOR}{RED}Minish{COLOR}{WHITE}.\n" + .string "You know, I even think some other\n" + .string "{COLOR}{RED}Minish {COLOR}{WHITE}feel that way, too...$" + .string "{UNK_030202}Water is life for {COLOR}{YELLOW}Crenel Beans{COLOR}{WHITE}!{COLOR}{YELLOW}\n" + .string "\n" + .string "{COLOR}{WHITE}The blue beans grow when you pour\n" + .string "{COLOR}{GREEN}water {COLOR}{WHITE}on them...\n" + .string "But the green beans like\n" + .string "{COLOR}{GREEN}Mt. Crenel Mineral Water{COLOR}{WHITE}.{COLOR}{YELLOW}\n" + .string "{COLOR}{GREEN}Mt. Crenel Mineral Water {COLOR}{WHITE}can be found\n" + .string "only in a spring here on {COLOR}{RED}Mount Crenel{COLOR}{WHITE}.\n" + .string "Well, really, the spring is closer to\n" + .string "the base of {COLOR}{RED}Mount Crenel{COLOR}{WHITE}.$" + .string "{UNK_030201}These {COLOR}{RED}soldier statues{COLOR}{YELLOW} {COLOR}{WHITE}here were built\n" + .string "by the Minish ages ago to help humans.\n" + .string "It's kind of a secret, but there's a\n" + .string "switch inside that {COLOR}{YELLOW}turns them on or off{COLOR}{WHITE}.$" + .string "{UNK_030201}Go get the {COLOR}{GREEN}flippers {COLOR}{WHITE}from the {COLOR}{RED}Minish\n" + .string "elder {COLOR}{WHITE}who lives in the library.\n" + .string "They'll make it so you can swim\n" + .string "through the water with ease.$" + .string "{UNK_030204}Can you solv" + .string "e my riddle?\n" + .string "\n" + .string "{COLOR}{YELLOW}Splish, splash, the sound of water.\n" + .string "He lives in the answer house.{COLOR}{WHITE}\n" + .string "I wonder if you'll meet my friend?$" + .string "{UNK_030204}{COLOR}{YELLOW}A fearsome, unfriendly feline...\n" + .string "The answer lives here!{COLOR}{WHITE}\n" + .string "You did well to come this far.\n" + .string "Please take this.$" + .string "{UNK_030204}{COLOR}{YELLOW}Man, woman, or middle?\n" + .string "He lives in the answer house.{COLOR}{WHITE}\n" + .string "I wonder if you'll meet my friend?$" + .string "{UNK_030204}{COLOR}{YELLOW}That meow is mighty!\n" + .string "He lives in the answer house.{COLOR}{WHITE}\n" + .string "I wonder if you'll meet my friend?$" + .string "$" + .string "{UNK_0301FB}I gave you my last {COLOR}{GREEN}Kinstone piece{COLOR}{WHITE}\n" + .string "a while ago! But I'll go look for more.$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0xd9, 0x01, 0x00, 0x00, 0x97, 0x02, 0x00, 0x00, 0x4a, 0x03, 0x00, 0x00, 0xa6, 0x03, 0x00, 0x00, 0x38, 0x04, 0x00, 0x00, 0x7a, 0x04, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00, 0x00 + .string "{UNK_0301FC}Oh, ho! A visitor! How rare!\n" + .string "\n" + .string "But you have found me, the\n" + .string "wisest of the wisest of the wise!\n" + .string "You what? You want to enter the\n" + .string "{COLOR}{YELLOW}temple you can see in the lake{COLOR}{WHITE}?\n" + .string "They call that place the {COLOR}{RED}Temple of\n" + .string "Droplets{COLOR}{WHITE}.\n" + .string "I have heard rumors that one Minish\n" + .string "actually did find a way in, long ago...\n" + .string "That Minish is {COLOR}{RED}Elder Librari{COLOR}{WHITE}, and he is\n" + .string "in semi-retirement in the town library.\n" + .string "The library should be opening soon.\n" + .string "Perhaps you can go find him.$" + .string "{UNK_0301FB}Yes, the elder Librari once found an\n" + .string "entrance to the Temple of Droplets.\n" + .string "And now, he lives in the town library!\n" + .string "\n" + .string "And this is all the wisdom of the wisest\n" + .string "of the wise I have to offer you!$" + .string "{UNK_030205}So you met with elder Librari?!\n" + .string "\n" + .string "And he said that he really HAS been\n" + .string "inside of the Temple of Droplets?\n" + .string "I knew it! Once again, my wisdom has\n" + .string "surpassed the wisdom of the wisest!$" + .string "{UNK_0301FE}I have lots of wise and thought-\n" + .string "provoking information...\n" + .string "But nothing for you right now.$" + .string "{UNK_030203}Hello! How nice to have a visitor!{T_0B}\n" + .string "\n" + .string "But...I'm having some trouble!\n" + .string "\n" + .string "They've changed the room around, and\n" + .string "now I can't get into the fireplace!$" + .string "{UNK_030202}They've changed the room around!\n" + .string "It's terrible now! So gauche!$" + .string "{UNK_030203}Thank you! Now I can climb in through\n" + .string "the fireplace and get some sleep!$" + .string "$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5c, 0x00, 0x00, 0x00, 0x5d, 0x00, 0x00, 0x00, 0x26, 0x01, 0x00, 0x00, 0xdc, 0x01, 0x00, 0x00, 0x93, 0x02, 0x00, 0x00, 0x44, 0x03, 0x00, 0x00, 0x45, 0x03, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00, 0xe4, 0x04, 0x00, 0x00, 0xe5, 0x05, 0x00, 0x00, 0xe6, 0x05, 0x00, 0x00, 0xe7, 0x05, 0x00, 0x00, 0xe8, 0x05, 0x00, 0x00, 0x8c, 0x06, 0x00, 0x00, 0xd9, 0x06, 0x00, 0x00, 0x55, 0x07, 0x00, 0x00, 0x14, 0x08, 0x00, 0x00, 0x9a, 0x08, 0x00, 0x00, 0xdd, 0x08, 0x00, 0x00, 0x31, 0x09, 0x00, 0x00, 0x87, 0x09, 0x00, 0x00, 0xad, 0x09, 0x00, 0x00, 0xee, 0x09, 0x00, 0x00, 0x00 + .string "Welcome to the library!\n" + .string "\n" + .string "Say, aren't you Smith's grandson,\n" + .string "{PLAYER}?\n" + .string "Hm? The books missing from the\n" + .string "bookshelf on the second floor?\n" + .string "Yes, they've been checked out for\n" + .string "quite a while. They're VERY overdue!\n" + .string "{UNK_074902}\n" + .string "$" + .string "Take {COLOR}{GREEN}A Hyrulean Bestiary{COLOR}{WHITE}, for\n" + .string "example. Been gone for ages.\n" + .string "Checked out by {COLOR}{YELLOW}a girl with a cat{COLOR}{WHITE}. She\n" + .string "said she had a new cat at her house.\n" + .string "Wanted to learn more about it, she did.$" + .string "The next overdue book is...\n" + .string "Let's see...\n" + .string "Ah, yes! Of course...{COLOR}{GREEN}Legend of the\n" + .string "Picori{COLOR}{WHITE}! It's been out forever!\n" + .string "It was checked out by a somewhat\n" + .string "{COLOR}{YELLOW}absentminded scholar{COLOR}{WHITE}, I believe...$" + .string "And the last book we still need\n" + .string "is {COLOR}{GREEN}A History of Masks{COLOR}{WHITE}.\n" + .string "I think it was checked out by {COLOR}{RED}Hagen{COLOR}{WHITE},\n" + .string "the mayor.\n" + .string "How could he keep a library book\n" + .string "so long! He's a public official!$" + .string "$" + .string "Hey! Look at that! Our long-lost copy\n" + .string "of {COLOR}{GREEN}A Hyrulean Bestiary{COLOR}{WHITE}!\n" + .string "{PLAYER}, are you returning\n" + .string "this book?! Thank you so much!\n" + .string "I can't begin to describe how much I'm\n" + .string "looking forward to putting this back!$" + .string "Oh my goodness, will you look at that!\n" + .string "\n" + .string "It's our copy of {COLOR}{GREEN}Legend of the Picori{COLOR}{WHITE}!\n" + .string "It's been checked out for so long!\n" + .string "{PLAYER}, you deserve a medal\n" + .string "for all this!\n" + .string "I am moved... Deeply, deeply moved\n" + .string "by this thoughtful gesture!$" + .string "Would you look at that! I can't believe\n" + .string "it! It's our copy of {COLOR}{GREEN}A History of Masks{COLOR}{WHITE}!\n" + .string "That mayor of ours is a real piece of\n" + .string "work, isn't he?\n" + .string "It must have been quite a challenge\n" + .string "to get this back from him.\n" + .string "You are my new favorite person,\n" + .string "{PLAYER}! Thank you so much!$" + .string "$" + .string "$" + .string "$" + .string "You know, {PLAYER}, you've now\n" + .string "returned all of our overdue books!\n" + .string "Now I can finally get that bookshelf\n" + .string "on the second floor in order!\n" + .string "Hey, {COLOR}{RED}Sturgeon{COLOR}{WHITE}! Books to shelve!!$" + .string "Yes, yes! Here I am! I'm here! I'll have\n" + .string "these books put away lickety-split!$" + .string "{UNK_0300DB}Sometimes, these books move on their\n" + .string "own! I've seen it with my own two eyes!\n" + .string "An' don't tell me I'm crazy!\n" + .string "I ain't crazy!$" + .string "Say, {COLOR}{RED}Sturgeon{COLOR}{WHITE}, on the second floor,\n" + .string "has been acting a little strange.\n" + .string "He keeps babbling about the books\n" + .string "moving around on their own!\n" + .string "Do you think maybe we have rats\n" + .string "or something up there?$" + .string "I'm in charge of checking out books,\n" + .string "so it's not my problem.\n" + .string "Still, I feel really bad for the girl\n" + .string "over there in charge of returns...$" + .string "Folks don't come up here so often.\n" + .string "I get a touch lonely on my own.$" + .string "Welcome to the library!\n" + .string "\n" + .string "Hey! Aren't you Smith's grandson,\n" + .string "{PLAYER}? Enjoy your browsing!$" + .string "The bookshelves are back in order!\n" + .string "Ah, I feel so...so...renewed!\n" + .string "Enjoy your browsing!$" + .string "Wonder what I should check out today.$" + .string "Oh ho ho! All the books are back\n" + .string "on the shelves! Isn't it grand!$" + .string "$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x00, 0x00, 0x00, 0xa1, 0x00, 0x00, 0x00, 0x18, 0x02, 0x00, 0x00, 0x19, 0x02, 0x00, 0x00, 0xdd, 0x02, 0x00, 0x00, 0x0a, 0x03, 0x00, 0x00, 0xab, 0x03, 0x00, 0x00, 0xca, 0x03, 0x00, 0x00, 0xdf, 0x03, 0x00, 0x00, 0xf4, 0x03, 0x00, 0x00, 0xe2, 0x04, 0x00, 0x00, 0xf7, 0x04, 0x00, 0x00, 0x8f, 0x05, 0x00, 0x00, 0xcc, 0x05, 0x00, 0x00, 0xe1, 0x05, 0x00, 0x00, 0xf6, 0x05, 0x00, 0x00, 0x0b, 0x06, 0x00, 0x00, 0x20, 0x06, 0x00, 0x00, 0x30, 0x07, 0x00, 0x00, 0x45, 0x07, 0x00, 0x00, 0x5c, 0x08, 0x00, 0x00, 0x71, 0x08, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00, 0x9b, 0x08, 0x00, 0x00, 0xb0, 0x08, 0x00, 0x00, 0xc5, 0x08, 0x00, 0x00, 0x91, 0x0a, 0x00, 0x00, 0xdc, 0x0a, 0x00, 0x00, 0xf1, 0x0a, 0x00, 0x00, 0x06, 0x0b, 0x00, 0x00, 0x1b, 0x0b, 0x00, 0x00, 0x30, 0x0b, 0x00, 0x00, 0x45, 0x0b, 0x00, 0x00, 0x5a, 0x0b, 0x00, 0x00, 0x6f, 0x0b, 0x00, 0x00, 0xa2, 0x0c, 0x00, 0x00, 0x14, 0x0d, 0x00, 0x00, 0x8a, 0x0d, 0x00, 0x00, 0xb5, 0x0d, 0x00, 0x00, 0x6e, 0x0e, 0x00, 0x00, 0x00 + .string "{UNK_0301FD}Hey, hey, hey! This is no good!\n" + .string "No good at all!\n" + .string "The humans have {COLOR}{YELLOW}checked some books\n" + .string "out of the library{COLOR}{WHITE}!\n" + .string "Thanks to them, none of us can get\n" + .string "back to {COLOR}{RED}Elder Librari{COLOR}{WHITE}...\n" + .string "How will he get by all alone?\n" + .string "I'm so worried...\n" + .string "I'm sure the {COLOR}{RED}librarian{COLOR}{WHITE} knows something\n" + .string "about where those books went...\n" + .string "I wish I were big. Why, I'd walk right\n" + .string "up and ask her where those books went!$" + .string "$" + .string "{UNK_0301FD}Hey, hey, hey! Listen up! Listen good!\n" + .string "The books are back now!\n" + .string "It's true! It's true! Haha!\n" + .string "Now we can get back to {COLOR}{RED}Elder Librari{COLOR}{WHITE}!\n" + .string "So you brought the books back?\n" + .string "Good for you! Thank you!\n" + .string "{UNK_074A04}$" + .string "{UNK_0301FE}Please take this as a\n" + .string "sign of our thanks!$" + .string "{UNK_030200}I'd better get back to {COLOR}{RED}Elder Librari{COLOR}{WHITE}\n" + .string "now! He'll be wondering where I am.\n" + .string "Especially now that I can climb over the\n" + .string "books, right? I mean, it's so easy now!$" + .string "{UNK_030205}Thanks again for your help!$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}007$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}008$" + .string "{UNK_0301F7}What a great combo!\n" + .string "\n" + .string "You're going to meet\n" + .string "{COLOR}{RED}Elder Librari{COLOR}{WHITE} and {COLOR}{RED}Jotori{COLOR}{WHITE}?\n" + .string "Oh, and how about Librari's long,\n" + .string "boring adventure stories? Haha!\n" + .string "Talk about thrilling! Har har!\n" + .string "\n" + .string "Well, if you're going over there,\n" + .string "just climb over the books!$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}010$" + .string "{UNK_0301F8}We can't get up the shelf, because\n" + .string "some human checked that book out!\n" + .string "But at least we don't have to listen to\n" + .string "{COLOR}{RED}Elder Librari{COLOR}{WHITE}'s boring old stories!$" + .string "{UNK_0301F9}Ahh, it's so nice to have all my little\n" + .string "books in a row!{T_0B}$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}013$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}014$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}015$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}016$" + .string "{UNK_030205}I am {COLOR}{RED}Jotori{COLOR}{WHITE}, one of {COLOR}{RED}Librari{COLOR}{WHITE}'s students!\n" + .string "\n" + .string "And to be perfectly honest, I think\n" + .string "that {COLOR}{RED}Librari{COLOR}{WHITE}'s adventure stories are...\n" + .string "{UNK_0301FD}The best!!\n" + .string "No, really!\n" + .string "I may be a mental giant, but I have\n" + .string "the body of just a tiny Minish lad...\n" + .string "That's why I really admire strong folk!$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}018$" + .string "{UNK_0301FD}Oh! So you passed the trial and\n" + .string "returned with {COLOR}{RED}Elder Librari{COLOR}{WHITE}'s flippers?\n" + .string "I'm so jealous!\n" + .string "I'm not much for exercise myself...\n" + .string "But if you're going on an adventure,\n" + .string "there's no one better to learn from!\n" + .string "Ah, that {COLOR}{RED}Elder Librari{COLOR}{WHITE}! He's so manly!\n" + .string "So brave! And so full of FIRE!$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}020$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}021$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}022$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}023$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}024$" + .string "{UNK_03020D}Wohohoho! What business have you\n" + .string "with old {COLOR}{RED}Librari{COLOR}{WHITE}?\n" + .string "But! Before you ask, please allow me\n" + .string "to introduce myself.\n" + .string "Wohohoho! Ahem, aheeeeem...\n" + .string "\n" + .string "My name is {COLOR}{RED}Librari{COLOR}{WHITE}, and I have lived\n" + .string "many long years.\n" + .string "So many, in fact, that I've rather\n" + .string "forgotten how old I am!\n" + .string "But when I was young, oh,\n" + .string "I crossed mountain and sea!\n" + .string "I had many great adventures, but now\n" + .string "I stay here and teach students.\n" + .string "Yes, I enjoy my life of quiet study.\n" + .string "I have so many stories yet to tell...$" + .string "{UNK_03020D}Yes, you are speaking to the world-\n" + .string "famous treasure-hunter {COLOR}{RED}Librari{COLOR}{WHITE}!$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}027$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}028$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}029$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}030$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}031$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}032$" + .string "KOBITO{SYM_UNK2}HONDANA{SYM_UNK2}033$" + .string "{UNK_03020D}Wohohoho! Oh?\n" + .string "A visitor after many long weeks!\n" + .string "Even {COLOR}{RED}Jotari{COLOR}{WHITE} has been away so long,\n" + .string "I've grown almost...lonely.\n" + .string "...But what is it? What do you need?\n" + .string "\n" + .string "Hm? You want to visit the {COLOR}{RED}Temple of\n" + .string "Droplets{COLOR}{WHITE}?\n" + .string "Very well... You are the first such\n" + .string "brave person in a long while!\n" + .string "Stand on the clover in front of me!$" + .string "{UNK_03020D}Hrmm?\n" + .string "What's this? What's this?\n" + .string "You want me to cut to the chase and\n" + .string "tell you about the {COLOR}{RED}Temple of Droplets{COLOR}{WHITE}?$" + .string "{UNK_03020D}All right, all right. You kids today...\n" + .string "No patience for an old man.\n" + .string "Well, just stand right there, like\n" + .string "I told you!$" + .string "Wohoho!\n" + .string "Now...OPEN, secret mystery panel!!$" + .string "Wohoho! Wasn't that fun?\n" + .string "Now then...\n" + .string "It's up to you to pass this {COLOR}{YELLOW}trial {COLOR}{WHITE}safely\n" + .string "and recover the {COLOR}{GREEN}item {COLOR}{WHITE}you require.\n" + .string "Oh, what fun! I do so love the real\n" + .string "nitty-gritty of adventuring!$" + .string "{UNK_03020D}Well done, indeed! Why, you're almost\n" + .string "as spry as I was at that age!$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa4, 0x00, 0x00, 0x00, 0xa5, 0x00, 0x00, 0x00, 0xbd, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x22, 0x01, 0x00, 0x00, 0x52, 0x01, 0x00, 0x00, 0x7d, 0x01, 0x00, 0x00, 0x9f, 0x01, 0x00, 0x00, 0xc5, 0x01, 0x00, 0x00, 0xdc, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x36, 0x02, 0x00, 0x00, 0x65, 0x02, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0xbd, 0x02, 0x00, 0x00, 0xd6, 0x02, 0x00, 0x00, 0x19, 0x03, 0x00, 0x00, 0x60, 0x03, 0x00, 0x00, 0x78, 0x03, 0x00, 0x00, 0xa6, 0x03, 0x00, 0x00, 0xf1, 0x03, 0x00, 0x00, 0x35, 0x04, 0x00, 0x00, 0x6a, 0x04, 0x00, 0x00, 0xa6, 0x04, 0x00, 0x00, 0xe8, 0x04, 0x00, 0x00, 0x3b, 0x05, 0x00, 0x00, 0x4d, 0x05, 0x00, 0x00, 0x5f, 0x05, 0x00, 0x00, 0x71, 0x05, 0x00, 0x00, 0x83, 0x05, 0x00, 0x00, 0x95, 0x05, 0x00, 0x00, 0xa7, 0x05, 0x00, 0x00, 0x41, 0x06, 0x00, 0x00, 0x93, 0x06, 0x00, 0x00, 0xd4, 0x06, 0x00, 0x00, 0xca, 0x07, 0x00, 0x00, 0x62, 0x08, 0x00, 0x00, 0xcc, 0x08, 0x00, 0x00, 0x15, 0x09, 0x00, 0x00, 0x4e, 0x09, 0x00, 0x00, 0x60, 0x09, 0x00, 0x00, 0x00 + .string "{UNK_0301F7}What a nice smell...$" + .string "{UNK_0301FB}I like those red hats the Forest Minish\n" + .string "wear...$" + .string "{UNK_0301F8}I like these blue hats the Town\n" + .string "Minish wear...$" + .string "{UNK_0301FD}The {COLOR}{RED}Forest Minish{COLOR}{WHITE}\n" + .string "have come for a visit.$" + .string "{UNK_0301FF}I knew the city life would be exciting!$" + .string "{UNK_030201}Everyone here is so refined...$" + .string "{UNK_030202}I get hungry just from that smell!$" + .string "{UNK_0301FC}I want a red hat...$" + .string "{UNK_0301FC}I want a blue hat...$" + .string "{UNK_0301FF}Our reunion with the {COLOR}{RED}Forest Minish{COLOR}{WHITE} is\n" + .string "still in full swing!$" + .string "{UNK_030201}We're getting more refined just\n" + .string "BEING here!$" + .string "{UNK_030201}Maybe I should just stay here and\n" + .string "never go back home...$" + .string "{UNK_030205}What a wonderful smell...$" + .string "{UNK_030203}We just love bread...$" + .string "{UNK_030202}Sometimes I sneak off with a little\n" + .string "nibble of leftover bread.{T_0B}$" + .string "{UNK_030200}The bread {COLOR}{RED}Wheaton {COLOR}{WHITE}makes has got\n" + .string "to be the best bread in Hyrule!$" + .string "{UNK_0301FB}Isn't {COLOR}{RED}Pita {COLOR}{WHITE}cute?$" + .string "{UNK_0301FF}Every one of their breads is\n" + .string "so delicious!$" + .string "{UNK_0301FE}Those two newlyweds are being more\n" + .string "fresh than this fresh-baked bread!{T_0B}$" + .string "{UNK_0301FA}It's such a thrill coming up here from\n" + .string "below, just like PSHOOOO!$" + .string "{UNK_0301FD}Fewer and fewer people are coming\n" + .string "to buy bread...$" + .string "{UNK_0301FC}I can't believe how dangerous\n" + .string "it's gotten around here...$" + .string "{UNK_0301FB}Now more than ever, we all need to get\n" + .string "some good-luck bread!{T_0B}$" + .string "{UNK_0301FE}I like eating leftovers, but I just wish\n" + .string "business were going better for them...$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}025$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}026$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}027$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}028$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}029$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}030$" + .string "{UNK_0301F8}Hmmm! I see! Oh, that makes sense!\n" + .string "...Human books are so interesting!\n" + .string "And that guy {COLOR}{RED}Dr. Left{COLOR}{WHITE} living down there\n" + .string "has great taste in reading material!$" + .string "{UNK_0301F9}I'm almost done with this book. I should\n" + .string "go nab another of the doctor's books.$" + .string "{UNK_0301FA}I would love to read something a little\n" + .string "more romantic next...$" + .string "{UNK_0301FB}Ho! Ha! Hey!!\n" + .string "\n" + .string "Phew... I want to {COLOR}{YELLOW}return this book by\n" + .string "dropping it down below{COLOR}{WHITE}.\n" + .string "It's impossible without some\n" + .string "extra weight here...\n" + .string "But my brother is so busy with a book\n" + .string "of his own that he won't help me out!\n" + .string "Maybe I can do it if I try again...$" + .string "{UNK_0301FC}I think my brother is going to finish\n" + .string "that book he's reading soon.\n" + .string "I bet I'll have to return that one, too.\n" + .string "Guess I'd better put on a little weight!$" + .string "{UNK_0301FE}My brother loves reading books!\n" + .string "\n" + .string "And I love pushing my brother's books\n" + .string "off the rafters to return them!$" + .string "{UNK_030201}It's a bit dusty up here, huh?\n" + .string "Maybe I should do a little cleaning...$" + .string "{UNK_030202}Thanks for cleaning up!\n" + .string "Now, all that dust is gone!{T_0B}$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}039$" + .string "KOBITO{SYM_UNK2}HARI{SYM_UNK2}040$" + .byte 0xff, 0xff, 0x5c, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x71, 0x01, 0x00, 0x00, 0x31, 0x02, 0x00, 0x00, 0xd3, 0x02, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x8a, 0x03, 0x00, 0x00, 0xce, 0x03, 0x00, 0x00, 0x95, 0x04, 0x00, 0x00, 0x31, 0x05, 0x00, 0x00, 0xd4, 0x05, 0x00, 0x00, 0x02, 0x06, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00, 0xaf, 0x06, 0x00, 0x00, 0x84, 0x07, 0x00, 0x00, 0x26, 0x08, 0x00, 0x00, 0x9a, 0x08, 0x00, 0x00, 0x1d, 0x09, 0x00, 0x00, 0xa7, 0x09, 0x00, 0x00, 0x38, 0x0a, 0x00, 0x00, 0x49, 0x0a, 0x00, 0x00, 0xdf, 0x0a, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00 + .string "SHICYO{SYM_UNK2}TEI{SYM_UNK2}000$" + .string "Aherrrm herrmmm!\n" + .string "I am {COLOR}{RED}Hagen{COLOR}{WHITE}, mayor of this fair town!\n" + .string "Mayors are usually very important and\n" + .string "busy folk, I'll have you know...\n" + .string "But I still have a hobby, of course!\n" + .string "I collect unusual masks!\n" + .string "I just love them!\n" + .string "They're beautiful!\n" + .string "Simply magnificent, I tell you!$" + .string "Aherrm!\n" + .string "\n" + .string "Yes! That's me, {COLOR}{RED}Hagen{COLOR}{WHITE}.\n" + .string "I am mayor of this town.\n" + .string "What's that? You want a book?\n" + .string "{COLOR}{GREEN}A History of Masks{COLOR}{WHITE}?\n" + .string "And you say I checked it out,\n" + .string "do you? Yes, indeed I did...\n" + .string "Or wait... Did I?$" + .string "Ahh, you seem to have found the book,\n" + .string "safe and sound and in fine shape!\n" + .string "But only because you listened to my\n" + .string "masks like a good little boy, right?\n" + .string "War har har har!$" + .string "I'm going to have to pick up volume 2.\n" + .string "That last book was just getting good!$" + .string "{UNK_0301FE}The person living here is the mayor,\n" + .string "very important you know.\n" + .string "Doesn't it all just sound so...official?$" + .string "{UNK_0301F8}The mayor likes strange masks.\n" + .string "Sometimes, he even makes his own.$" + .string "{UNK_0301FD}The mayor took off for his {COLOR}{RED}cabin by the\n" + .string "lake{COLOR}{WHITE} clutching a {COLOR}{GREEN}book{COLOR}{WHITE}. We saw him go...\n" + .string "But after the chest was opened, the\n" + .string "road to {COLOR}{RED}Minish Woods{COLOR}{WHITE} was blocked.\n" + .string "You won't be able to get through.$" + .string "{UNK_0301F6}When the {COLOR}{RED}mayor {COLOR}{WHITE}came back, he didn't\n" + .string "have that {COLOR}{GREEN}book {COLOR}{WHITE}anymore.\n" + .string "I'm sure he just left it at his {COLOR}{RED}lakeside\n" + .string "cabin{COLOR}{WHITE}. He's pretty forgetful like that.$" + .string "{UNK_0301FC}You want to go to the cabin\n" + .string "by the lake?\n" + .string "Well, let me just mark\n" + .string "it here on your {COLOR}{GREEN}map{COLOR}{WHITE}.\n" + .string "Err... Yes! There. It's right here.\n" + .string "You should be able to find it now.$" + .string "{UNK_0301FD}So the {COLOR}{GREEN}book {COLOR}{WHITE}WAS at the {COLOR}{RED}lake{COLOR}{WHITE}, then.$" + .string "{UNK_0301F9}Ah, but I do love our absentminded\n" + .string "old mayor. He's a fine man.$" + .string "You know, these masks see everything\n" + .string "that goes on in my private life.\n" + .string "Maybe you should just ask my masks!\n" + .string "$" + .string "I think I've finally got a good grasp\n" + .string "of how things run in {COLOR}{RED}Hyrule{COLOR}{WHITE}.\n" + .string "Things run so smoothly around here,\n" + .string "and I haven't even done a thing!\n" + .string "I wonder how much better this place\n" + .string "would be if I actually did anything!$" + .string "Aherrm!! That hole in the garden leads\n" + .string "to a shelter of sorts.\n" + .string "But it's not like I'm trying to run off\n" + .string "and save myself alone or anything!\n" + .string "Just keep that in mind!\n" + .string "$" + .string "I'm thinking of ways to increase the\n" + .string "library's budget to buy more books.\n" + .string "Especially the ones about masks,\n" + .string "you know.$" + .string "I may look somewhat idle to you,\n" + .string "but no, sir!\n" + .string "I will be working terrifically hard as\n" + .string "soon as you leave.\n" + .string "You can bet on that! Hoho!$" + .string "These are the times that really test my\n" + .string "mettle as a mayor, I tell you.\n" + .string "Hyrule is my responsibility to the last.\n" + .string "Everyone to the shelters!$" + .string "Monsters are coming!\n" + .string "Everyone stay indoors!\n" + .string "Oh, that doesn't apply to you, my boy!\n" + .string "You go get 'em, {PLAYER}!\n" + .string "Your sword and bravery\n" + .string "will save the day!$" + .string "SHICYO{SYM_UNK2}TEI{SYM_UNK2}019$" + .string "I hope I don't sound like I'm bragging,\n" + .string "but I have a cabin at {COLOR}{RED}Lake Hylia{COLOR}{WHITE}.\n" + .string "It's a gorgeous little place where I go\n" + .string "to enjoy my hobby, mask making.$" + .string "{UNK_0301F9}That {COLOR}{RED}cabin by the lake{COLOR}{WHITE} is\n" + .string "really quite far.$" + .string "{UNK_0301FD}The mayor wouldn't be nearly so\n" + .string "charming if he weren't so carefree.$" + .byte 0xff, 0xff, 0xff, 0x40, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, 0x30, 0x01, 0x00, 0x00, 0x3a, 0x01, 0x00, 0x00, 0x44, 0x01, 0x00, 0x00, 0xce, 0x02, 0x00, 0x00, 0x33, 0x03, 0x00, 0x00, 0xc4, 0x04, 0x00, 0x00, 0x6f, 0x06, 0x00, 0x00, 0xe7, 0x06, 0x00, 0x00, 0x2a, 0x07, 0x00, 0x00, 0xc7, 0x08, 0x00, 0x00, 0xae, 0x09, 0x00, 0x00, 0xd9, 0x09, 0x00, 0x00, 0x2c, 0x0a, 0x00, 0x00 + .string "LEFT{SYM_UNK2}000$" + .string "What is all of this!?\n" + .string "I'm busy, don't you see that?\n" + .string "Do not disturb my research! If you have\n" + .string "no business, begone! You heard me!$" + .string "What, huh?\n" + .string "A book? From the library?\n" + .string "Ah, yes...of course. I knew this\n" + .string "day would come. Please, come in.$" + .string "LEFT{SYM_UNK2}003$" + .string "LEFT{SYM_UNK2}004$" + .string "I am a researcher of Picori legend\n" + .string "and lore. My name is {COLOR}{YELLOW}Dr. Left{COLOR}{WHITE}.\n" + .string "You're here about that book,\n" + .string "{COLOR}{GREEN}Legend of the Picori{COLOR}{WHITE}, aren't you?\n" + .string "Well, I hate to say this, but I haven't\n" + .string "seen it in several days.\n" + .string "Perhaps a mischievous little mouse\n" + .string "has taken it?\n" + .string "Well, I'm sure it's in this house\n" + .string "somewhere. I just don't know where.\n" + .string "But I'm very busy right now, so why\n" + .string "don't you just look for it yourself?$" + .string "A book fell with a {QT}THUD!{QT} a little\n" + .string "while ago.\n" + .string "It gave me such a shock that\n" + .string "my heart skipped a beat!$" + .string "You found and returned the book for\n" + .string "me, did you? I'm very grateful.\n" + .string "Here, let me tell you something\n" + .string "interesting as thanks.\n" + .string "You see, the Minish did not always live\n" + .string "in our world.\n" + .string "No, they came through a secret portal\n" + .string "many ages ago from their world to ours!\n" + .string "But don't tell anyone! It's a valuable\n" + .string "bit of knowledge that only I know!\n" + .string "And I gleaned it only after hours of\n" + .string "study from an incredibly old book.$" + .string "So you've come to hear more about the\n" + .string "Minish, have you?\n" + .string "Well, I can part with one more tidbit,\n" + .string "I suppose... It could be useful.\n" + .string "The portal linking us to the Minish\n" + .string "world opens only once every 100 years.\n" + .string "That means the Minish here now are\n" + .string "descendants of those who came before.\n" + .string "That's right! Those Minish came here\n" + .string "100 years ago, or even longer ago!\n" + .string "Now that the portal is open this year,\n" + .string "perhaps new Minish will come through...$" + .string "The more I study the Minish, the closer\n" + .string "I feel to them!\n" + .string "It's almost as if they were right\n" + .string "here with me, all the time...$" + .string "I never leave my house, whether there\n" + .string "are monsters outside or not!$" + .string "Hey, do you know the clues that reveal\n" + .string "the location of the treasure?\n" + .string "{COLOR}{YELLOW}Cross the bridge that spans\n" + .string "the rapid flow...\n" + .string "Through the land of\n" + .string "the fearsome beast...\n" + .string "Until you reach\n" + .string "the misty falls...\n" + .string "The treasure sleeps on the other side\n" + .string "of the secret entrance there...{COLOR}{WHITE}\n" + .string "They say it's a magical tool that allows\n" + .string "even little people to push big things!\n" + .string "According to the legend, you're\n" + .string "supposed to start from this house!$" + .string "{UNK_0301FB}Ahh... What should I do? Should I stay\n" + .string "or go? If I go, there could be...\n" + .string "...What's that?\n" + .string "\n" + .string "You've already found the {COLOR}{GREEN}bracelet {COLOR}{WHITE}that\n" + .string "makes one strong?!\n" + .string "Ahhh, I knew it! I'd been stumped on\n" + .string "that for so long! I knew I'd lose out!$" + .string "{UNK_0301FC}You're so brave!\n" + .string "I really respect that!$" + .string "{UNK_0301FD}Have you been using the {COLOR}{GREEN}bracelet {COLOR}{WHITE}that\n" + .string "makes you strong? Must come in handy!$" + .string "Oh, look! You've found it! Could I ask\n" + .string "you to return that {COLOR}{GREEN}book {COLOR}{WHITE}for me, lad?$" + .byte 0xff, 0xff, 0xff, 0xff, 0xd0, 0x00, 0x00, 0x00, 0xd1, 0x00, 0x00, 0x00, 0x0f, 0x01, 0x00, 0x00, 0x43, 0x01, 0x00, 0x00, 0x4b, 0x01, 0x00, 0x00, 0x7b, 0x01, 0x00, 0x00, 0xc8, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0xed, 0x02, 0x00, 0x00, 0xad, 0x03, 0x00, 0x00, 0x45, 0x04, 0x00, 0x00, 0x90, 0x05, 0x00, 0x00, 0xf5, 0x05, 0x00, 0x00, 0xf6, 0x05, 0x00, 0x00, 0xf7, 0x05, 0x00, 0x00, 0x49, 0x06, 0x00, 0x00, 0x67, 0x06, 0x00, 0x00, 0xcc, 0x06, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x81, 0x07, 0x00, 0x00, 0x8c, 0x07, 0x00, 0x00, 0x97, 0x07, 0x00, 0x00, 0xba, 0x07, 0x00, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x2a, 0x08, 0x00, 0x00, 0x7f, 0x08, 0x00, 0x00, 0xb7, 0x08, 0x00, 0x00, 0xe6, 0x08, 0x00, 0x00, 0x33, 0x09, 0x00, 0x00, 0xb0, 0x09, 0x00, 0x00, 0x03, 0x0a, 0x00, 0x00, 0x47, 0x0a, 0x00, 0x00, 0x88, 0x0a, 0x00, 0x00, 0xd0, 0x0a, 0x00, 0x00, 0x41, 0x0b, 0x00, 0x00, 0x76, 0x0b, 0x00, 0x00, 0xc0, 0x0b, 0x00, 0x00, 0x2b, 0x0c, 0x00, 0x00, 0x80, 0x0c, 0x00, 0x00, 0x19, 0x0d, 0x00, 0x00, 0x81, 0x0d, 0x00, 0x00, 0x82, 0x0d, 0x00, 0x00, 0x83, 0x0d, 0x00, 0x00, 0xc1, 0x0d, 0x00, 0x00, 0xf9, 0x0d, 0x00, 0x00, 0x0d, 0x0e, 0x00, 0x00, 0x3a, 0x0e, 0x00, 0x00, 0x7a, 0x0e, 0x00, 0x00, 0xc8, 0x0e, 0x00, 0x00, 0x26, 0x0f, 0x00, 0x00, 0x76, 0x0f, 0x00, 0x00, 0x00 + .string "Hey.\n" + .string "What do you want?\n" + .string "My sister's not here.\n" + .string "She's at school.$" + .string "You have a weird hat. Where can\n" + .string "I get one of those?$" + .string "Aaaarf!$" + .string "My dog's real smart.\n" + .string "And a little spoiled, too.$" + .string "{COLOR}{RED}Julietta{COLOR}{WHITE}, from next door, went\n" + .string "back" + .string " home...\n" + .string "But I'll see her tomorrow!{T_0B}$" + .string "My sister's back now.\n" + .string "I guess she's supposed to stay in.$" + .string "{UNK_0300D1}Awooo! Hot! Awoo!\n" + .string "{COLOR}{YELLOW}The fireplace is too hot!{COLOR}{WHITE}\n" + .string "My master won't come home, 'cuz he's\n" + .string "head over heels for the girl next door.\n" + .string "But when he puts the fire out, then\n" + .string "sometimes mice come out...\n" + .string "I hate mice, so either way,\n" + .string "I'm never happy!$" + .string "{UNK_0300D1}It's too hot! Arf...\n" + .string "{COLOR}{YELLOW}The fireplace is too hot...{COLOR}{WHITE}\n" + .string "Now there are even more people in here,\n" + .string "and it's getting too hot to bear!\n" + .string "What will it take to cool this place\n" + .string "down!? Pant, pant, pant!$" + .string "{UNK_0300D1}Thanks, arf!\n" + .string "You put out the fire.\n" + .string "But I'm still miffed at my master!\n" + .string "\n" + .string "I can't believe how long he's been\n" + .string "hanging out with his girlfriend!\n" + .string "Arf! Arf!$" + .string "Huh? A {COLOR}{GREEN}book {COLOR}{WHITE}from the {COLOR}{RED}library{COLOR}{WHITE}?\n" + .string "\n" + .string "{COLOR}{GREEN}A Hyrulean Bestiary{COLOR}{WHITE}, is that the one?\n" + .string "Yeah, I checked it out a while ago.\n" + .string "You came all this way to get it?\n" + .string "Wow! You're one dedicated librarian!\n" + .string "But... I don't know how to tell you\n" + .string "this, but it's back at my house.\n" + .string "Would you mind going there to get it?\n" + .string "I just can't leave right now, see...$" + .string "They say the king's been weird lately.\n" + .string "\n" + .string "But that doesn't really have anything\n" + .string "to do with our love...$" + .string "$" + .string "$" + .string "I'm writing a letter right now, so I\n" + .string "don't have any time to play with you.\n" + .string "Sorry.$" + .string "You returned my book?\n" + .string "Thanks!$" + .string "They say the king's been weird lately.\n" + .string "\n" + .string "But that doesn't really have anything\n" + .string "to do with our love...$" + .string "You ought to be careful when you're\n" + .string "running around! You're awfully tiny!\n" + .string "And not all dogs and cats are nice,\n" + .string "like me. Woof!\n" + .string "Some of them might even take a swipe\n" + .string "at you, arf! Rarf!$" + .string "$" + .string "MINKA{SYM_UNK2}019$" + .string "MINKA{SYM_UNK2}020$" + .string "Oh, hello.\n" + .string "My brother's at school.$" + .string "I'm writing a letter right now, so I\n" + .string "don't have any time to play with you.\n" + .string "Sorry.$" + .string "{UNK_0300D2}Meowry-meowww!!!$" + .string "{UNK_0300D2}Sssss!$" + .string "My family is all very close. Same with\n" + .string "{COLOR}{RED}Romio{COLOR}{WHITE}'s family next door, too.\n" + .string "Hee hee!{T_0B}$" + .string "My brother's back. Now, he's not\n" + .string "allowed out anymore...$" + .string "Dear Mom,\n" + .string "Gone to Julietta's house. Back soon.$" + .string "{UNK_030202}It's really dangerous up ahead! You\n" + .string "can't just charge through recklessly!$" + .string "{UNK_030202}Hey, I've heard about you... So you're\n" + .string "gonna go ahead, are you?\n" + .string "Well, onward to glory then!\n" + .string "Just don't die out there, OK?$" + .string "{UNK_030202}You made it through that den of evil\n" + .string "and came back alive?!\n" + .string "Amazing! Whoo! Whoo!$" + .string "I come from a faraway land. You\n" + .string "can tell by my clothing, can't you?$" + .string "This place isn't so bad once you get\n" + .string "used to it. I like it here.$" + .string "In this cool climate, my clothes are\n" + .string "a little on the unprotective side.$" + .string "I'm thinking about calling my family\n" + .string "over soon.\n" + .string "Living with your feet on the ground\n" + .string "is not so bad, I've decided.$" + .string "So you've been to my " + .string "hometown?\n" + .string "It's great, isn't it?$" + .string "Monsters could attack at any time.\n" + .string "Maybe I shouldn't call my family over.$" + .string "{UNK_0301FF}I really like this house. This is the\n" + .string "best place in this whole human town!\n" + .string "I want to stay here forever.$" + .string "{UNK_0301FF}This place is getting a little run-down.\n" + .string "I'm thinking about rebuilding the place.$" + .string "{UNK_0301FF}Welcome!\n" + .string "\n" + .string "This is my new house! Ah... Don't\n" + .string "you just love that new-house smell?\n" + .string "And I was JUST thinking about building\n" + .string "a new house, so this is great!$" + .string "{UNK_0301FF}Imagine moving from a musty old\n" + .string "mushroom to a fabulous house like this!\n" + .string "It's like a dream come true!$" + .string "$" + .string "$" + .string "Well, I suppose I'd better get dinner\n" + .string "started! Hmm hm hmmm!{T_0B}$" + .string "Oooh, scary... Well, as long as nothing\n" + .string "else happens...$" + .string "What's a moss-ster?$" + .string "It's so boring not being\n" + .string "able to go outside.$" + .string "{UNK_030200}The boss might seem rough, but he's\n" + .string "a real softy at heart...$" + .string "{UNK_030200}The boss is a real refined fella, right?\n" + .string "Anybody what's smart can see dat!$" + .string "{UNK_030200}I would like to apprentice to the boss,\n" + .string "too, but he barely even notices me...\n" + .string "It's so sad.$" + .string "{UNK_030200}They call him Punch Mutoh because he's\n" + .string "like a real punchy fella and all dat.$" + .string "{UNK_030200}The boss is the number-one builder in\n" + .string "town. You need a building, you see him.$" + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x98, 0x01, 0x00, 0x00, 0x30, 0x02, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xcc, 0x02, 0x00, 0x00, 0xef, 0x02, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00, 0xb7, 0x03, 0x00, 0x00, 0x8d, 0x04, 0x00, 0x00, 0xa3, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x2a, 0x05, 0x00, 0x00, 0xab, 0x05, 0x00, 0x00, 0xfb, 0x05, 0x00, 0x00, 0x1a, 0x06, 0x00, 0x00, 0x35, 0x06, 0x00, 0x00, 0x6b, 0x06, 0x00, 0x00, 0x92, 0x06, 0x00, 0x00, 0x34, 0x07, 0x00, 0x00, 0x4f, 0x07, 0x00, 0x00, 0xd0, 0x07, 0x00, 0x00, 0x1e, 0x08, 0x00, 0x00, 0x71, 0x08, 0x00, 0x00, 0xc1, 0x08, 0x00, 0x00, 0x08, 0x09, 0x00, 0x00, 0x30, 0x09, 0x00, 0x00, 0xb0, 0x09, 0x00, 0x00, 0xff, 0x09, 0x00, 0x00, 0x1b, 0x0a, 0x00, 0x00, 0x41, 0x0a, 0x00, 0x00, 0x81, 0x0a, 0x00, 0x00, 0xa5, 0x0a, 0x00, 0x00, 0x1d, 0x0b, 0x00, 0x00, 0x78, 0x0b, 0x00, 0x00, 0xef, 0x0b, 0x00, 0x00, 0x40, 0x0c, 0x00, 0x00, 0x68, 0x0c, 0x00, 0x00, 0xa8, 0x0c, 0x00, 0x00, 0x1e, 0x0d, 0x00, 0x00, 0x63, 0x0d, 0x00, 0x00, 0x93, 0x0d, 0x00, 0x00, 0xc1, 0x0d, 0x00, 0x00, 0x14, 0x0e, 0x00, 0x00, 0x66, 0x0e, 0x00, 0x00, 0x19, 0x0f, 0x00, 0x00, 0x75, 0x0f, 0x00, 0x00, 0xdf, 0x0f, 0x00, 0x00, 0x07, 0x10, 0x00, 0x00, 0x2c, 0x10, 0x00, 0x00, 0x52, 0x10, 0x00, 0x00, 0xe6, 0x10, 0x00, 0x00, 0x49, 0x11, 0x00, 0x00, 0x6c, 0x11, 0x00, 0x00, 0x94, 0x11, 0x00, 0x00, 0xf2, 0x11, 0x00, 0x00, 0x44, 0x12, 0x00, 0x00, 0xed, 0x12, 0x00, 0x00, 0x6e, 0x13, 0x00, 0x00, 0xd2, 0x13, 0x00, 0x00, 0x03, 0x14, 0x00, 0x00, 0x1a, 0x14, 0x00, 0x00, 0x56, 0x14, 0x00, 0x00, 0xe3, 0x14, 0x00, 0x00, 0x3f, 0x15, 0x00, 0x00, 0x53, 0x15, 0x00, 0x00, 0x90, 0x15, 0x00, 0x00, 0x06, 0x16, 0x00, 0x00, 0x24, 0x16, 0x00, 0x00, 0xba, 0x16, 0x00, 0x00, 0x0e, 0x17, 0x00, 0x00, 0x8e, 0x17, 0x00, 0x00, 0xdb, 0x17, 0x00, 0x00, 0x6d, 0x18, 0x00, 0x00, 0xce, 0x18, 0x00, 0x00, 0xe5, 0x18, 0x00, 0x00, 0x0f, 0x19, 0x00, 0x00, 0x98, 0x19, 0x00, 0x00, 0xc5, 0x19, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x84, 0x1a, 0x00, 0x00, 0xfe, 0x1a, 0x00, 0x00, 0x45, 0x1b, 0x00, 0x00, 0x46, 0x1b, 0x00, 0x00, 0xc5, 0x1b, 0x00, 0x00, 0x48, 0x1c, 0x00, 0x00, 0xc5, 0x1c, 0x00, 0x00, 0x21, 0x1d, 0x00, 0x00, 0xb4, 0x1d, 0x00, 0x00, 0x4c, 0x1e, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0xae, 0x1f, 0x00, 0x00, 0x92, 0x20, 0x00, 0x00, 0x64, 0x21, 0x00, 0x00, 0xdd, 0x21, 0x00, 0x00, 0x2b, 0x22, 0x00, 0x00, 0x9e, 0x22, 0x00, 0x00, 0x55, 0x23, 0x00, 0x00, 0x56, 0x23, 0x00, 0x00, 0x57, 0x23, 0x00, 0x00, 0x58, 0x23, 0x00, 0x00, 0x59, 0x23, 0x00, 0x00, 0x5a, 0x23, 0x00, 0x00, 0x5b, 0x23, 0x00, 0x00 + .string "We do our best to make this a nice,\n" + .string "cozy place, where people can relax.\n" + .string "My ideal cafe is a place where everyone\n" + .string "can just let it all hang out. Ah, yeah.$" + .string "My ideal cafe is a place where everyone\n" + .string "can just let it all hang out. Ah, yeah.$" + .string "We hear all sorts of interesting gossip\n" + .string "in here. Stop by from time to time.$" + .string "Make yourself at home...\n" + .string "Heehee...$" + .string "I am a laid-back, easygoing kind\n" + .string "of guy. Not a care in the world.\n" + .string "And that's just the way I like it!$" + .string "He who can enjoy a nice cup of\n" + .string "steaming hot tea at his leisure...\n" + .string "is truly master of his own time.$" + .string "Let me tell you something that\n" + .string "might come in handy someday.\n" + .string "You can move bookcases and stuff.\n" + .string "Try to {COLOR}{YELLOW}push and pull different things{COLOR}{WHITE}...\n" + .string "After all, you're young! You should\n" + .string "be trying all kinds of new things! Ha!$" + .string "I'm one smart cookie!$" + .string "Cheers! Yaay! Cheers!\n" + .string "Raise your milk for a toast!\n" + .string "I wonder what I should have for\n" + .string "dinner...$" + .string "I wonder what I should have for\n" + .string "dinner...$" + .string "Everyone's so relaxed here.\n" + .string "That's a good thing.\n" + .string "My ideal cafe is a place where everyone\n" + .string "can just let it all hang out. Ah, yeah.$" + .string "My ideal cafe is a place where everyone\n" + .string "can just let it all hang out. Ah, yeah.$" + .string "Welcoooooome!\n" + .string "Nice to see you!$" + .string "Take a load off.\n" + .string "Heehee...$" + .string "This is my special time...\n" + .string "\n" + .string "Just me and my cuppa joe.$" + .string "Well, I don't actually drink coffee...$" + .string "It seems the {COLOR}{RED}king {COLOR}{WHITE}has commanded all of\n" + .string "the guards to search for magic power.\n" + .string "Folks say that this {QT}{COLOR}{GREEN}light force{COLOR}{WHITE}{QT} will\n" + .string "grant any wish, but I don't buy it...$" + .string "I know all kinds of stuff.$" + .string "Cheers! Yaay! Cheers!\n" + .string "Raise your millk for a toast!\n" + .string "Can't we just have the same thing for\n" + .string "dinner tonight that we had last night?$" + .string "I wonder if we can't just have the same\n" + .string "thing for dinner we had last night...$" + .string "{UNK_0301F8}This cafe is so busy. You can hear all\n" + .string "sorts of stuff from all the people here.$" + .string "{UNK_0301F8}It's just right for people like us who\n" + .string "thrive on the hustle and bustle, huh?$" + .string "{UNK_0301F8}It's hard not to get stepped on when\n" + .string "there are so many people here.$" + .string "{UNK_0301F8}And adults can't even see us, right?$" + .string "Everyone's so relaxed here.\n" + .string "That's a good thing.\n" + .string "My ideal cafe is a place where everyone\n" + .string "can relax, relax, and relax some more.$" + .string "My ideal cafe is a place where everyone\n" + .string "can relax, relax, and relax some more.$" + .string "Hey there, sweety!\n" + .string "Welcome!$" + .string "Just sit anywhere you like,\n" + .string "heehee...$" + .string "Talking only to oneself...\n" + .string "\n" + .string "is an exercise in eloquent silence.$" + .string "I wonder if that makes any sense...$" + .string "The {COLOR}{RED}king {COLOR}{WHITE}was always such a nice man,\n" + .string "but lately, he's been such a brute...\n" + .string "I wonder what happened to him?\n" + .string "Hohoho...$" + .string "Maybe a monster crawled in his skin and\n" + .string "is parading around as the real {COLOR}{RED}king{COLOR}{WHITE}!\n" + .string "Hohohoho!$" + .string "Cheers! Yaay! Cheers!\n" + .string "Raise your milk for a toast!\n" + .string "Would they even notice if I made the\n" + .string "same thing for dinner tonight?$" + .string "I wonder...\n" + .string "\n" + .string "Would they even notice if I made the\n" + .string "same thing for dinner tonight?$" + .string "{UNK_0301F8}Welcome back, honey!\n" + .string "Good to see ya!$" + .string "{UNK_0301F8}The old lady in front of this house\n" + .string "drinks nothing but milk.$" + .string "Everyone's so relaxed here.\n" + .string "That's a good thing.\n" + .string "A place you don't ever want to leave.\n" + .string "That's my idea of a good cafe.$" + .string "A place you don't ever want to leave.\n" + .string "That's my idea of a good cafe.$" + .string "Welcome back, you!\n" + .string "You're my favorite customer!$" + .string "So you've been good lately?\n" + .string "Gooood, heehee...$" + .string "You can tell all of your deepest\n" + .string "secrets to a wall.\n" + .string "The wall will never talk back.$" + .string "But I've found if you talk to 'em right,\n" + .string "walls will give up all sorts of secrets!$" + .string "You're going to the {COLOR}{RED}Royal Valley{COLOR}{WHITE}?\n" + .string "I hear that place is haunted...\n" + .string "But there's a secret entrance that will\n" + .string "get you there from {COLOR}{RED}Hyrule Field{COLOR}{WHITE}.\n" + .string "I mean, that's what I've heard.$" + .string "That place is dark even in the daytime.\n" + .string "\n" + .string "And you know how ghosts love\n" + .string "the dark! Hohohoho...$" + .string "Cheers! Yaay! Cheers!\n" + .string "Raise your milk for a toast!\n" + .string "Hey, I know... Why don't we just have\n" + .string "milk for dinner?$" + .string "Why can't we just have\n" + .string "milk for dinner?$" + .string "{UNK_0301F8}Oh, hey there...\n" + .string "Good to see you.$" + .string "{UNK_0301F8}We Minish all get along very well.$" + .string "Everyone's so relaxed here.\n" + .string "That's a good thing.\n" + .string "A place where you're so familiar that\n" + .string "you don't even have to order.\n" + .string "That's my idea of a good cafe.$" + .string "A place where you're so familiar that\n" + .string "you don't even have to order.\n" + .string "That's my idea of a good cafe.$" + .string "Howdy, hon.\n" + .string "Glad to see you again.$" + .string "Aren't you looking manly now!\n" + .string "Heehee...$" + .string "Actually, there is a VERY GOOD reason\n" + .string "I cannot stand...\n" + .string "What would you do if I told you that?$" + .string "What is truth?\n" + .string "\n" + .string "When we understand this, then we will\n" + .string "conquer even time itself...$" + .string "The{COLOR}{RED} source of the flow{COLOR}{WHITE}? Well, that's\n" + .string "easy. It's talking about water!\n" + .string "The water flowing into {COLOR}{RED}town {COLOR}{WHITE}and into\n" + .string "the {COLOR}{RED}lake {COLOR}{WHITE}all comes from the same place.\n" + .string "Hohohoh...$" + .string "If you're looking for the {COLOR}{RED}source of\n" + .string "the flow{COLOR}{WHITE}...\n" + .string "Well, you'd better make sure you're\n" + .string "well equipped is all I'm sayin'! Hohoho!$" + .string "Cheers! Yaay! Cheers!\n" + .string "Raise your milk for a toast!\n" + .string "I wonder...do we even need to eat\n" + .string "dinner at all?$" + .string "I wonder...do we even need to eat\n" + .string "dinner at all?$" + .string "{UNK_0301F8}Welcome, sugar pie!$" + .string "{UNK_0301F8}It's so convenient to live in a human\n" + .string "house as a Minish.$" + .string "Everyone's so relaxed here.\n" + .string "That's a good thing.\n" + .string "A place where you can relax despite\n" + .string "what's going on outside.\n" + .string "That's my idea of a good cafe.$" + .string "A place where you can relax despite\n" + .string "what's going on outside.\n" + .string "That's my idea of a good cafe.$" + .string "Heeeey!\n" + .string "Weeeelcome!$" + .string "You're turning into a fine little man,\n" + .string "aren't you! Heehee...$" + .string "Though I am nondescript, you notice me\n" + .string "and talk to me.\n" + .string "That makes me the prize, and you\n" + .string "are the winner of that prize!$" + .string "Someday, you will understand.$" + .string "I hear a guard who was looking for the\n" + .string "{COLOR}{GREEN}light force {COLOR}{WHITE}got thrown in the dungeon!\n" + .string "Why, the {COLOR}{RED}king {COLOR}{WHITE}is hardly worthy of being\n" + .string "called {QT}noble{QT} anymore!$" + .string "But I should be careful, lest I be jailed\n" + .string "myself just for criticizing the {COLOR}{RED}king{COLOR}{WHITE}!$" + .string "Cheers! Yaay! Cheers!\n" + .string "Raise your milk for a toast!\n" + .string "It's not like the world would come to an\n" + .string "end if I didn't make dinner, right?$" + .string "It's not like the world would come to an\n" + .string "end if I didn't make dinner, right?$" + .string "Everyone's so relaxed here.\n" + .string "That's a good thing.\n" + .string "A place where you could happily let the\n" + .string "world crumble around you.\n" + .string "That's my idea of a good cafe.$" + .string "A place where you could happily let the\n" + .string "world crumble around you.\n" + .string "That's my idea of a good cafe.$" + .string "Hey there!\n" + .string "Doin' well?$" + .string "We're counting on you, young man!\n" + .string "Heehee!$" + .string "Everything with a beginning\n" + .string "also has an end.\n" + .string "To put it another way, all things move\n" + .string "toward their end...\n" + .string "Even from the moment they begin.$" + .string "The end is near.\n" + .string "For me, as well as for you.$" + .string "{COLOR}{RED}Hyrule Castle{COLOR}{WHITE} is covered in darkness.\n" + .string "This is the end.$" + .string "I never imagined something like this\n" + .string "would happen in my lifetime.\n" + .string "I wonder if the {COLOR}{RED}Picori {COLOR}{WHITE}will show up\n" + .string "and help us once again...$" + .string "Cheers! Yaay! Cheers!\n" + .string "Raise your milk for a toast!\n" + .string "I never knew that failing to make\n" + .string "dinner would have such consequences!$" + .string "I never knew that failing to make\n" + .string "dinner would have such consequences!$" + .string "$" + .string "Just try fusing {COLOR}{YELLOW}Kinstone pieces{COLOR}{WHITE} with\n" + .string "lots of people.\n" + .string "There are a lot of people out there\n" + .string "looking for someone to fuse with.$" + .string "You'd be surprised to find who--and\n" + .string "what--you can {COLOR}{YELLOW}fuse Kinstones {COLOR}{WHITE}with!\n" + .string "Yeah, you've got a lot of fusing in\n" + .string "your future, pal...$" + .string "I recommend visiting {COLOR}{YELLOW}places you've\n" + .string "already been{COLOR}{WHITE}.\n" + .string "You may then be able to fuse Kinstone\n" + .string "pieces in those places, you know?$" + .string "You can get special items by fusing\n" + .string "{COLOR}{YELLOW}Kinstone pieces{COLOR}{WHITE}!\n" + .string "Don't miss out on the opportunity!$" + .string "There's a {COLOR}{RED}group of lovely young ladies\n" + .string "{COLOR}{WHITE}visiting Hyrule...\n" + .string "Maybe I'll get a chance to talk to them\n" + .string "if I offer to fuse {COLOR}{YELLOW}Kinstone pieces{COLOR}{WHITE}. Heh.$" + .string "I hear there's a wall in {COLOR}{RED}Minish Woods{COLOR}{WHITE}\n" + .string "with a spot for a {COLOR}{YELLOW}Kinstone piece{COLOR}{WHITE}.\n" + .string "I'm sure you can find other places\n" + .string "where you can place Kinstone pieces.$" + .string "Do you know of the {COLOR}{RED}Goron Cave{COLOR}{WHITE}? It's a\n" + .string "tunnel that the {COLOR}{RED}Gorons {COLOR}{WHITE}are digging.\n" + .string "And if you can get all the way to the\n" + .string "cave's end and place a {COLOR}{YELLOW}Kinstone{COLOR}{WHITE}...\n" + .string "Well, why don't I just let you try it\n" + .string "for yourself!$" + .string "I hear you can fuse {COLOR}{YELLOW}Kinstone pieces{COLOR}{WHITE}\n" + .string "with the {COLOR}{RED}ghost {COLOR}{WHITE}in the {COLOR}{RED}Royal Crypt{COLOR}{WHITE}.\n" + .string "Or at least so I hear. I'm too scared\n" + .string "to find out for sure.$" + .string "You can't always just charge straight\n" + .string "ahead to new places in life, you know.\n" + .string "You need to go back to places you've\n" + .string "already been and reflect on things.\n" + .string "Who knows? That quiet reflection may\n" + .string "give you a chance to {COLOR}{YELLOW}fuse Kinstones{COLOR}{WHITE}!$" + .string "You know, fusing {COLOR}{YELLOW}Kinstone pieces{COLOR}{WHITE} can\n" + .string "get you more than mere {COLOR}{GREEN}Rupees{COLOR}{WHITE}...\n" + .string "It can call new people to a place or\n" + .string "even change the way the town looks.\n" + .string "And all those things can lead\n" + .string "to happiness as well, right?$" + .string "Are you enjoying fusing {COLOR}{YELLOW}Kinstone\n" + .string "pieces{COLOR}{WHITE}?\n" + .string "Fusing can bring happiness to you and\n" + .string "your fusing buddy! That's what I say!$" + .string "I wonder what happens if you fuse all\n" + .string "of the Kinstones a person is holding...$" + .string "{COLOR}{RED}Hyrule Castle{COLOR}{WHITE} has fallen to the\n" + .string "darkness...\n" + .string "I suppose this is no time to be fusing\n" + .string "{COLOR}{YELLOW}Kinstone pieces{COLOR}{WHITE}, is it?$" + .string "Nonsense! Maybe we need it now more\n" + .string "than ever before!\n" + .string "Fusing {COLOR}{YELLOW}Kinstone pieces{COLOR}{WHITE} can bring\n" + .string "people happiness!\n" + .string "This is the true motive for fusing, my\n" + .string "friend! Not Rupees, but happiness!$" + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/strings_wip.txt b/data/strings_wip.txt index c3d50e64..7ec71388 100644 --- a/data/strings_wip.txt +++ b/data/strings_wip.txt @@ -1,67 +1,20 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - - - - - - - - -gUnk_089DEE20:: @ 089DEE20 -@ replacing .incbin "baserom.gba", 0x009dee20, 0x11f7 -.data 6c6c2073656c6c20796f750a74686174200201626f74746c65200200666f7220060120527570656573210a072c14004f682c2074686520020171756976657202003f205965732c206974277320060120527570656573210a497420686f6c6473206d616e792002016172726f777302002c20617320796f752063616e207365652e0a072c140002013130206172726f7773020020666f72200601205275706565732e0a416e206173746f756e64696e67206261726761696e2c20796f75276c6c2061677265652e0a072c14000201333020626f6d6273020020666f722006012052757065657321205965732c0a666f7220796f752c2049206769766520796f75206d792062756c6b2072617465210a072c140002013330206172726f7773200200666f7220060120527570656573210a596f752063616e2774206265617420746861742077697468206120737469636b210a072c1400596f75200203616c7265616479206861766520612066696e6520736869656c640200210a486f6e6573746c792c2077686f206e656564732054574f200201736869656c647302003f21000301f441682c206d7920667269656e642c20796f752772652066617220746f6f20636c657665722062790a68616c662c2062757420796f7520776f6e277420626520686167676c696e672077697468206d65210057687920646f20796f7520626f746865722073686f7070696e6720696620796f752772650a6e6f7420676f696e6720746f206861766520656e6f756768205275706565733f0a5768656e20796f752068617665206d6f7265206d6f6e65792c20706572686170730a77652063616e2064697363757373207468697320667572746865722e00596f7520646f6e2774207365656d20746f206861766520656e6f75676820726f6f6d0a666f7220616e797468696e67206d6f72652e20486d2e204120706974792e000301f44d756368206f626c696765642c206d7920676f6f64206c61642120506c656173652c0a646f206e6f7420686573697461746520746f2073746f7020627920616761696e21000301f457656c6c2120596f7520415245206120626967207370656e6465722c0a6172656e277420796f753f205468616e6b20796f7521000301f448617665204920746f6c6420796f7520686f77206d756368204920617070726563696174650a796f757220636f6e74696e75656420706174726f6e6167653f0a42656361757365204920646f2e000301f448656c6c6f2120497320616e796f6e65206261636b2074686572653f0a4e6f3f2041682c2077656c6c2e2e2e2049206775657373206e6f742e0a486f77206f64642e000301f445676164212049206b6e65772074686572652077617320736f6d656f6e652068657265210a5768656e2064696420796f752066696e6420796f757220776179206261636b20686572653f0a54686973206172656120697320666f7220656d706c6f79656573206f6e6c792e20546861742069730a746f207361792c206d6520616e64206d6520616c6f6e65210057696c6c20796f75206275792069743f0a05ff42757920052c0c446f6e27742062757900000301f449276d20736f7272792c206d7920676f6f64206c61642c206275740a74686174206973206e6f7420666f722073616c65210a5468617420626f74746c6520636f6e7461696e7320666f6f640a666f72206d792064656172206c6974746c6520646f672c20466966692e2e2e0a576861743f20596f75206a7573742077616e7420746865200201626f74746c6502003f0a54686174277320686967686c7920756e757375616c2e2e2e0a57656c6c2c2066696e652e20496620796f75206665656420466966692c207468656e0a49206775657373200203796f752063616e20686176652074686520626f74746c6502002e0a486f7720646f6573207468617420736f756e643f0a202005ff49276c6c20646f20697420052c174e6f2c207468616e6b730046696e652c2066696e652e204974277320757020746f20796f752e00457863656c6c656e742c20657863656c6c656e742e2048652773206174206d790a686f6d65207269676874206e6f772e205468616e6b20796f7520534f206d7563682e00416c6c6f77206d6520746f206d61726b20746865206c6f636174696f6e206f66206d790a686f6d652068657265206f6e20796f7572206d61702e004272696e6720776861746576657220706965636520796f75206c696b652e0a0a54686520736861706520796f75206c696b652069732073696d706c790a61206d6174746572206f6620706572736f6e616c2074617374652c20676f726f2100416c6c20676f6e652120436f6d6520616761696e2e005965732c204b696e73746f6e6573210a45616368206f6e6520697320646966666572656e742c20676f726f210a54686973204b696e73746f6e6520636f737473200601205275706565732e200a2005ff42757920052c1d446f6e277420627579004e6f206465616c3f20476f726f2120546f6f20626164212042757420636f6d650a616761696e2e20492077696c6c20616c77617973206861766520676f6f64207069656365732100596f7520646f6e2774206861766520656e6f756768205275706565732e2e2e0a436f6d65206261636b2077697468206d6f7265206d6f6e65792c20676f726f2e00596f75206861766520746f6f206d616e79207069656365732120492063616e27740a73656c6c20796f7520616e7920756e74696c20796f75206d616b6520726f6f6d21005468616e6b20796f752c20676f726f2e20436f6d65206261636b20616e7974696d650a616e642062757920746865207265737421004e6f206d6f72652c206e6f206d6f72652c2062757420636f6d65206261636b0a616761696e2e20492070726f6d69736520746f2066696e64206d6f72652c20676f726f2100492062656c696576652074686572652073686f756c642062652061200203646f676769650a64697368020020666f72206d7920646f67206261636b206174206d7920686f7573652e0a4a75737420666163652074686520020364697368020020616e64207072657373200c0320746f0a64756d702074686520666f6f6420696e746f206c6974746c652046696669277320626f776c2e000300d14d79206d61737465722c20020253746f636b77656c6c02002c20686173206265656e20636f6d696e670a686f6d652066617220746f6f206c61746520746f20706c61792077697468206d652e2e2e0a49276d20736f206c6f6e656c792e0054686174200201626f6f6d6572616e6702002069732061207265616c206261726761696e0a6174200601205275706565732e0a072c14005468617420020162696720626f6d622062616702002069732061207265616c206261726761696e0a6174200601205275706565732e0a072c1400 - -ffffffffffffff380000004b000000c900000036010000f30100007b02000027030000510300001d04000080040000110500005c050000e0050000470600000 - -5ff42757920052d0a446f6e277420627579004168682c2077656c636f6d652e0a0a4361726520666f7220736f6d65206f66204772616e6e7927730a686f6d656d616465200201626c756520706f74696f6e02003f0a4f6e65207369702c20616e6420796f752772652066756c6c206f6620656e65726779210a506c656173652c206c6f6f6b2061726f756e642e2e2e00546861742773204772616e6e79277320686f6d656d6164650a0201626c756520706f74696f6e02002c206d792064656172210a49276c6c2066696c6c20796f757220626f74746c6520666f72203630205275706565732e0a5768617420646f20796f75207361793f0a072d000045766572206865617264206f66204772616e6e7927730a686f6d656d616465200201626c756520706f74696f6e02003f0a4f6e65207369702c20616e6420796f752772652066756c6c206f6620656e65726779210a0a46696c6c2061200201626f74746c65200200616e642063617272792069742061726f756e6420776974680a796f752120416674657220616c6c2c2069742773206f6e6c7920363020527570656573210a57696c6c20796f752062757920736f6d653f0a072d00004772616e6e792773207374756666206973207468652062657374212054686973206973206d790a747261646974696f6e616c20020172656420706f74696f6e0200210a5368616c6c20492066696c6c20796f7572200201626f74746c65020020666f722e2e2e0a313530205275706565733f205768617420646f20796f75207361793f0a072d00004f6e636520796f75277665207472696564206d79206e657720020172656420706f74696f6e02002c0a796f75276c6c206e6576657220676f206261636b20746f20746865200201626c75650200207374756666210a5368616c6c20492066696c6c20796f7572200201626f74746c65200200666f7220313530205275706565733f0a5768617420646f20796f75207361792c206d792070726574747920796f756e6720626f793f0a072d0000436f6d65206261636b207768656e20796f75206e656564206d6f72652e2e2e0a4865686568656865210041682c207965732120412066696e652063686f6963652c206d792064656172210a5468617427732061206c696d697465642d74696d652061727469636c65210a4f6e652077686966662c20616e6420796f7527726520776964652d6177616b652120546861740a69732077687920697427732063616c6c6564206120020177616b652d7570206d757368726f6f6d0200210a576f756c6420796f75206c696b6520746f2062757920697420666f72203630205275706565733f0a05ff4275792005ff446f6e27742062757900596f7527766520676f7420616e2065796520666f722066696e6520676f6f6473210a0a546861742c206d7920646561722c206973206d7920686967686c792072656761726465642c0a686f6d656d616465200201626c756520706f74696f6e020021004168682c2077656c636f6d652e0a0a4261636b20666f72204772616e6e7927732066616d6f757320020172656402000a616e64200201626c756520706f74696f6e7302003f0a4f6e65207369702c20616e6420796f752772652066756c6c206f6620656e65726779210a576869636820646f20796f75206c696b652c2064656172792c20726564206f7220626c75653f004e6f6e6520666f7220796f753f2057656c6c2c2072656d656d6265722074686174207768656e0a796f752072756e206f7574206f6620706570206c61746572212048656865686568652100492063616e27742073656c6c20697420746f20796f75210a596f7520646f6e2774206861766520656e6f75676820527570656573210a436f6d65206261636b207768656e20796f7527766520676f7420746865206d6f6e6579210a4d7920706f74696f6e732061726520616c776179732077616974696e67210a48656865686568652100596f75200203646f6e2774206861766520616e20656d70747920626f74746c650200207468617420490a63616e2066696c6c2077697468206d65646963696e65210a436f6d65206261636b207769746820616e200201656d70747920626f74746c650200210a00486568656865682e2e2e204a75737420666163652074686520736c656570790a736e6f6f7a657220616e64207072657373200c032e2e2e0a54686174276c6c20706f70206869732065796573207269676874206f70656e210a504f502100 - -ffffff68000000690000007b00000093000000a6000000b9000000d3000000ee000000ff000000180100002c010000400100005a0100006c010000870100009b010000b5010000c7010000df010000f30100000a020000220200003d02000056020000720200008c02000000 - -57616c6c65742033303020527570656573004172726f7720517569766572203330302052757065657300313020426f6d62732033302052757065657300333020426f6d6273203830205275706565730031302052656d6f746520426f6d6273203430205275706565730033302052656d6f746520426f6d6273203130302052757065657300536869656c6420343020527570656573004d6972726f7220536869656c642033353020527570656573003130204172726f777320323020527570656573003330204172726f777320353020527570656573004669677572696e65205469636b65742031352052757065657300426f74746c652032303020527570656573004d6167696320426f6f6d6572616e67 - -gUnk_089E0017:: @ 089E0017 -@ replacing .incbin "baserom.gba", 0x009e0017, 0x2e9 -.data 2033353020527570656573004669726520526f64203335302052757065657300536c656570696e67205368726f6f6d20353020527570656573004272696f6368652031302052757065657300536c696365206f662043616b65203130205275706565730043726f697373616e742032302052757065657300536c696365206f6620506965203230205275706565730052656420546f70205069656365203330205275706565730052656420426f74746f6d2050696563652033302052757065657300426c756520546f702050696563652033302052757065657300426c756520426f74746f6d2050696563652033302052757065657300477265656e20546f702050696563652033302052757065657300446f6720466f6f6400 - -ffffff6c0000006d000000fe00000044010000b2010000f901000087020000880200006f030000a1030000dd03000088040000b807000044080000b1080000b9090000100a0000e00a0000c30b00006b0c0000bc0c0000800d0000070e00003e100000b0110000f71100007412000000 - -496e206d7920796f7574682c2049207761732063616c6c656420020247726567616c207468650a4772656174020021204920776173206576656e2061206c6974746c652066616d6f75732e2e2e0a427574206c6174656c79206d79206c696d627320686176652067726f776e2068656176792c0a616e6420492063616e2774206576656e207374616e642075702e2e2e00476f6f646e6573732120576520726172656c79206765742076697369746f727320686572652e0a54656c6c206d652c20686f772064696420796f752067657420686572653f00492063616e27742062656c696576652002026f6c642047726567616c0200206973207369636b2e0a486520776173206c6f6f6b696e6720736f206865616c7468792e0a4920677565737320736f6d657468696e67206a75737420746f6f6b0a686f6c64206f662068696d2e2e2e004e6f626f64792062656c6965766573206d652c20627574204920 - -gUnk_089E0300:: @ 089E0300 -@ replacing .incbin "baserom.gba", 0x009e0300, 0x455 -.data 73617720612067686f73740a74686174206861732074616b656e20686f6c64206f66204772616e6464616421004f6e63652c206d79206772616e64666174686572207573656420736f6d657468696e670a63616c6c6564206120020147757374204a6172020020746f206669676874206d6f6e73746572732e2e2e0a4865207761732061206d6969696967687479206865726f2c2074686579207361792e0a427574206e6f772068652773207369636b20696e206265642e2e2e0000576861743f20416e206576696c20737069726974206861642074616b656e20686f6c64206f660a6d653f20416e6420796f752064726f766520697420617761793f0a596f752e2e2e20596f75206d69676874206265207269676874212e2e2e20492063616e0a616c7265616479206665656c206d7920656e657267792072657475726e696e67210a49276c6c2062652061626c6520746f20676574206f7574206f662062656420736f6f6e210a57686174277320796f7572206e616d653f202e2e2e06003f0a5468616e6b20796f752c206d7920626f792e20596f75207361766564206d652e00496620796f7527726520696e2074686520617265612c20636f6d6520627920666f720a6120717569636b2076697369742100496620796f752066696e6420796f757273656c6620696e20746865206172656120616761696e2c0a64726f7020627920616e64207365652075732e0057656c6c2c2077656c6c2c2077656c6c210a0a4c6f6f6b20617420686f772074686520636f6c6f722068617320636f6d65206261636b20746f0a68697320666163652120486f772063616e20492065766572207468616e6b20796f753f0a49207374696c6c2068617665206120686172642074696d652062656c696576696e6720686527640a6265656e20706f737365737365642062792061206d6f6e737465722c2074686f7567682e0057656c636f6d652c2077656c636f6d652e204c6f6e672c206c6f6e672061676f2c20616e640a7468656e20616e20616765206265666f726520746861742e2e2e0a4f7572207472696265206162616e646f6e65642074686520706c61636520796f752063616c6c0a74686520020257696e64205275696e7302002e2e2e0a57697468206f7572206d616769632c207765206d6f766564206f75722070616c6163652075700a696e746f2074686520736b6965732e205765206172652074686520020257696e6420547269626502002e0a57652068617665206265656e207761746368696e672c20616e64207765206b6e6f7720616c6c0a746861742068617070656e73206f6e20796f7572207375726661636520776f726c642e0a5765206b6e6f77206120736d616c6c20626f7920636f6c6c65637473200201656c656d656e74730a0200746f206c696674207468652063757273652066726f6d2061207072696e636573732e02010a02005765206b6e6f77206f662002025661617469200200616e6420686973206576696c20616374732e2e2e0a546865 - -gUnk_089E0755:: @ 089E0755 -@ replacing .incbin "baserom.gba", 0x009e0755, 0x4ad -.data 2077696e64732074656c6c207573207468657365207468696e67732e02020a020054686520020157696e6420456c656d656e740200207468617420796f75207365656b206c6965730a6465657020696e2074686520020250616c616365206f662057696e647320020061626f7665206d652e0a02035768656e2074686520626c61646520686173206265656e20696e667573656420776974680a74686520666f757220656c656d656e74732c207468652077617920746f207468650a6c6967687420666f726365207368616c6c206f70656e2e020020536f20697420697320746f6c640a696e20746865206c6567656e6473206f66207468652057696e642054726962652e0a56616174692068696d73656c66206d617920616c7265616479206b6e6f7720746869732e0a0a53757266616365206477656c6c65727320617265206e6f74207065726d697474656420746f0a656e746572206f75722070616c6163652c2062757420796f7520617265207370656369616c2e0a596f75206d617920636f6e74696e756520746f2074686520726f6f662e0054686572652069732061200203746f726e61646f20020061746f70207468697320686f7573652e0a456e74657220697420746f20676f20746f2074686520020250616c616365206f662057696e647302002e0a526576697665207468652073616372656420626c61646520616e640a72657363756520746865207072696e6365737320717569636b6c792e004f682c2069742773200600210a5468616e6b20796f7520666f7220796f75722068656c70206561726c696572210a4927766520676f7420736f6d657468696e6720656c736520676f6f6420666f7220796f752c0a736f20686572652c20706c656173652074616b6520697421004f68682c2069662069742069736e2774206f6c64200600210a0a4d7920717565737420746f206d61746368204b696e73746f6e6573206861732074616b656e0a6d6520616c6c207468652077617920757020686572652e0a49276d206e6f74207375726520796f75277665206e6f7469636564207965742c206275740a7765277265206f6e20746f70206f662074686520636c6f756473210a5468652057696e64205472696265206c697665732068657265210a0a546865792070726f7465637420746865207061746820746f2074686520020250616c6163650a6f662057696e647302002c2077686572652074686520020157696e6420456c656d656e740200206c696573210057656c6c2c2077656c6c2c2077656c6c210a0600210a5468616e6b7320666f722068656c70696e67212042656361757365206f6620796f752c206d790a6772616d707320697320616c6c20626574746572206e6f7721005765206f66207468652057696e6420547269626520617265207665727920736b696c6c65640a61742066696e64696e672002014b696e73746f6e652070696563657302002e200a536f20736b696c6c656420696e20666163742c20746861742077652068617665206d6f7265206f660a7468656d207468616e2077652063616e206d616e616765210a57652063616e2774206576656e2073746f7265207468656d20616c6c2e204920776973680a736f6d656f6e6520776f756c64207461 - -gUnk_089E0C02:: @ 089E0C02 -@ replacing .incbin "baserom.gba", 0x009e0c02, 0x8fd -.data 6b652061206665772066726f6d2075732e004f682c206974277320796f75210a0a492074686f7567687420492764206e65766572206d616b65206974206261636b20686572652c0a627574207468616e6b7320746f20796f7572204b696e73746f6e652c204920646964210a496620796f75277265206c6f6f6b696e6720666f7220736f6d657468696e672c20676f2074616c6b0a746f2074686520656c6465726c7920776f6d616e206f6e207468652034746820666c6f6f722e0a5468652077696e647320636172727920616c6c20736f7274206f662076616c7561626c650a696e666f726d6174696f6e20746f206865722e00546865726520697320612064657669636520696e2074686520020270616c616365200200746861740a616c6c6f7773206f6e6520746f20666c7920696e2074686520736b792e0a5768656e204920676574206269676765722c20492077616e7420746f206578706c6f72650a74686520020270616c616365200200616e642066696e642069742e2e2e0a4275742049276d20746f6f20736361726564207269676874206e6f7721005570206f6e2074686520726f6f662c20746865726527732061206875676520776869726c77696e640a746861742063616e2074616b6520796f7520757020746f2074686520020270616c61636502002e00496e207468697320746f776572206477656c6c207468652070656f706c65206f66207468650a57696e642054726962652e0a5765206c65667420796f7572207375726661636520776f726c64206c6f6e672061676f20746f0a73657276652061206772656174657220647574792e0a5765206e6f772070726f7465637420746865206761746520746f2074686520020250616c6163650a6f662057696e647302002c2077686572652074686520020157696e6420456c656d656e740200206c6965732e00416c74686f75676820776520617265206f66207468652057696e642054726962652c2077652c0a746f6f2c206f6e6365206c69766564206f6e2074686520737572666163652e0a4f6e63652c2074686520706c61636520796f752063616c6c2074686520020257696e64205275696e7302000a7761732c20746f2075732c206120686f6d652e00576168682120596f7520737572707269736564206d65210a0a4e6f726d616c6c792c2073757266616365206477656c6c6572732063616e27742077616c6b0a6f6e2074686520636c6f756473206c696b6520776520646f210a4d792073697374657220616e6420492077656e7420746f207468652002035069636f72690a466573746976616c020020696e20487972756c6520546f776e2c0a616e64207768656e2077652063616d65206261636b2c2074686572650a77657265206d6f6e73746572732065766572797768657265210a4920626574206966204920636f756c64206a757374206675736520612002014b696e73746f6e6502002c0a4920636f756c642063616c6c206120676f6f6420686f6d65776172642077696e642e2e2e0a42757420746865726520617265206d6f6e73746572732061626f75742c20736f20490a63616e27742073656172636820666f72204b696e73746f6e65732e0a416e64206576656e206966204920636f756c642c2049207374696c6c2063616e27740a66696e6420616e796f6e6520746f2066757365207468656d2077697468210a42757420796f75206c6f6f6b20707265747479207374726f6e67210a0a446f20796f75207468696e6b20796f7520636f756c64206d61796265207365617263680a666f722002014b696e73746f6e6573200200666f72206d653f0a496620796f7520646f2c2049276c6c2074656c6c20796f752061626f7574206120676f6f640a73706f7420666f72200203667573696e67020021004f682c2074686973206973206261642e2054686973206973207265616c6c79206261642e2e2e0a0a4f682c206865792120576f772e2e2e204c6f6f6b2061742074686174210a0a49277665206e65766572207365656e20612073757266616365206477656c6c65722077616c6b0a6f6e20636c6f756473206265666f7265210a596f75206d7573742062652071756974652070757265206f66206865617274210a0a4d61796265206f6e65207375636820617320796f7520776f756c64206c697374656e20746f0a6d792074616c65206f6620776f652e0a596f75207365652c20492077656e7420646f776e20746f2074686520737572666163650a77697468206d792073697374657220666f72207468652002035069636f726920466573746976616c02002e2e2e0a427574206f6e206f75722077617920686f6d652c207765206c6f7374207468652077696e640a656e746972656c7921204e6f772c2077652063616e27742067657420686f6d65210049206865617220746861742002014b696e73746f6e65207069656365732002006172650a736f6d6574696d65732068696464656e20616d6f6e672074686520636c6f75647321005468652002025069636f726920466573746976616c200200696e20487972756c6520546f776e207761730a7265616c6c792066756e20616e6420616c6c2e2e2e0a42757420686f7720756e6c75636b7920746f20626520737472616e64656420686572652c0a756e61626c6520746f2072657475726e20686f6d652100546869732069732074686520686f6d65206f662074686520020257696e6420547269626502002e0a5765206c656674207468652073757266616365206c6f6e672061676f2e0a4e6f772c2077652067756172642074686520656e7472616e636520746f207468650a020250616c616365206f662057696e647302002e2e2e0a2e2e2e496e20746869732070616c6163652c2074686520020157696e640a456c656d656e74200200726573696465732e0a4275742e2e2e7468617420686f6c6520796f75206a7573742063616d65206f7574206f662e2e2e0a446f65732074686174206c65616420746f2074686520776f726c642062656c6f773f0a4f682c20697420617070656172656420616674657220796f7520020366757365640a4b696e73746f6e657302003f2054686174277320616d617a696e672e00 - -ffffffffffffffffffffffffffff5400000055000000b80000001a0100 - gUnk_089E14FF:: @ 089E14FF @ replacing .incbin "baserom.gba", 0x009e14ff, 0x1811 .data 004201000058010000d50100000b020000430200004a0200004b0200004c0200004d020000690200006a0200006b0200006c0200006d0200006e0200006f0200007002000000 -4f682c206e6f21205468697320697320686f727269626c65210a4d7920637563636f73206861766520676f7474656e206f7574210a43616e20796f75206361746368207468656d20666f72206d653f0a05ff49276c6c2068656c7021200530034e6f0054727920746f206361746368200602206f66207468656d2077697468696e0a0601207365636f6e64732c20706c656173652e0a416e6420796f752063616e277420676f20696e746f206275696c64696e67730a6f72206c6561766520746f776e21005265616c6c793f20436f6d65206f6e2c0a77687920776f6e277420796f752068656c70206d653f0054696d652773207570210a5468617427732069742100486d6d6d2e2057656c6c2c206974206c6f6f6b73206c696b652049276d207374696c6c206d697373696e670a61206c6f74206f6620637563636f732e2e2e0a427574207468616e6b7320616e7977617921204d6179626520796f752063616e0a68656c70206f757420616761696e20616e6f746865722074696d652e00596f75206861766520746f20636174636820060220637563636f730a696e200601207365636f6e64732120476f6f64206c75636b2100596f7520676f74200601205275706565732120446f65736e27742069740a6665656c20676f6f6420746f2068656c70206f74686572733f00041506010414000000005468616e6b73210a48657265277320796f7572207265776172642e000000000000000000 +4f682c206e6f21205468697320697320686f727269626c65210a4d7920637563636f73206861766520676f7474656e206f7574210a43616e20796f75206361746368207468656d20666f72206d653f0a05ff49276c6c2068656c7021200530034e6f0054727920746f206361746368200602206f66207468656d2077697468696e0a0601207365636f6e64732c20706c656173652e0a416e6420796f752063616e277420676f20696e746f206275696c64696e67730a6f72206c6561766520746f776e21005265616c6c793f20436f6d65206f6e2c0a77687920776f6e277420796f752068656c70206d653f0054696d652773207570210a5468617427732069742100486d6d6d2e2057656c6c2c206974206c6f6f6b73206c696b652049276d207374696c6c206d697373696e670a61206c6f74206f6620637563636f732e2e2e0a427574207468616e6b7320616e7977617921204d6179626520796f752063616e0a68656c70206f757420616761696e20616e6f746865722074696d652e00596f75206861766520746f20636174636820060220637563636f730a696e200601207365636f6e64732120476f6f64206c75636b2100596f7520676f74200601205275706565732120446f65736e27742069740a6665656c20676f6f6420746f2068656c70206f74686572733f00041506010414000000005468616e6b73210a48657265277320796f7572207265776172642e00 -ffffffcc000000cd00000061020000a4020000d10200000203000034030000640300008a030000a8030000d60300001f0400005704000073040000ee040000330500006005000089050000bb050000e10500000a0600003d060000b3060000ec0600002e0700006707000093070000b7070000fe070000290800006b080000a4080000cf080000f30800003a09000085090000c7090000000a00002b0a00004f0a00009a0a0000f90a0000580b0000b70b0000b80b0000b90b0000ba0b0000bb0b0000bc0b0000bd0b0000be0b000000 +0000000000000000ffffffcc000000cd00000061020000a4020000d10200000203000034030000640300008a030000a8030000d60300001f0400005704000073040000ee040000330500006005000089050000bb050000e10500000a0600003d060000b3060000ec0600002e0700006707000093070000b7070000fe070000290800006b080000a4080000cf080000f30800003a09000085090000c7090000000a00002b0a00004f0a00009a0a0000f90a0000580b0000b70b0000b80b0000b90b0000ba0b0000bb0b0000bc0b0000bd0b0000be0b000000 -576861743f205768617420646f20796f752077616e743f20576879206172650a796f7520626f74686572696e67206d652c206b69643f0a4875683f204f682c206d79206e616d65277320476f726d616e2e2049276d20747279696e670a6d792068616e64206174207265616c206573746174652e0a5475726e73206f75742c2069742773206120746f74616c207061696e2e204c696b652072696768740a6e6f772c2049276d206c6f6f6b696e6720666f7220612074656e616e742c20796f75207365653f0a42757420746865207468696e672069732c20492063616e206f6e6c792072656e7420746f20610a776f6d616e2c2073696e676c65206f63637570616e63792e0a546f6f206d616e792074656e616e747320776f756c64206d616b65207468650a706c6163652064697274792e20416e6420746865792764206265206c6f75642e0a49206c696b65207468696e6773206e69636520616e642071756965742c207365653f0a416e64207468697320697320616c6c206a75737420746f6f206d75636820686173736c652e0a07310200496620796f752066696e6420616e796f6e652077686f2063616e2072656e7420746869730a706c6163652c20776f756c6420796f75206c6574206d65206b6e6f773f004f682120596f752068617665206120686f75736520746f2073686f77206d653f0a05ff596573200531094e6f004f682120596f7527766520666f756e64206d65206120686f75736520746f2072656e743f0a05ff5965732005310a4e6f004f682120596f752772652073686f77696e67206d6520616e20656d70747920686f7573653f0a05ff5965732005310b4e6f005265616c6c793f205468616e6b73210a492077616e7420746f20676f20736565206974207269676874206177617921005468616e6b73210a492063616e2774207761697420746f20636865636b206974206f757421005468616e6b73210a49276c6c20676574207269676874206f6e20697421004f682e2e2e2057656c6c2c206c6574206d65206b6e6f772069660a796f75206865617220616e797468696e672e004f682c20636f6d65206f6e21212057656c6c2c20796f75204841564520746f2074656c6c0a6d6520696620796f7520686561722061626f757420616e797468696e6720676f6f6421004865792c20776879206e6f743f212057656c6c2c206c6574206d65206b6e6f770a696620736f6d657468696e6720636f6d6573207570210049276c6c206275696c6420686572652c2049207468696e6b2e2e2e004e69636520686f7573652c206875682c206b69643f0a49742773206272616e642d7370616e6b696e27206e65772c20492074656c6c207961210a4275742049206a757374206e65656420616e6f746865722074656e616e742c0a612073696e676c6520776f6d616e2c206c696b65206265666f72652e0a07310e0057656c6c2c20696620796f75206b6e6f7720616e79206e69636520796f756e670a6c6164696573206e656564696e67206120686f6d652c206c6574206d65206b6e6f7721004f682120596f752068617665206120686f75736520746f2073686f77206d653f0a05ff596573200531094e6f004f682120596f7527766520666f756e64206d65206120686f7573653f0a05ff5965732005310a4e6f004f682120596f752772652073686f77696e67206d6520616e20656d70747920686f7573653f0a05ff5965732005310b4e6f005265616c6c793f0a4f682c20616e64206974277320736f206e69636520616e64206e657721004f682c20666162756c6f7573210a416e64206974277320736f20636c65616e20616e64206e6577210057686f6121205468616e6b732120416e6420697427732061206e65770a686f75736520616e642065766572797468696e67210049277665206c696e656420757020612073697a61626c652070696c65206f6620636173680a66726f6d206d792072656e74616c2070726f706572746965732e2e2e0a4d6179626520492073686f756c64207374617274206272656564696e6720706574730a6e6578742e204d6f6f68616861686121004f682c2068656c6c6f2c2006002e204920737572650a646f206c6f766520697420686572652e205468616e6b7320616761696e210a07312800496620796f752065766572206e6565642061200201636861726d02002c0a49276c6c206769766520796f7520616e6f746865722c20736f206a7573742061736b210057616e742061200201636861726d200200666f7220796f757220626f74746c653f0a05ff506c656173652005311a4e6f2c207468616e6b7300416c6c2072696768742120546865726520796f7520676f210a436f6d65206261636b20616e7974696d6521004f4b2e2e2e20427574206665656c206672656520746f2061736b20616e7974696d6521004f682c20796f7520646f6e2774206861766520616e20656d70747920626f74746c652e0a57656c6c2c20636f6d65206261636b207768656e20796f752068617665206f6e652e0057656c636f6d652c200600210a49207265616c6c79206c6f7665207468697320686f757365210a07312900496620796f752065766572206e6565642061200201636861726d02002c0a49276c6c206769766520796f7520616e6f746865722c20736f206a7573742061736b210057616e742061200201636861726d200200666f7220796f757220626f74746c653f0a05ff506c65617365200531204e6f2c207468616e6b7300416c6c20726967687421205468657265206974206973210a436f6d65206261636b20616e7974696d6521004f4b2e2e2e20427574206665656c206672656520746f2061736b20616e7974696d6521004f682c20796f7520646f6e2774206861766520616e20656d70747920626f74746c652e0a57656c6c2c20636f6d65206261636b207768656e20796f752068617665206f6e652e004f682c20060021205468616e6b7320666f7220636f6d696e67212049206c6f76650a7468697320706c6163652c20616e642049206f776520697420616c6c20746f20796f75210a07312a00496620796f752065766572206e6565642061200201636861726d02002c0a49276c6c206769766520796f7520616e6f746865722c20736f206a7573742061736b210057616e742061200201636861726d200200666f7220796f757220626f74746c653f0a05ff506c65617365200531264e6f2c207468616e6b7300416c6c20726967687421205468657265206974206973210a436f6d65206261636b20616e7974696d6521004f4b2e2e2e20427574206665656c206672656520746f2061736b20616e7974696d6521004f682c20796f7520646f6e2774206861766520616e200203656d70747920626f74746c6502002e0a57656c6c2c20636f6d65206261636b207768656e20796f752068617665206f6e652e00496620796f75206861766520616e20656d70747920626f74746c652c20492063616e207075740a6f6e65206f66206d7920686f6d656d616465200201636861726d73200200696e73696465210a4a7573742061736b20616e7974696d652100496620796f75206861766520616e20656d70747920626f74746c652c20492063616e207075740a6f6e65206f66206d7920686f6d656d616465200201636861726d73200200696e73696465210a4a7573742061736b20616e7974696d652100496620796f75206861766520616e20656d70747920626f74746c652c20492063616e207075740a6f6e65206f66206d7920686f6d656d616465200201636861726d73200200696e73696465210a4a7573742061736b20616e7974696d6521000000000000000000 +576861743f205768617420646f20796f752077616e743f20576879206172650a796f7520626f74686572696e67206d652c206b69643f0a4875683f204f682c206d79206e616d65277320476f726d616e2e2049276d20747279696e670a6d792068616e64206174207265616c206573746174652e0a5475726e73206f75742c2069742773206120746f74616c207061696e2e204c696b652072696768740a6e6f772c2049276d206c6f6f6b696e6720666f7220612074656e616e742c20796f75207365653f0a42757420746865207468696e672069732c20492063616e206f6e6c792072656e7420746f20610a776f6d616e2c2073696e676c65206f63637570616e63792e0a546f6f206d616e792074656e616e747320776f756c64206d616b65207468650a706c6163652064697274792e20416e6420746865792764206265206c6f75642e0a49206c696b65207468696e6773206e69636520616e642071756965742c207365653f0a416e64207468697320697320616c6c206a75737420746f6f206d75636820686173736c652e0a07310200496620796f752066696e6420616e796f6e652077686f2063616e2072656e7420746869730a706c6163652c20776f756c6420796f75206c6574206d65206b6e6f773f004f682120596f752068617665206120686f75736520746f2073686f77206d653f0a05ff596573200531094e6f004f682120596f7527766520666f756e64206d65206120686f75736520746f2072656e743f0a05ff5965732005310a4e6f004f682120596f752772652073686f77696e67206d6520616e20656d70747920686f7573653f0a05ff5965732005310b4e6f005265616c6c793f205468616e6b73210a492077616e7420746f20676f20736565206974207269676874206177617921005468616e6b73210a492063616e2774207761697420746f20636865636b206974206f757421005468616e6b73210a49276c6c20676574207269676874206f6e20697421004f682e2e2e2057656c6c2c206c6574206d65206b6e6f772069660a796f75206865617220616e797468696e672e004f682c20636f6d65206f6e21212057656c6c2c20796f75204841564520746f2074656c6c0a6d6520696620796f7520686561722061626f757420616e797468696e6720676f6f6421004865792c20776879206e6f743f212057656c6c2c206c6574206d65206b6e6f770a696620736f6d657468696e6720636f6d6573207570210049276c6c206275696c6420686572652c2049207468696e6b2e2e2e004e69636520686f7573652c206875682c206b69643f0a49742773206272616e642d7370616e6b696e27206e65772c20492074656c6c207961210a4275742049206a757374206e65656420616e6f746865722074656e616e742c0a612073696e676c6520776f6d616e2c206c696b65206265666f72652e0a07310e0057656c6c2c20696620796f75206b6e6f7720616e79206e69636520796f756e670a6c6164696573206e656564696e67206120686f6d652c206c6574206d65206b6e6f7721004f682120596f752068617665206120686f75736520746f2073686f77206d653f0a05ff596573200531094e6f004f682120596f7527766520666f756e64206d65206120686f7573653f0a05ff5965732005310a4e6f004f682120596f752772652073686f77696e67206d6520616e20656d70747920686f7573653f0a05ff5965732005310b4e6f005265616c6c793f0a4f682c20616e64206974277320736f206e69636520616e64206e657721004f682c20666162756c6f7573210a416e64206974277320736f20636c65616e20616e64206e6577210057686f6121205468616e6b732120416e6420697427732061206e65770a686f75736520616e642065766572797468696e67210049277665206c696e656420757020612073697a61626c652070696c65206f6620636173680a66726f6d206d792072656e74616c2070726f706572746965732e2e2e0a4d6179626520492073686f756c64207374617274206272656564696e6720706574730a6e6578742e204d6f6f68616861686121004f682c2068656c6c6f2c2006002e204920737572650a646f206c6f766520697420686572652e205468616e6b7320616761696e210a07312800496620796f752065766572206e6565642061200201636861726d02002c0a49276c6c206769766520796f7520616e6f746865722c20736f206a7573742061736b210057616e742061200201636861726d200200666f7220796f757220626f74746c653f0a05ff506c656173652005311a4e6f2c207468616e6b7300416c6c2072696768742120546865726520796f7520676f210a436f6d65206261636b20616e7974696d6521004f4b2e2e2e20427574206665656c206672656520746f2061736b20616e7974696d6521004f682c20796f7520646f6e2774206861766520616e20656d70747920626f74746c652e0a57656c6c2c20636f6d65206261636b207768656e20796f752068617665206f6e652e0057656c636f6d652c200600210a49207265616c6c79206c6f7665207468697320686f757365210a07312900496620796f752065766572206e6565642061200201636861726d02002c0a49276c6c206769766520796f7520616e6f746865722c20736f206a7573742061736b210057616e742061200201636861726d200200666f7220796f757220626f74746c653f0a05ff506c65617365200531204e6f2c207468616e6b7300416c6c20726967687421205468657265206974206973210a436f6d65206261636b20616e7974696d6521004f4b2e2e2e20427574206665656c206672656520746f2061736b20616e7974696d6521004f682c20796f7520646f6e2774206861766520616e20656d70747920626f74746c652e0a57656c6c2c20636f6d65206261636b207768656e20796f752068617665206f6e652e004f682c20060021205468616e6b7320666f7220636f6d696e67212049206c6f76650a7468697320706c6163652c20616e642049206f776520697420616c6c20746f20796f75210a07312a00496620796f752065766572206e6565642061200201636861726d02002c0a49276c6c206769766520796f7520616e6f746865722c20736f206a7573742061736b210057616e742061200201636861726d200200666f7220796f757220626f74746c653f0a05ff506c65617365200531264e6f2c207468616e6b7300416c6c20726967687421205468657265206974206973210a436f6d65206261636b20616e7974696d6521004f4b2e2e2e20427574206665656c206672656520746f2061736b20616e7974696d6521004f682c20796f7520646f6e2774206861766520616e200203656d70747920626f74746c6502002e0a57656c6c2c20636f6d65206261636b207768656e20796f752068617665206f6e652e00496620796f75206861766520616e20656d70747920626f74746c652c20492063616e207075740a6f6e65206f66206d7920686f6d656d616465200201636861726d73200200696e73696465210a4a7573742061736b20616e7974696d652100496620796f75206861766520616e20656d70747920626f74746c652c20492063616e207075740a6f6e65206f66206d7920686f6d656d616465200201636861726d73200200696e73696465210a4a7573742061736b20616e7974696d652100496620796f75206861766520616e20656d70747920626f74746c652c20492063616e207075740a6f6e65206f66206d7920686f6d656d616465200201636861726d73200200696e73696465210a4a7573742061736b20616e7974696d652100 -ffffffffffffffffffffffffff3000000031000000460100001d020000f902000083040000a0050000e206000024070000b1070000030800000408000000 +0000000000000000ffffffffffffffffffffffffff3000000031000000460100001d020000f902000083040000a0050000e206000024070000b1070000030800000408000000 4f682c2077656c636f6d65206261636b2c2006002e204d792c206275740a796f75277265206c6f6f6b696e6720736f206d756368207374726f6e676572210a496620796f75206765742074697265642c206a75737420676f20616865616420616e640a74616b652061206e617020757073746169727320696e20796f757220726f6f6d2e0a49276d2062757379206d616b696e672073776f72647320666f72207468650a67756172647320746f206b65657020746865206d6f6e7374657273206174206261792e0a492077697368204920636f756c6420646f206d6f72652c2062757420666f72206e6f772c0a7765206e65656420796f7520746f20736176652002025072696e63657373205a656c646102002e004865792c2006002e2045766572792074696d6520492073656520796f752c0a796f75207365656d206d6f726520616e64206d6f726520636f6e666964656e74210a5361792c206861766520796f75206265656e20746f20020252656d27732053686f650a53686f7002003f204869732073686f6573207265616c6c79206172652074686520626573742e0a49276d2073757265207468657920636f756c642068656c7020796f75206f6e20796f75720a71756573742e2057687920646f6e277420796f7520676976652068696d20612076697369743f004865792c2006002e20596f75277265206c6f6f6b696e6720736f0a6d75636820746f756768657220746865736520646179732e2e2e0a5361792c206861766520796f75206265656e20746f0a7468652002026c6962726172792002007965743f02020a02004927766520686561726420736f6d65206b69647320736179207468617420746865792776650a7365656e205069636f72692074686572652e2e2e0a492074686f75676874206d61796265207468617420776f756c642068656c700a796f75206f6e2074686973207175657374206f6620796f7572732e0057656c636f6d65206261636b2c2006002e2049206665656c206c696b650a69742773206265656e20736f206c6f6e672073696e636520796f752076697369746564210a4c6f6f6b73206c696b6520796f75206e65656420746f2066696e640a6a757374206f6e65206d6f7265200201656c656d656e7402002e205361792e2e2e0a4861766520796f75206265656e20746f20746865200203526f79616c2056616c6c657902002c0a77657374206f6620487972756c6520436173746c653f0a596f75207573656420746f2062652061626c6520746f206765742074686572650a656173696c792066726f6d2002025472696c627920486967686c616e647302002e0a4e6f7761646179732c20686f77657665722c20796f75206861766520746f2074616b650a6120736563726574207061746820746f206765742074686572652e0a49276d20737572652069742077617320746f2074686520020377657374206f660a746865206e6f72746865726e2070617274206f6620487972756c65204669656c6402002e2e2e0041682c2049276d20736f20676c616420796f7527766520636f6d650a746f20736565206d652c2006002e0a596f75206c6f6f6b206c696b6520796f75277665206265656e206a7573740a61626f7574206576657279776865726520696e20487972756c652c206875683f0a427574207361792e2e2e0a4861766520796f75206265656e20746f2002025665696c2046616c6c7302003f0a492068656172206e6f206f6e6520686173206576657220666f756e64207468650a736f75726365206f662077617465722074686174206665656473207468652066616c6c732e0a536f2069662074686174277320776865726520796f7527726520676f696e672c0a70726f6d697365206d6520796f75276c6c206265206361726566756c210049276d20736f20676c616420796f7527726520736166652c2006002e0a0a4920686561722074686174207465727269626c65207468696e6773206172650a68617070656e696e67206f766572206174020220487972756c6520436173746c6502002e0a427920746865207761792e2e2e02020a0a02004861766520796f75206265656e207573696e6720616c6c206f66207468650a02016974656d73200200796f7527766520666f756e6420736f206661723f0a496620796f752067657420737475636b20736f6d6577686572652c20796f75276c6c0a6e65656420746f2074727920657665727920747269636b20796f7527766520676f74210a4a75737420747279207573696e672065766572797468696e6720696e20796f75720a696e76656e746f72792c204f4b3f20596f75276c6c20736f7274206974206f75742e2e2e004865792c206172656e277420796f752074697265643f0a0a446f20796f752077616e7420746f2074616b65206120726573743f0a05ff5965732020200532084e6f00576861742c20796f75277265206365727461696e3f20426f792c206b6964732074686573650a646179732073757265206172652066756c6c206f66206265616e732e2e2e0a49276d20616c6c207475636b65726564206f75742c20616e6420616c6c204920646f2069730a726964652061726f756e64206f6e20796f7572206865616420616c6c2064617921004f686868682c2079656168210a0a5468617420776173206a75737420776861742049206e656564656420746f0a676574206261636b20696e20746865206669676874210a4c6574277320676f2c20060021000000 @@ -73,6 +26,9 @@ fffffffffffffffffffffffffff4000000f5000000950100003302000080020000ca030000680400 4a757374206265636175736520796f752068617665206120020173776f7264 + +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + gUnk_089E2D10:: @ 089E2D10 @ replacing .incbin "baserom.gba", 0x009e2d10, 0x4f8e .data 200200616e640a0201736869656c64200200646f65736e2774206d65616e20796f75276c6c2062652073616665210a492063616e2774206c657420796f7520676f206f757420746865726520616c6f6e6521204e6f740a756e74696c20796f75206b6e6f7720736f6d6520020373776f726420746563686e697175657302002e00486f20686f210a536f2c20796f75277665206c6561726e6564207468652002015370696e2041747461636b02003f0a49742773207374696c6c2064616e6765726f75732c206275742e2e2e6d617962650a796f752063616e2068616e646c652069742e0a57656c6c2c206c657427732073656520686f7720796f7520646f2e0a53686f77206d6520746861742002015370696e2041747461636b020021004e6f772074686174207761732061207265616c0a63656e74656e6e69616c2063656c6562726174696f6e210a5468617420666573746976616c207761732074686520626573742065766572210049276d20736f206c75636b79212054686174207761736e2774206a75737420616e79206f6c640a666573746976616c2e2049742077617320612063656e74656e6e69616c20666573746976616c210a49742066616c6c732045584143544c59206f6e20746865203130302d79656172206d61726b210a0a546865726520776f6e277420626520616e6f74686572206f6e6520756e74696c2049276d2e2e2e0a4c657427732073656520686572652e2e2e20596f772120313138207965617273206f6c64213f0a4a65657a2c20616d2049206576656e20676f6e6e612062652061726f756e6420746f0a73656520746865206e6578742063656e74656e6e69616c20666573746976616c3f0a41682c20737572652e20576879206e6f743f204974276c6c2067697665206d650a736f6d657468696e6720746f206c6f6f6b20666f727761726420746f210054686520746f776e20697320717569657420656e6f7567682c206275742070617374207468650a67617465732c20746865726520617265206d6f6e73746572732065766572797768657265210a596f752073686f756c6420766973697420020253746f636b77656c6c27732073686f70200200616e640a676574206f7574666974746564206265666f726520796f7520676f206f75742074686572652e004c6174656c792c2074686520776f6f64732068617665206265656e2066696c6c65640a77697468206e61737479206d6f6e73746572732e0a457665722073696e63652074686520636865737420776173206f70656e65642c20697427730a6265656e20616c6c20746f7073792d74757276792061726f756e6420686572652e004d656f6f6f772e2e2e00526f7772727221000059656168210a54686174277320746865206f6e65210a42757420746865726520617265206d6f6e7374657273206f75742074686572652c206b6964210a596f75206a757374206d616b65207375726520796f75277265206361726566756c2e00546865726520617265206d6f6e7374657273206f75742074686572652c206b6964210a596f75206a757374206d616b65207375726520796f75277265206361726566756c2e0000000000000000000000427567676564792d627567676564792d424f4f210a0a44696420492073636172652079613f004b69647320617265206a757374206e61747572616c6c7920736361726564206f660a67686f7374732c20796f75206b6e6f7720776861742049206d65616e3f004172662120417266206172662100497427732061206c6f742065617369657220666f72206d65206e6f74206265696e670a616e796f6e652773207065742e0a4920646f6e2774206861766520746f20776169742061726f756e6420666f72206d65616c2d0a74696d65732e2049206a7573742065617420776861746576657220492063616e2066696e64210044696420796f75207365652074686520746f75726e616d656e74213f0a49742077617320696e6372656469626c65210a4920776173206f7574206f66206d79207365617420616e64206368656572696e670a6265666f72652049206576656e206b6e65772069742100492063616e2774207761697420666f72206e657874207965617227730a746f75726e616d656e7421205768656e277320697420737570706f73656420746f2062653f00596f772120546861742073776f72642d6669676874696e6720746f75726e616d656e740a77617320736f206578636974696e67210a4f682c206966206f6e6c79206d792068757362616e6420776572652074616c656e7465640a656e6f75676820746f20636f6d706574652e2e2e004576656e2049276d2061206265747465722073776f726466696768746572207468616e0a6d792068757362616e642069732e0a48652063616e2774206576656e2068616e646c65206120627574746572206b6e696665210049207265616c6c792077616e6e6120706c617920612067616d652c2062757420746869730a706c6163652069736e2774206f70656e207965742e0a492067756573732049206a75737420676f74206865726520746f6f206561726c792e2e2e0054686973207374616c6c206973206b696e64206f662064697274792e204920677565737320746861740a67757920776f6e27742062652073657474696e67207570206865726520746f6461792e2e2e00486d6d2e2e2e204e6f7468696e67206275742066727569747320616e6420766567676965732e0a576861742073686f756c64204920636f6f6b20746f6e696768743f004865792c2068657921204672657368206672756974210a47657420796f757220667265736820667275697420686572652100436f6d65206f6e20757020616e642074616b652061206c6f6f6b2c20666f6c6b73210a0a4f6e65207768696666206f6620746865736520737765657420616e642064656c6963696f75730a6672756974732c20616e6420796f75276c6c20626520736f6c642120436f6d65206f6e2075702100486f7764792c20686f7764792120436f6d652067657420796f75722066726573680a766567676965732c2067726f776e2062792045656e696520616e64204d65656e6965210a546865792772652066726573686572207468616e2066726573682c20666f6c6b73210a416e64207468657927726520676f6f6420666f7220796f752c20746f6f2100446f6e277420666f7267657420746f2065617420796f75722076656767696573210a4576657279626f6479206e6565647320612062616c616e6365642064696574210049206a757374206c6f6f6f6f76652073686f7070696e67210f0b0a0a4f682c20616e642049206d7573746e277420666f7267657420746f2062757920736f6d65206f660a7468617420020173757270726973652d66696c6c656420627265616420020066726f6d205069746121004f68212049206a7573742072656d656d6265726564210a0a49206e65656420746f207069636b207570206120626f74746c65206f660a02014c6f6e204c6f6e204d696c6b0200206f6e207468652077617920686f6d65210000004865792c20796f752077616e6e61206b6e6f77207768617420492068656172643f20490a68656172642074686174206f6e6c79206b6964732063616e20736565207468652002025069636f7269020021004920776f6e6465722069662077652063616e20736565207468652002025069636f726902002c20746f6f2e004865792c20492077616e6e6120736565207468652002025069636f726902002c20746f6f210a43616e20493f2043616e20493f204875683f2043616e20493f004865792c2002025069636f726902002120486f2c2002025069636f72690200210a436f6d65206f757420616e6420706c6179207769746820757321000049207468696e6b20746865206d61796f7220697320646f696e6720612066696e65206a6f622c0a6e6f206d617474657220776861742070656f706c652073617921004920776f6e27742073617920616e797468696e672c206576656e20696620796f750a6469672061206875676520686f6c6520696e206d792067617264656e2e0041772e2e2e204974206c6f6f6b73206c696b65207468657927726520686176696e672066756e20696e0a74686572652e20492077697368204920636f756c6420706c61792077697468207468656d2e2e2e00492063616e2774207761697420756e74696c2049276d2062696720656e6f75676820746f20676f0a746f207363686f6f6c20616e6420686176652066756e20414c4c207468652074696d652100536f7272792c2062757420492063616e2774206c657420796f7520706173732e0a546865726520617265206d6f6e7374657273206f75742074686572652100576527726520776f726b696e6720686572652e20536f7272792c206275742077650a63616e2774206c657420796f7520706173732e0a536f7272792e0057656c6c2c2069662069742069736e2774200600210a497420495320676f6f6420746f2073656520796f7520616761696e2e0a5363686f6f6c20697320696e2073657373696f6e207269676874206e6f772c0a736f2049276d2061667261696420492063616e2774206c657420796f7520696e2e00576527726520696e20746865206d6964646c65206f662061207665727920696d706f7274616e740a636c617373207269676874206e6f772c20736f20796f75206d6179206e6f7420656e7465722e005468657265277320616e206f6c64206c6567656e64207468617420736f6d657468696e670a6269672077696c6c2068617070656e207768656e20487972756c6527732062656c6c2072696e67732e0045766572796f6e6520697320616672616964206f662077686174206974206d696768740a6d65616e20746f2072696e67207468652062656c6c2c20736f20746865792061766f69642069742e00492063616d6520746f20636865636b206f7574206120626f6f6b2c0a6275742074686579277265206e6f74206f70656e207965742e0a48616868682e2e2e2057656c6c2c20616765206272696e67732070617469656e63652c0a736f6e6e792e20492063616e20776169742e005468652002025377696674626c616465205363686f6f6c020020696e2074686520736f75746820656e640a6f6620746f776e206973207265616c6c7920617765736f6d652e0a54686520746561636865722c2002025377696674626c61646502002c2068617320616e0a616d617a696e676c7920646972656374207465616368696e67207374796c652e0a492077697368204920636f756c6420747261696e2074686572652e2e2e005468652002025377696674626c616465205363686f6f6c020020696e2074686520736f75746820656e640a6f6620746f776e206973207265616c6c7920617765736f6d652e0a54686520746561636865722c2002025377696674626c61646502002c2068617320616e0a616d617a696e676c7920646972656374207465616368696e67207374796c652e0a492077697368204920636f756c6420747261696e2074686572652e2e2e0052727272722e2e2e41524620415246210041726620617266206172662100 @@ -157,117 +113,4 @@ ffffffffffffffffffff98000000990000001c01000063010000780100001f020000b30200008403 0300cc205768757a7a613f21204f682c2077656c636f6d65210a57656c636f6d6520746f20020252656d27732053686f652053686f700200210a4c6174656c792c207768656e6576657220492074616b652061206e61702c20616c6c206d790a73686f65732061726520646f6e65207768656e20492077616b65207570210a07440200596f75206b6e6f772c20696620492063616e206d616b652073686f657320696e206d790a736c6565702c2049206d75737420626520696e20746865207269676874206a6f6221004d6d6d6d6d6e756d6e756d6e756d6e756d2e2e2e00576861612d2d210a0a5768617420697320746861742074657272696679696e676c792062616420736d656c6c213f0a412077616b652d7570206d757368726f6f6d3f210a492073686f756c6420686176652067756573736564210a536f20796f7520776f6b65206d652075703f0a5468616e6b732c2049206a7573742072656d656d6265726564204920686176650a736f6d657468696e6720757267656e7420746f20646f2100416e6420746865726520776520676f2e2e2e0a486572652c2074616b652074686573652e0a54686f736520617265206d79207370656369616c2002015065676173757320426f6f74730200210a0a5468657927726520736f206c696768742c20796f75276c6c206665656c206c696b6520796f752772650a70726163746963616c6c792077616c6b696e67206f6e2061697221004f6f682c2049206e65656420746f20687572727920757020616e64206765740a776f726b696e67206f6e2074686174207370656369616c206f726465722e2e2e0a546865206b696e672061736b6564206d6520746f206d616b6520736f6d650a73686f657320666f72205072696e63657373205a656c64612c20796f75207365652e0a5468616e6b7320666f722077616b696e67206d652075702e20436f6d65206261636b2069660a492063616e20657665722068656c7020796f7520776974682073686f652070726f626c656d732e0049206e65656420746f20687572727920757020616e64206d616b652074686f73650a73686f657320666f72205072696e63657373205a656c646121005768757a7a613f21204f682c2077656c636f6d65210a57656c636f6d6520746f20020252656d27732053686f652053686f700200210a49206d757374206861766520646f7a6564206f666620616761696e2e2e2e0a54696d6520746f206d616b65207468652073686f65732100005468616e6b20796f7520666f722077616b696e67206d65207570206561726c6965722e0a0a4f682c207361792c20796f7520776f756c646e27742077616e7420746f200203667573650a4b696e73746f6e6573020120020077697468206d652c20776f756c6420796f753f0a49206861766520612076657279207370656369616c2002014b696e73746f6e6520706965636502002100436f6d6520736565206d652061676169 -gUnk_089EEE98:: @ 089EEE98 -@ replacing .incbin "baserom.gba", 0x009eee98, 0x4c -.data 6e20736f6d6574696d65212049662049276d0a6177616b652c2049276c6c20667573652002034b696e73746f6e65730200207769746820796f75210049206b6e6f772120446f20796f752077 - -gUnk_089EEEE4:: @ 089EEEE4 -@ replacing .incbin "baserom.gba", 0x009eeee4, 0xa -.data 616e7420746f20020366 - -gUnk_089EEEEE:: @ 089EEEEE -@ replacing .incbin "baserom.gba", 0x009eeeee, 0x8 -.data 757365204b696e73 - -gUnk_089EEEF6:: @ 089EEEF6 -@ replacing .incbin "baserom.gba", 0x009eeef6, 0x110a -.data 746f6e657302000a77697468206d653f2049206861766520612076657279207370656369616c206f6e65210049276d207265616c6c7920626c617a696e672061776179206f6e2074686573652073686f65730a666f72205072696e63657373205a656c646121003f210a4875683f2057686174206e6f773f210a546865726520617265206d6f7265206e65772073686f6573210a596f752070726f6261626c7920776f6e27742062656c6965766520746869732c206275742e2e2e0a492068617665206120737472616e6765206861626974206f66206d616b696e670a73686f657320696e206d7920736c656570210a536f20796f75206d757374206861766520636f6d65206865726520626563617573650a796f752077616e7420736f6d65206f66206d792073686f65732c2072696768743f0a54656c6c20796f7520776861743a206265636175736520796f752077657265206e6963650a656e6f75676820746f2077616b65206d652c20796f752063616e20686176652027656d210a486f6c64206f6e2061207365632c2074686f7567682e2049206a7573742077616e740a746f2066696e6973682074686973206f6e65206c617374206269742e2e2e000003020454686f73652002015065676173757320426f6f747320020077696c6c206d616b6520796f750a77616e7420746f20646173682065766572797768657265210a49742773207265616c6c792066756e20746f2072756e20686561646c6f6e6720696e746f0a737475666620616e64207265616c6c79207368616b65207468696e677320757021000301fc4d792002015065676173757320426f6f747320020061726520736f20636f6d666f727461626c65210a0a54686579276c6c206d616b6520796f7572206c6974746c6520706967676965730a73717565616c20776974682064656c6967687421000301f85468616e6b7320666f722077656172696e67206d792073686f6573207769746820737563680a70726964652c2076616c75656420637573746f6d657221000000000000000000000302044865792c206865792120596f752772652006002c2072696768743f0a0a596f7527726520746865206f6e652077686f2062726f75676874207468652073776f72640a746f2002024d6173746572204d656c6172690200210a596f75277265206f6e206120717565737420746f2068656c7020746865207072696e636573732c0a6172656e277420796f753f0a492077697368204920636f756c6420676f206f6e20612071756573742c206275740a7468656e2077686f2764206d616b6520020252656d020027732073686f657320666f722068696d3f000301fc486f2c20686f2120596f75206e6565642002015065676173757320426f6f747302003f0a5768792c20796f75277265206a75737420696e2074696d65210a5765206d61646520612070616972206a757374206e6f77207768696c650a020252656d20020077617320736c656570696e672e0a427574206f6e6c7920020252656d20020063616e20707574207468650a66696e697368696e6720746f7563686573206f6e207468656d2e2e2e000301f848612c20686121205468617420736c656570796865616420020252656d2002006973206e6561726c790a696d706f737369626c6520746f2077616b652075702e2e2e0a496620796f752077616e7420746f2077616b652068696d2c20796f75276c6c206e6565640a746f2067657420616e206974656d2066726f6d200202537972757002002773206875742e0a497427732061206c6974746c6520626974206f662061207472656b2c206275740a7765276c6c206d61726b206974206f6e20796f7572206d617020666f7220796f752e000302044865792c206865792120020252656d20020068617320736f6d65206f7468657220757267656e740a627573696e6573732068652073686f756c6420626520776f726b696e67206f6e2e2e2e0a536f20706c656173652c2077616b652068696d20757020617320736f6f6e2061730a796f752063616e212054696d65277320612d77617374696e2721000301fa486f2c20686f2120576527766520646f6e6520616c6c2077652063616e20776974680a74686573652073686f65732e0a596f75276c6c206e65656420746f20676f20746f2002025379727570020027732068757420736f0a52656d2063616e20707574206f6e207468652066696e697368696e6720746f75636865732e000301f848612c2068612120020253797275700200277320687574206973206e6f727468206f66207468650a02024d696e69736820576f6f647302002e204a75737420636865636b20796f75722002016d617002002e0049276c6c206d616b6520796f752073686f65732120536f2077687920646f6e277420796f750a636f6d65206261636b206c617465723f00546865206d6167696320686167206d6179206861766520736f6d657468696e670a676f6f642e00536f6d6574696d65732077652068656c702068696d206d616b652073686f65732e0000 - -ffffffffffffffffffffffffffc0000000c10000004b0100008c010000c1010000f00100003b02000059020000c2020000db0200000e0300003003000075030000a6030000f2030000200500005e0500006c0500007405000084050000c0050000fa050000380600000d070000ff070000b508000003090000750900004a0a0000f00a0000150b0000300b0000b00b0000cd0b0000ea0b00001e0c00004a0c0000940c0000f30c00003c0d00008a0d00008b0d00008c0d00008d0d00008e0d00008f0d0000900d0000910d000000 - -48692074686572652c20616e642077656c636f6d6520746f207468650a48617070792048656172746821204e656564206120726573742c206b69643f0a57656c6c2c2077652063616e2074616b652063617265206f6620746861742d2d616e640a6576656e207468726f7720696e206120020170726573656e74200200746f20626f6f74210a0745020005ff466f7267657420697420202020202005ff060120527570656520726f6f6d0a05ff060220527570656520726f6f6d2005ff060320527570656520726f6f6d002e2e2e52696768742e200601205275706565732e0a54686520636865617020726f6f6d2069742069732c207468656e2e0a07450600596573736972210a060120527570656573206765747320796f75206120726567756c617220726f6f6d210a0745060057656c6c206e6f772120436f6d652066726f6d206120676f6f642066616d696c792c20646f0a77653f2041206c757875727920726f6f6d20666f7220060120527570656573210a07450600416c6c207061796d656e742075702066726f6e742c20706c65617365210057686174277320746869733f210a536f6e2c20796f7527766520676f74206e6f2063617368210a436f6d65206261636b207768656e20796f752067726f772075700a616e64206765742061206a6f62210a4e6f77206f6666207769746820796f75212053686f6f21005468616e6b73210a456e6a6f7920796f757220737461792100486f2c206e6f772120596f7520646f6e27742077616e7420746f20737461793f0a57656c6c2c20636f6d6520616761696e2100546861742773207468652065786974210a456e6a6f7920796f757220737461792100416e6420686f772077617320796f757220737461793f0a44696420796f752066696e6420796f75722070726573656e743f0a506c6561736520636f6d6520616761696e21004974207365656d7320796f75207265616c6c792067657420776861740a796f752070617920666f7220686572652e2e2e00427574204920677565737320796f7520646f6e2774207265616c6c79206b6e6f77207468650a646966666572656e636520756e74696c20796f7520747279206561636820726f6f6d2e2e2e004865792c207768617420646f20796f75206b6e6f772061626f757420746861740a02016c6967687420666f72636502002073747566663f0a50656f706c652061726520736179696e67206974277320736f6d65206b696e64206f660a747265617375726520746861742063616e206772616e7420796f7520616e7920776973682e0a416e797761792c206e6f7720746865206b696e67277320696e20612062696720687566660a747279696e6720746f2066696e642069742e0a4974277320737472616e67652c2074686f7567682e204865206e657665722073747275636b0a6d6520617320746865206772656564792074797065206265666f72652e0a4974277320616c6d6f7374206c696b652068652773206120646966666572656e740a706572736f6e206e6f772e2e2e00576861742773207769746820746865206b696e67206c6174656c793f0a486520776173206e65766572206c696b652074686174206265666f72652e2e2e0059616161792120596161617921005761616169742100486579212121205761697420757021004974277320736f206e69636520746f2062652068657265206174206c617374210a416e64207375636820612062696720746f776e206974206973210053746179696e6720696e207468697320696e6e20666f72657665720a776f756c6420737461727420746f206265206120626f746865722e2e2e005765206e65656420746f2066696e642061206e6963652c20717569657420706c6163650a77686572652077652063616e20736574746c6520646f776e2e005468652002026b696e672002006973206a757374207465727269626c65206c6174656c79210a5468696e67732061726520676f696e67206372617a792061726f756e642068657265210a576f756c6420796f752062656c6965766520612067756172642063616d6520696e746f206d790a686f75736520746865206f74686572206461793f0a4974277320747275652120416e64206765742074686973212048652064656d616e6465640a74686174204920676976652068696d20736f6d65206b696e64206f6620220201666f72636502002221004e6f726d616c2070656f706c652063616e277420656e746572207468650a0202526f79616c2056616c6c657902002e0a546865726527732061206372797074696320666f726573742074686174206c656164730a696e746f2069742c20616e642070656f706c6520676574206c6f73742074686572652e0a5468652073656372657420746f2066696e64696e6720796f757220776179207468726f7567680a69732072656164696e6720616c6c20746865207369676e73210a596f75276c6c206e65766572206d616b6520697420756e6c65737320796f7520726561640a65616368206f6e65206361726566756c6c792e00596f752077616e7420746f20676f20746f2074686520746f6d62206f660a02024b696e6720477573746166206f6620487972756c6502003f0a5468656e20796f7527642070726f6261626c79206265747465722074616c6b0a746f20020244616d70e902002e0a4865277320746865206772617665646967676572206174207468652063656d65746572792e0a4e6f626f6479206b6e6f777320746865200202526f79616c20437279707420020062657474657221004861766520796f752073746179656420696e20746865206265737420726f6f6d207965743f0a49276d20747279696e6720746f20666967757265206f757420776865726520746f20737461792e0054686520736f75726365206f6620776174657220696e20487972756c653f20596f750a6d757374206d65616e2074686520737072696e672061742002025665696c2046616c6c7302002e0a54686174277320776865726520616c6c206f757220776174657220636f6d65732066726f6d2e00492063616e277420736179207468697320696e2066726f6e74206f6620746865206b6964732e2e2e0a4920646f6e27742077616e7420746f20616c61726d207468656d2c20796f75206b6e6f773f0a - -gUnk_089F0000:: @ 089F0000 -@ replacing .incbin "baserom.gba", 0x009f0000, 0x9 -.data 4275742e2e2e020248 - -gUnk_089F0009:: @ 089F0009 -@ replacing .incbin "baserom.gba", 0x009f0009, 0x49 -.data 7972756c6520436173746c65200200686173206265656e206c6f6f6b696e670a707265747479207765697264206c6174656c792e0a492063616e2774207361792065786163746c7920 - -gUnk_089F0052:: @ 089F0052 -@ replacing .incbin "baserom.gba", 0x009f0052, 0x638 -.data 776861742069742069732c2074686f7567682e0a49742773206a7573742e2e2e646966666572656e742e20537472616e67652e004920736177206974212049207361772069742077697468206d79206f776e2074776f2065796573210a0a54686572652077657265206d6f6e737465727320696e736964650a6f66200202487972756c6520436173746c650200210a492776652068656172642072756d6f7273207468617420736f6d652070656f706c652077686f0a77656e7420746f2074686520636173746c65206e657665722063616d65206261636b21005363686f6f6c206c6574206f7574206561726c7920746f646179210a4c75636b79210f0b0048657921205761697420757021205761697420666f72206d6521004927766520676f74206e6f2063686f6963652e0a492067756573732049276c6c2074616b65207368656c74657220686572652e2e2e0a49206b6e6f7720492063616e20686f6c64206d79206f776e2c206275742074686f7365206172650a736f6d6520666965726365206d6f6e7374657273206f75742074686572652e2e2e004d79206d6f6d2773206120776966652c206e6f74206120776f6c662e004d79206d6f6d2773206120776966652c206e6f74206120666966652100492063616e27742062656c696576652073686520666f756e64206120706c616365210a4920616d20736f206a65616c6f75732e004d6179626520492073686f756c6420676f20706179206865720a6120766973697420736f6d6574696d652e005468696e6773206a757374206172656e2774207468652073616d652061726f756e640a68657265206e6f7720746861742069742773206a757374207468652074776f206f662075732e00492068617465206265696e67206865726520616c6c20616c6f6e65210a0a492077697368204920636f756c642066696e642061206e69636520706c6163650a746f206c6976652c206c696b6520746865206f7468657273206469642e2e2e0049742773206e6f2066756e206265696e67206865726520616c6f6e652e204d617962650a492073686f756c64206c6f6f6b20666f722061206e69636520686f7573652c20746f6f2e004265696e6720616c6c20616c6f6e652069732e2e2e77656c6c2c206c6f6e656c792e2049276d0a676f696e6720746f2066696e64206d7973656c662061206e69636520686f6d652c20746f6f2e000000000000000000 - -ffffffffffffffffffffffffffffa0010000a101000032020000710200009b030000ba040000e9040000bc0500003c0600003d060000cb0600000c070000d80700003809000067090000ff090000330a0000340a0000ae0a0000ed0a0000c80b00001d0d00004c0d0000e80d0000210e0000220e0000950e0000d40e0000e10f0000e210000011110000aa1100000112000002120000031200009f120000de120000ca130000e114000010150000a9150000561600005716000058160000ed1600002c1700002518000046190000751900000e1a0000951a0000721b0000731b0000081c0000471c00004f1d0000601e00008f1e0000281f0000b61f00009f200000a020000071210000b0210000e3220000e823000017240000ee2400008b250000c4260000c526000074270000b3270000f42800009f290000a0290000a1290000a2290000a3290000a4290000a5290000532a0000922a0000b22b0000752c0000762c0000772c0000782c0000792c00007a2c00007b2c00003d2d00007c2d00009f2f000080300000c4310000e7310000623200008e320000d03200003a33000081330000c333000020340000000300d0 - -4920616d2002025377696674626c61646502002c2066696e6573742073776f7264736d616e0a696e20616c6c206f6620487972756c65210a496620796f75200203747261696e20020077697468206d652c20492067756172616e74656520746861740a796f752077696c6c20696e63726561736520796f757220736b696c6c206472616d61746963616c6c792100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b73005765207368616c6c207374617274207769746820746865206d6f73742062617369630a6f6620616c6c20746563686e6971756573210a49207368616c6c - -gUnk_089F068A:: @ 089F068A -@ replacing .incbin "baserom.gba", 0x009f068a, 0x1a8 -.data 20746561636820796f752e2e2e7468652002015370696e2041747461636b0200210a02010a02034669727374212102000a507265737320616e6420686f6c6420796f75722073776f726420627574746f6e2e2e2e0a02035365636f6e64212102000a4275696c6420757020656e6f75676820706f7765722e2e2e0a02035468697264212102000a52656c6565656561736520796f7572206465737472756374697665206d6967687421210a54686174277320616c6c2c20796f756e672073776f7264736d616e21210a0a446f20796f7520756e6465727374616e643f0a202005ff5965732020200546034e6f004861686121205665727920676f6f64210a596f75206172652061207665727920717569636b2073747564656e742e0a427574206f6e65206d757374204645454c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a492063616c6c20 - -gUnk_089F0832:: @ 089F0832 -@ replacing .incbin "baserom.gba", 0x009f0832, 0x17d5 -.data 74686973207468652002035377696674626c61646520506f7373657373696f6e0a746563686e697175650200206f6620747261696e696e67210a5761746368207468697321210a5572726e676821210a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746600059657321212046696e6520776f726b2120596f75277265206120717569636b2073747564792e0a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e20726576696577206974207769746820746869732002017363726f6c6c0200210a596f75206d6179207669657720697420616e7974696d652066726f6d0a746865205175657374205374617475732073637265656e2100546865726520617265206e6f206d6f726520746563686e697175657320492063616e0a746561636820796f752002037769746820796f75722063757272656e742073776f726402002102030a0200436f6d6520616761696e207768656e20796f7520686176650a020161206e65772073776f7264020020696e2068616e642100000300d04d6e212041206e657720020173776f72640200212046616e7461737469632120416e6420796f750a7365656d20746f2068617665206163717569726564206e657720736b696c6c732077697468206974210a59657321204920616d20726561647920746f200203747261696e200200796f7520616761696e2c0a796f756e672073776f7264736d616e2100536f3f2057696c6c20796f75206163636570742074686973206e6577200203747261696e696e6702003f0a202005ff5965732005465f4e6f2c207468616e6b7300492077696c6c206e6f7720746561636820796f75206120746563686e697175652063616c6c65640a74686520526f636b20427265616b65722c20736f2070617920617474656e74696f6e210a02034669727374212102000a5377696e6720796f75722073776f726420746f20627265616b20706f7473210a41637475616c6c792c2074686174277320616c6c2074686572652069732c20796f756e670a73776f7264736d616e21210a446f20796f7520756e6465727374616e643f0a202005ff59657320202005460b4e6f005965732120486168612120476f6f64210a0a496620796f7520686164207361696420796f75206469646e277420756e6465727374616e642c0a4920776f756c64206861766520736572696f757320646f756274732061626f757420796f75210a5965732c20627574206f6e65206d757374206665656c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a546861742069732074686520736563726574206f66207468652002035377696674626c6164650a506f7373657373696f6e20746563686e697175650200206f6620747261696e696e67210a5761746368207468697321210a47756e6e67686821210a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746610059657321212046696e6520776f726b212046616e7461737469632c206576656e210a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e20726576696577206974207769746820746869732002017363726f6c6c02002100436f6d6520616761696e207768656e20796f75206c6561726e0a746f20020372756e206c696b65207468652077696e6402002100000300d0416821205965732120596f752068617665207468652002015065676173757320426f6f74730200210a416e6420796f75207365656d20746f2068617665206d6f726520736b696c6c2c20746f6f210a59657321204920616d20726561647920746f200203747261696e200200796f7520616761696e2100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b7300596f752077696c6c206e6f77206c6561726e2061206e657720746563686e697175652c0a746865200201446173682041747461636b0200210a02034669727374212102000a457175697020746865205065676173757320426f6f7473210a02035365636f6e64212102000a457175697020796f75722073776f7264210a02035468697264212102000a52756e206c696b65206372617a79210a54686174277320616c6c2c20796f756e672073776f7264736d616e21210a0a446f20796f7520756e6465727374616e643f0a202005ff5965732020200546134e6f005965732120596573210a596f7520617265206d792066696e6573742073747564656e74210a4a75737420657175697020796f75722073776f726420616e642074686520506567617375730a426f6f747320746f20616e7920627574746f6e20796f75206c696b65210a427574206f6e65206d757374206665656c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a54686973206973207468652002035377696674626c61646520506f7373657373696f6e0a746563686e697175650200206f6620747261696e696e67210a5761746368207468697321210a5572726e676821210a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746620059657321212046696e6520776f726b2120596f75206c6561726e20717569636b6c79210a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e206c6561726e20616761696e2066726f6d20746869732002017363726f6c6c02002100436f6d6520616761696e207768656e200203796f752063616e206a756d7020666172746865720a02007468616e20616e79206f746865722100000300d041686121205965732120596f75206861766520746865200201526f63277320436170650200210a416e6420796f752068617665206163717569726564206e657720736b696c6c210a59657321204920616d20726561647920746f200203747261696e200200796f7520616761696e2100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b73004e6f7720492077696c6c20746561636820796f752061206e657720746563686e697175652c0a746865200201446f776e205468727573740200210a02034669727374212102000a45717569702074686520526f632773204361706521210a02035365636f6e64212102000a4571756970207468652073776f726421210a02035468697264212102000a4a756d702121205468656e2e2e2e0a0203466f75727468212102000a417420796f7572206a756d702773207065616b2c207377696e67207468652073776f7264210a54686174277320616c6c2c20796f756e672073776f7264736d616e21210a0a446f20796f7520756e6465727374616e643f0a202005ff59657320202005461b4e6f005965732120596f75207365652069742c20646f20796f75206e6f743f210a0a427574206f6e65206d757374206665656c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a5769746e6573732e2e2e7468652002035377696674626c61646520506f7373657373696f6e0a746563686e697175650200206f6620747261696e696e67210a5572726e676821210a0a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746630059657321212046696e6520776f726b2120596f75206b6e6f772074686520776179210a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e20726576696577206974207769746820746869732002017363726f6c6c02002100486121205468657265206973206e6f7468696e67206d6f726520492063616e2074656163680a796f752c20796f756e67206d6173746572210a4e6f772c20796f75206d75737420747261696e20796f757273656c66210000000300d042656c69657665206e6f742077686174206f74686572732074656c6c20796f7521204920616d0a7468652074727565206d61737465722073776f7264736d616e206f6620487972756c65210a4d79206e616d6520697320020247726179626c61646502002c20616e6420696620796f75200203747261696e02000a77697468206d652c20796f752077696c6c206c6561726e206d7563682100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b7300596f752077696c6c206c6561726e2074686520616d617a696e670a0201526f6c6c2041747461636b0200212102010a02034669727374212102000a526f6c6c2077697468200c0820616e64200c032e2e2e0a02035365636f6e64212102000a417320736f6f6e20617320796f75206765742075702e2e2e0a02035468697264212102000a53637265616d20224869796161212220616e64207377696e6720796f75722073776f7264210a54686174277320616c6c2c20796f756e672073776f7264736d616e21210a0a446f20796f7520756e6465727374616e643f0a202005ff5965732020200546244e6f00486f686f212057656c6c20616e737765726564210a596f752068617665206d7563682070726f6d697365210a427574206f6e65206d757374206665656c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a546869732069732074686520020347726179626c61646520506f7373657373696f6e0a746563686e697175650200206f6620747261696e696e67210a5761746368207468697321210a5572726e676821210a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746640059657321212046696e6520776f726b2120596f75206b6e6f772074686520776179210a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e20726576696577206974207769746820746869732002017363726f6c6c020021004e6f772c207468657265206973206e6f7468696e67206c65667420666f72206d650a746f20746561636820796f752e0a596f757220747261696e696e67206d75737420636f6e74696e75652077697468696e0a746865207265616c6d206f6620796f7572204d494e442e2e2e0a416674657220616c6c2c2074686520776179206f66207468652073776f72642072657175697265730a6d756368206469736369706c696e65212120596573210000000300d0596f752061726520696e207468652070726573656e6365206f662074686520747275650a6d61737465722073776f7264736d616e206f6620487972756c652c0202204772696d626c6164650200210a496620796f75200203747261696e20020077697468206d652c20796f752077696c6c206265636f6d650a612074727565206d61737465722073776f7264736d616e2100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b7300596f752077696c6c206c6561726e20746865206d65616e696e67206f6620706f7765720a77697468207468697320746563686e697175652c2074686520020153776f7264204265616d02002102010a02034669727374212102000a5768656e20796f757220686561727473206172652066756c6c2e2e2e0a02035365636f6e64212102000a5377696e6720796f7572206d69676874792073776f72642121210a5468617427732e2e2e7265616c6c7920616c6c20746865726520697320746f2069742c0a796f756e672073776f7264736d616e21210a446f20796f7520756e6465727374616e643f0a202005ff59657320202005462d4e6f004275742074686973206973206f6e6c792074686520626567696e6e696e67210a4e6f7720636f6d657320746865207265616c207468696e67210a4f6e65206d757374206665656c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a54686973206973207468652002034772696d626c61646520506f7373657373696f6e0a746563686e697175650200206f6620747261696e696e67210a5761746368207468697321210a5572726e676821210a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746650059657321212046696e6520776f726b2120596f75206b6e6f772074686520776179210a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e20726576696577206974207769746820746869732002017363726f6c6c020021004e6f77207468657265206973206e6f7468696e67206d6f726520746861740a492063616e20746561636820796f7521210a596f757220747261696e696e672066726f6d206e6f77206f6e2069730a616c6c20696e20796f7572206d696e6421210a54686520776179206f66207468652073776f726420697320657465726e616c212059657321000300d0596f75206861766520666f756e64207468652074727565206d61737465720a73776f7264736d616e206f6620487972756c652c0202204772696d626c6164650200210a496620796f75200203747261696e20020077697468206d652c20492077696c6c20746561636820796f750a736b696c6c7320796f75277665206e6576657220696d6167696e6564210a4275742074686520726f6f6d206973206461726b2c20616e6420492063616e6e6f74207365650a796f75722066616365212057652063616e6e6f7420747261696e206c696b652074686973212100000300d0596f75206861766520666f756e64207468652074727565206d61737465720a73776f7264736d616e206f6620487972756c652c02022057617665626c6164650200210a496620796f75200203747261696e20020077697468206d652c20492077696c6c20746561636820796f750a736b696c6c7320746861742077696c6c206d616b6520796f752061206d61737465722100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572 - -gUnk_089F2007:: @ 089F2007 -@ replacing .incbin "baserom.gba", 0x009f2007, 0x312 -.data 653f0a202005ff506c656173652005465f4e6f2c207468616e6b73004e6f7720796f752077696c6c206c6561726e20612064616e6765726f75730a746563686e6971756520666f72206465737065726174652074696d6573210a546865200201506572696c204265616d0200210a0a02034669727374212102000a596f75206d7573742068617665206f6e6c79206f6e65206865617274206c6566742e2e2e0a02035365636f6e64212120020055736520796f7572206c617374206f756e6365206f660a737472656e67746820746f207377696e6720796f75722073776f7264210a54686174277320616c6c2c20796f756e672073776f7264736d616e21210a0a446f20796f7520756e6465727374616e643f0a202005ff5965732020200546364e6f00536f2e2e2e0a5468657265206973206e6f207475726e696e67206261636b206e6f772e2e2e0a466f72206f6e65206d757374206665656c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a546869732069732074686520020357617665626c61646520506f7373657373696f6e0a746563686e697175650200206f6620747261696e696e67210a5761746368207468697321210a5572726e676821210a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746660059657321212046696e6520776f726b210a596f75206b6e6f772074686520776179210a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e20726576696577206974207769746820746869732002017363726f6c6c020021004e6f77207468657265206973206e6f7468696e6720 - -gUnk_089F2319:: @ 089F2319 -@ replacing .incbin "baserom.gba", 0x009f2319, 0x12c -.data 6d6f726520746861740a492063616e20746561636820796f7521210a596f757220747261696e696e672066726f6d206e6f77206f6e2069730a616c6c20696e20796f7572206d696e6421210a54686520776179206f66207468652073776f7264206c656164730a657665722075707761726421205965732100596f75206861766520666f756e64207468652074727565206d61737465720a73776f7264736d616e206f6620487972756c652c02022057617665626c6164650200210a496620796f75200203747261696e20020077697468206d652c20492077696c6c2074656163680a796f75207468696e677320796f75277665206e65766572207365656e210a486d6e3f0a0a4974207365656d7320796f7520617265206e6f742072656164790a746f20747261696e2068 - -gUnk_089F2445:: @ 089F2445 -@ replacing .incbin "baserom.gba", 0x009f2445, 0x2110 -.data 657265210a436f6d65206261636b207768656e20796f7520686176650a02016d6f7265207468616e2031302068656172747302002100000300d054686f756768206d7920626f6479206d6179207065726973682c204920616d207374696c6c0a7468652074727565206d61737465722073776f7264736d616e206f6620487972756c652e2e2e0a02025377696674626c616465207468652046697273742c20537069726974206f66207468650a53776f7264736d616e0200210a496620796f75200203747261696e20020077697468206d652c20492077696c6c20746561636820796f750a736b696c6c73207468617420617265206f7574206f66207468697320776f726c642100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b730054686973206973206120746563686e697175652074686174206f6e6c79204920686176650a6d617374657265642e2e2e0a4f6e6c79206f6e652077686f20686f6c6473207468652073616372656420626c6164650a63616e20706572666f726d2e2e2e7468652002014772656174205370696e2041747461636b02002102010a02034669727374212102000a446f2061205370696e2041747461636b2e2e2e0a02035365636f6e64212102000a50726573732074686520627574746f6e2072657065617465646c79210a52657065617465646c79212052657065617465646c792c20646f20796f7520686561720a6d653f2054686174277320616c6c2c20796f756e672073776f7264736d616e21210a446f20796f7520756e6465727374616e643f0a202005ff59657320202005463f4e6f00576f686f686f686f210a427574206974206973206e6f7420736f2065617379210a4f6e65206d757374206665656c2074686520746563686e697175652c0a6e6f74206a75737420686561722061626f7574206974210a5468617427732077687920492077696c6c206e6f7720706f737365737320796f757220626f64790a736f20617320746f2064656d6f6e7374726174652074686520746563686e69717565210a546869732069732074686520020353706f6f6b7920506f7373657373696f6e0a746563686e697175650200206f6620747261696e696e67210a5761746368207468697321210a5572726e676821210a506f652e2e2e5a65682e2e2e5348554e21212100506865772e2e2e0a4e6f772120596f75206d75737420747279206974200203796f757273656c660200210a0746670059657321212046696e6520776f726b210a596f75206b6e6f772074686520776179210a596f75206861766520706173736564207468652074657374206f660a02025377696674626c616465207468652046697273742002007769746820737563682065617365210a492077696c6c206e6f77206769766520796f7520746869732002015469676572205363726f6c6c0200210a0a496620796f75206576657220666f72676574207468697320746563686e697175652c0a796f752063616e2072657669657720746869732002017363726f6c6c020021004e6f77207468657265206973206e6f7468696e67206d6f726520746861740a492063616e20746561636820796f7521210a596f757220747261696e696e672066726f6d206e6f77206f6e2069730a616c6c20696e20796f7572206d696e6421210a5468652077617920626567696e732077697468207468652073776f726420616e6420656e64730a77697468207468652073776f7264212059657321000300d054686f756768206d7920626f6479206d6179207065726973682c204920616d207374696c6c0a7468652074727565206d61737465722073776f7264736d616e206f6620487972756c652e2e2e0a02025377696674626c616465207468652046697273742c20537069726974206f66207468650a53776f7264736d616e0200210a496620796f75200203747261696e20020077697468206d652c20492077696c6c20746561636820796f750a736b696c6c73207468617420617265206f7574206f66207468697320776f726c64210a486d6e3f0a0a4974207365656d7320796f7520617265206e6f74207965742072656164790a746f20747261696e2077697468206d65210a436f6d65206261636b207768656e20796f7520686176650a0201616c6c2037205469676572205363726f6c6c7302002100000300d053776f7264736d616e7368697020697320737069726974210a0a4920616d207468652066696e657374206f72206d61796265207365636f6e642d66696e6573740a73776f7264736d616e20696e20616c6c206f6620487972756c652c20020253636172626c6164650200210a0203547261696e696e6720020077697468206d652077696c6c20666f72657665720a7472616e73666f726d20796f75722073776f7264736d616e736869702100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b7300596573210a5468656e20492077696c6c20746561636820796f7520686f7720746f206d6f72650a717569636b6c7920756e6c6561736820796f75722002015370696e2041747461636b02002c0a776869636820796f75206861766520616c7265616479206c6561726e6564210a492074616b652076697375616c697a6174696f6e200203747261696e696e67200200766572790a736572696f75736c792c2049276c6c206861766520796f75206b6e6f77210a4e6f772c2071756965746c7920636c6f736520796f757220657965732e2e2e0a0a56697375616c697a65200203796f75722073776f7264206d6f76696e6720617420616e0a756e7468696e6b61626c6520737065656402002e2e2e0a57756f6f6f6f6f6f686868682121212102030a0a020053535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e004d6e756868682e2e2e0a0a4e6f772c20796f752063616e20706572666f726d20796f7572205370696e2041747461636b0a02036d7563682066617374657202002c206d792073747564656e742102030a02005468697320697320746865206865617274206f66207468652073776f7264210a0a416c6c20626567696e7320776974682062656c6965662e2e2e0a436f6d6d697420796f757273656c6620746f2074686520626c61646521000000000000000300d05468652073706972697420616e64207468652073776f726420617265206f6e65210a0a4920616d20746865206e6561726c7920626573742073776f7264736d616e0a696e20487972756c652c20020253706c6974626c6164650200210a496620796f75200203747261696e20020077697468206d652c20796f752077696c6c20646973636f7665720a7468652073656372657473206f6620796f75722068696464656e20706f7765722100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b73004d6e6e68210a0a4e6f7720492077696c6c20746561636820796f7520686f7720746f2066696c6c20796f75720a020153706c6974204761756765020020666173746572207468616e2065766572210a492074616b652076697375616c697a6174696f6e200203747261696e696e67200200766572790a736572696f75736c792c2049276c6c206861766520796f75206b6e6f77210a4e6f772c2071756965746c7920636c6f736520796f757220657965732e2e2e0a0a56697375616c697a65200203796f757220626f64792073706c697474696e67206576656e0a666173746572207468616e2065766572206265666f726502002e2e2e0a57756f6f6f6f6f6f686868682121212102030a0a0200537075682d2d4c6969692d2d54494e4721004d6e756868682e2e2e0a0a4e6f7720796f752077696c6c20020366696c6c20796f75722053706c69740a4761756765206d7563682066617374657202002c206d792073747564656e742102030a02005468697320697320746865207472757468206f66207468652073776f7264210a0a416e6420747275746820697320616c6d6f737420746865206578616374206f70706f736974650a6f66206e6f742d7472757468210a436f6d6d697420796f757273656c6620746f2074686520626c61646521000000000000000300d04d617374657279206f66207468652073776f7264206973206d6173746572790a6f662074686520736f756c210a4920616d206b696e6461206c696b6520616c6d6f73742074686520626573740a73776f7264736d616e20696e20487972756c652c2002024772656174626c6164650200210a0203547261696e696e6720020077697468206d652077696c6c20746f74616c6c79206368616e67650a796f75722073776f726420736b696c6c20666f726576657220616e642073747566662100536f3f20576f756c6420796f75206c696b6520746f200203747261696e200200686572653f0a202005ff506c656173652005465f4e6f2c207468616e6b7300596573210a416c6c2072696768742c2049276c6c20746561636820796f7520686f7720746f2070726f6c6f6e670a746865206475726174696f6e206f66207468652002014772656174205370696e2041747461636b02002c0a776869636820796f75206861766520616c7265616479206c6561726e6564210a492074616b652076697375616c697a6174696f6e200203747261696e696e67200200766572790a736572696f75736c792c2049276c6c206861766520796f75206b6e6f77210a4e6f772c2071756965746c7920636c6f736520796f757220657965732e2e2e0a0a56697375616c697a65200203796f75722073776f726420636f6e74696e75696e6720746f206d6f76650a6c6f6e676572207468616e206576657220706f737369626c6502002e2e2e0a57756f6f6f6f6f6f68686868212121210a02030a020053535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e02030a020053535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e0a53535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e0a53535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e0a53535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e0a53535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e0a53535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e472e2e2e0a53535353535350494e4e4e4e4e4e4e4e494e4e4e4e4e4e47212121004d6e756868682e2e2e0a0a4e6f7720796f7572204772656174205370696e2041747461636b2077696c6c206c6173740a02036c6f6e676572207468616e206265666f726502002c206d792073747564656e742102030a02005468697320697320746865207472757468206f66207468652073776f7264210a0a5768656e20796f7520646f75627420616e6f746865722c20796f75206272696e670a636c6f75647320696e746f20746865206d696e64277320736b696573210a436f6d6d697420796f757273656c6620746f2074686520626c61646520616e6420737475666621004d617374657279206f66207468652073776f7264206973206d6173746572790a6f662074686520736f756c210a4920616d206b696e6461206c696b6520616c6d6f73742074686520626573740a73776f7264736d616e20696e20487972756c652c2002024772656174626c6164650200210a0203547261696e696e6720020077697468206d652077696c6c20746f74616c6c79206368616e67650a796f75722073776f726420736b696c6c20666f726576657220616e64207374756666210a486d6e3f0a0a447564652e2e2e204920646f6e2774207468696e6b20796f75277265206576656e0a726561647920746f20747261696e2068657265210a436f6d65206261636b207768656e20796f752068617665206c6561726e6564207468650a02016869676865737420746563686e697175650200206f66207468652073776f726421004973207468617420736f3f205468656e20796f7520676f206e6f77212053686f6f2100507265737320616e6420686f6c6420796f75722073776f726420627574746f6e2e0a4275696c6420757020656e6f75676820706f7765722e0a5468656e2c2072656c6561736520796f7572206465737472756374697665206d6967687421210a54686174277320616c6c20746865726520697320746f2069742100427265616b2074686520706f7473207769746820796f75722073776f7264210a54686174277320616c6c2100457175697020746865205065676173757320426f6f747320616e6420796f75720a73776f72642c20616e64207468656e2072756e206c696b65206372617a7921210045717569702074686520526f632773204361706520616e64207468652073776f726421210a4a756d7021210a5768656e20796f7520726561636820796f7572206a756d702773207065616b2c0a7377696e67207468652073776f7264212054686174277320616c6c2100526f6c6c2077697468200c0820616e64200c032c20616e64207468656e207377696e670a796f75722073776f726420617320796f7520737461727420746f2067657420757021005768656e20796f757220686561727473206172652066756c6c2e2e2e7377696e6720796f75720a73776f7264207769746820616c6c20796f7572206d6967687421005768656e20796f752068617665206f6e6c79206f6e65206865617274206c6566742e2e2e0a0a5377696e67207468652073776f7264207769746820746865206c6173740a6f6620796f75722077616e696e6720737472656e6774682100506572666f726d2061205370696e2041747461636b2e2e2e616e6420686974207468650a627574746f6e2120416761696e2120416761696e2120416761696e2120416761696e2100 - -ffffffffffffffffb8000000b900000073010000a0010000d20100002002000021020000750200009b020000b5020000f9020000fa02000070030000b9030000ff0300005c040000910400005f0500009d050000db050000190600009f060000f106000035070000490700008d0700008e070000d40700000b080000530800008008000081080000e5080000280900007a090000b5090000b6090000910a0000c60b00006e0c0000fa0c0000800d0000f00d00004f0e0000ac0e0000ad0e000000 - -0301fc496620796f752077616e7420746f20676574206163726f737320746865207377616d702c0a796f75206e65656420746f206265207377696674206f6e20796f757220666565742e0a596f75206b6e6f772c206120667269656e64206f66206d696e65206d616b65732073686f65730a696e20487972756c6527732073686f652073686f702e0a49276d2070726574747920737572652068652063616e206d616b650a02015065676173757320426f6f747302002e2e2e000301fb576f756c6420796f75206c696b6520746f20667573650a4b696e73746f6e65732077697468206d653f000301fe596f7520646f6e27742077616e7420746f3f20596f7520646f6e27740a6576656e2077616e7420746f207472793f000301ff5765206469642069742120546865792066697420706572666563746c792120596f75206b6e6f770a776861742074686174206d65616e733f20476f6f64206c75636b20666f722075732100000301f74920666f756e6420736f6d6520616d617a696e676c7920726172652002014b696e73746f6e6502000a70696563657321204174206c656173742c2049207468696e6b2074686579277265207261726521000301f84f683f2120596f752077616e7420746f2066757365207069656365733f2059617921000301f9596f7520646f6e27742077616e7420746f207472793f000301fa4c6f6f6b20617420746861742120412070657266656374206d61746368210a492063616e2774207761697420746f2073656520776861742068617070656e732100000301fe486d6d6d2e2e2e204920666f756e6420612002014b696e73746f6e652002007069656365206f7665720a74686572652e0a49277665206e65766572207365656e20616e797468696e67206c696b652069742e0a4974206d7573742062652061207265616c6c792072617265206f6e652e2e2e000301ff596f752077616e7420746f2066757365207069656365733f20446f20796f75207468696e6b0a796f752068617665206f6e652074686174206d617463686573206d696e653f000301fd4d6d6d6d2e2e2e20492067756573732069742773206861726420746f2066696e640a61206d6174636820666f722073756368206120726172652070696563652e2e2e000301fb486d6d21204974206669747320706572666563746c79210a0a486f7720636f756c6420796f7520686176652061207069656365207468617420666974730a6d7920756c7472612d72617265206f6e6520736f2077656c6c213f000301fb49207468696e6b20746869732069732061207265616c6c790a726172652002014b696e73746f6e65207069656365020021000302054865792c206c6f6f6b20617420746869732002014b696e73746f6e652070696563650200210a4861766520796f752065766572207365656e206f6e65206c696b6520746869733f0a576861743f20596f7520646f6e2774206b6e6f77207768617420612002014b696e73746f6e650a706965636502002069733f2057656c6c2c2074656c6c20796f7520776861742e2e2e0a57687920646f6e277420796f7520636f6d65206261636b20616e6420736565206d650a7768656e20796f7520676574206f6e652c204f4b3f0003020057686174277320746861743f20596f752077616e7420746f200203667573650a4b696e73746f6e652070696563657302002077697468206d653f000301fa492067756573732069742773206861726420746f2066696e640a61206d6174636820666f722073756368206120726172652070696563652e2e2e000301f9576861612120497420666974732120596f75206d7573742068617665206861640a61207265616c6c7920726172652070696563652c20746f6f21000301fd576861743f20596f7520646f6e2774206b6e6f77207768617420612002014b696e73746f6e650a706965636502002069733f2057656c6c2c2074656c6c20796f7520776861742e2e2e0a57687920646f6e277420796f7520636f6d65206261636b20616e6420736565206d650a7768656e20796f7520676574206f6e652c204f4b3f000301fa412076697369746f722120486f7720726172652e2e2e204920646f6e27742068617665206d7563680a746f206f666665722c2062757420796f752772652077656c636f6d6520746f20737461792e0003020057686174277320746861743f20596f752077616e7420746f20667573650a02014b696e73746f6e652070696563657320020077697468206d653f20537572652e00030201596f75277265207175697474696e673f000302025765206469642069742120546865792066697420706572666563746c79210a4d617962652049276c6c2067657420736f6d65206c75636b2066696e616c6c79210000030205596f75206d6f7665642074686520726f636b20666f72206d653f204772656174210a492074686f7567687420492764206e6576657220676574206f75747369646521000301fe4f682c20796f752077616e7420746f20667573652077697468206d653f0a4e6f77206c657427732073656520686572652e2e2e000301fb49206775657373206974276c6c2062652061207768696c65206265666f726520492066696e640a61207069656365207468617420666974732074686973206f6e652e2e2e000301fc4c6f6f6b21205468657920666974210a486f77206c75636b792120416d617a696e672c206576656e2100000301f957686174277320796f75722070726f626c656d3f0a0a4d6d6d6d2120596f752772652073746172696e67206174206d7920616d617a696e676c790a726172652002014b696e73746f6e6520706965636502002c206172656e277420796f753f21000301fa486f77206461726520796f752120596f752077616e7420746f20667573650a6d792070726563696f75732002014b696e73746f6e6520706965636502003f21000301fd506865772e2e2e205377656574206c6974746c652002014b696e73746f6e6520706965636502002e0a49742773204f4b2e204e6f206f6e65277320676f6e6e61206875727420796f752e2e2e0f0b000302024168682e2e2e2054686579206669742e2e2e0a4d7920706f6f72206c6974746c652002014b696e73746f6e6520706965636502002e2e2e00000302034865792120596f757220636c6f746865732e2e2e20596f75206d7573742062650a68756d616e21204f682c2049206a757374204c4f56452068756d616e2066617368696f6e210a49206a7573742063616e27742068656c70206665656c696e6720746861742068756d616e730a617265206d6f726520736f7068697374696361746564207468616e2002024d696e69736802002e0a596f75206b6e6f772c2049206576656e207468696e6b20736f6d65206f746865720a02024d696e6973682002006665656c2074686174207761792c20746f6f2e2e2e000302025761746572206973206c69666520666f722002034372656e656c204265616e7302002102030a0a020054686520626c7565206265616e732067726f77207768656e20796f7520706f75720a020177617465722002006f6e207468656d2e2e2e0a4275742074686520677265656e206265616e73206c696b650a02014d742e204372656e656c204d696e6572616c20576174657202002e02030a02014d742e204372656e656c204d696e6572616c20576174657220020063616e20626520666f756e640a6f6e6c7920696e206120737072696e672068657265206f6e2002024d6f756e74204372656e656c02002e0a57656c6c2c207265616c6c792c2074686520737072696e6720697320636c6f73657220746f0a7468652062617365206f662002024d6f756e74204372656e656c02002e000302015468657365200202736f6c6469657220737461747565730203200200686572652077657265206275696c740a627920746865204d696e69736820616765732061676f20746f2068656c702068756d616e732e0a49742773206b696e64206f662061207365637265742c20627574207468657265277320610a73776974636820696e7369646520746861742002037475726e73207468656d206f6e206f72206f666602002e00030201476f2067657420746865200201666c69707065727320020066726f6d207468652002024d696e6973680a656c64657220020077686f206c6976657320696e20746865206c6962726172792e0a54686579276c6c206d616b6520697420736f20796f752063616e207377696d0a7468726f75676820746865207761746572207769746820656173652e0003020443616e20796f7520736f6c76 - -gUnk_089F4555:: @ 089F4555 -@ replacing .incbin "baserom.gba", 0x009f4555, 0x4081 -.data 65206d7920726964646c653f0a0a020353706c6973682c2073706c6173682c2074686520736f756e64206f662077617465722e0a4865206c6976657320696e2074686520616e7377657220686f7573652e02000a4920776f6e64657220696620796f75276c6c206d656574206d7920667269656e643f000302040203412066656172736f6d652c20756e667269656e646c792066656c696e652e2e2e0a54686520616e73776572206c6976657320686572652102000a596f75206469642077656c6c20746f20636f6d652074686973206661722e0a506c656173652074616b6520746869732e0003020402034d616e2c20776f6d616e2c206f72206d6964646c653f0a4865206c6976657320696e2074686520616e7377657220686f7573652e02000a4920776f6e64657220696620796f75276c6c206d656574206d7920667269656e643f00030204020354686174206d656f77206973206d6967687479210a4865206c6976657320696e2074686520616e7377657220686f7573652e02000a4920776f6e64657220696620796f75276c6c206d656574206d7920667269656e643f00000301fb49206761766520796f75206d79206c6173742002014b696e73746f6e6520706965636502000a61207768696c652061676f21204275742049276c6c20676f206c6f6f6b20666f72206d6f72652e00 - -ffffffffffffffffffff2400000025000000d9010000970200004a030000a6030000380400007a040000c504000000 - -0301fc4f682c20686f2120412076697369746f722120486f772072617265210a0a42757420796f75206861766520666f756e64206d652c207468650a776973657374206f662074686520776973657374206f66207468652077697365210a596f7520776861743f20596f752077616e7420746f20656e746572207468650a020374656d706c6520796f752063616e2073656520696e20746865206c616b6502003f0a546865792063616c6c207468617420706c6163652074686520020254656d706c65206f660a44726f706c65747302002e0a4920686176652068656172642072756d6f72732074686174206f6e65204d696e6973680a61637475616c6c79206469642066696e6420612077617920696e2c206c6f6e672061676f2e2e2e0a54686174204d696e697368206973200202456c646572204c69627261726902002c20616e642068652069730a696e2073656d692d7265746972656d656e7420696e2074686520746f776e206c6962726172792e0a546865206c6962726172792073686f756c64206265206f70656e696e6720736f6f6e2e0a5065726861707320796f752063616e20676f2066696e642068696d2e000301fb5965732c2074686520656c646572204c696272617269206f6e636520666f756e6420616e0a656e7472616e636520746f207468652054656d706c65206f662044726f706c6574732e0a416e64206e6f772c206865206c6976657320696e2074686520746f776e206c696272617279210a0a416e64207468697320697320616c6c2074686520776973646f6d206f6620746865207769736573740a6f662074686520776973652049206861766520746f206f6666657220796f752100030205536f20796f75206d6574207769746820656c646572204c6962726172693f210a0a416e6420686520736169642074686174206865207265616c6c7920484153206265656e0a696e73696465206f66207468652054656d706c65206f662044726f706c6574733f0a49206b6e657720697421204f6e636520616761696e2c206d7920776973646f6d206861730a7375727061737365642074686520776973646f6d206f66207468652077697365737421000301fe492068617665206c6f7473206f66207769736520616e642074686f756768742d0a70726f766f6b696e6720696e666f726d6174696f6e2e2e2e0a427574206e6f7468696e6720666f7220796f75207269676874206e6f772e0003020348656c6c6f2120486f77206e69636520746f206861766520612076697369746f72210f0b0a0a4275742e2e2e49276d20686176696e6720736f6d652074726f75626c65210a0a54686579277665206368616e6765642074686520726f6f6d2061726f756e642c20616e640a6e6f7720492063616e27742067657420696e746f207468652066697265706c616365210003020254686579277665206368616e6765642074686520726f6f6d2061726f756e64210a49742773207465727269626c65206e6f772120536f2067617563686521000302035468616e6b20796f7521204e6f7720492063616e20636c696d6220696e207468726f7567680a7468652066697265706c61636520616e642067657420736f6d6520736c656570210000 - -ffffffffffffffffffffffffffff5c0000005d00000026010000dc01000093020000440300004503000009040000e4040000e5050000e6050000e7050000e80500008c060000d906000055070000140800009a080000dd0800003109000087090000ad090000ee09000000 - -57656c636f6d6520746f20746865206c696272617279210a0a5361792c206172656e277420796f7520536d6974682773206772616e64736f6e2c0a06003f0a486d3f2054686520626f6f6b73206d697373696e672066726f6d207468650a626f6f6b7368656c66206f6e20746865207365636f6e6420666c6f6f723f0a5965732c2074686579277665206265656e20636865636b6564206f757420666f720a71756974652061207768696c652e20546865792772652056455259206f766572647565210a0749020a0054616b652002014120487972756c65616e20426573746961727902002c20666f720a6578616d706c652e204265656e20676f6e6520666f7220616765732e0a436865636b6564206f757420627920020361206769726c207769746820612063617402002e205368650a7361696420736865206861642061206e6577206361742061742068657220686f7573652e0a57616e74656420746f206c6561726e206d6f72652061626f75742069742c20736865206469642e00546865206e657874206f76657264756520626f6f6b2069732e2e2e0a4c65742773207365652e2e2e0a41682c2079657321204f6620636f757273652e2e2e02014c6567656e64206f66207468650a5069636f72690200212049742773206265656e206f757420666f7265766572210a49742077617320636865636b6564206f7574206279206120736f6d65776861740a0203616273656e746d696e646564207363686f6c617202002c20492062656c696576652e2e2e00416e6420746865206c61737420626f6f6b207765207374696c6c206e6565640a69732002014120486973746f7279206f66204d61736b7302002e0a49207468696e6b2069742077617320636865636b6564206f7574206279200202486167656e02002c0a746865206d61796f722e0a486f7720636f756c64206865206b6565702061206c69627261727920626f6f6b0a736f206c6f6e672120486527732061207075626c6963206f6666696369616c21000048657921204c6f6f6b206174207468617421204f7572206c6f6e672d6c6f737420636f70790a6f662002014120487972756c65616e2042657374696172790200210a06002c2061726520796f752072657475726e696e670a7468697320626f6f6b3f21205468616e6b20796f7520736f206d756368210a492063616e277420626567696e20746f20646573637269626520686f77206d7563682049276d0a6c6f6f6b696e6720666f727761726420746f2070757474696e672074686973206261636b21004f68206d7920676f6f646e6573732c2077696c6c20796f75206c6f6f6b2061742074686174210a0a49742773206f757220636f7079206f662002014c6567656e64206f6620746865205069636f72690200210a49742773206265656e20636865636b6564206f757420666f7220736f206c6f6e67210a06002c20796f7520646573657276652061206d6564616c0a666f7220616c6c2074686973210a4920616d206d6f7665642e2e2e20446565706c792c20646565706c79206d6f7665640a627920746869732074686f7567687466756c20676573747572652100576f756c6420796f75206c6f6f6b20617420746861742120492063616e27742062656c696576650a6974212049742773206f757220636f7079206f662002014120486973746f7279206f66204d61736b730200210a54686174206d61796f72206f66206f7572732069732061207265616c207069656365206f660a776f726b2c2069736e27742068653f0a4974206d7573742068617665206265656e2071756974652061206368616c6c656e67650a746f206765742074686973206261636b2066726f6d2068696d2e0a596f7520617265206d79206e6577206661766f7269746520706572736f6e2c0a060021205468616e6b20796f7520736f206d7563682100000000596f75206b6e6f772c2006002c20796f75277665206e6f770a72657475726e656420616c6c206f66206f7572206f76657264756520626f6f6b73210a4e6f7720492063616e2066696e616c6c7920676574207468617420626f6f6b7368656c660a6f6e20746865207365636f6e6420666c6f6f7220696e206f72646572210a4865792c2002025374757267656f6e02002120426f6f6b7320746f207368656c76652121005965732c20796573212048657265204920616d212049276d2068657265212049276c6c20686176650a746865736520626f6f6b73207075742061776179206c69636b6574792d73706c697421000300db536f6d6574696d65732c20746865736520626f6f6b73206d6f7665206f6e2074686569720a6f776e212049277665207365656e2069742077697468206d79206f776e2074776f2065796573210a416e2720646f6e27742074656c6c206d652049276d206372617a79210a492061696e2774206372617a7921005361792c2002025374757267656f6e02002c206f6e20746865207365636f6e6420666c6f6f722c0a686173206265656e20616374696e672061206c6974746c6520737472616e67652e0a4865206b6565707320626162626c696e672061626f75742074686520626f6f6b730a6d6f76696e672061726f756e64206f6e207468656972206f776e210a446f20796f75207468696e6b206d61796265207765206861766520726174730a6f7220736f6d657468696e672075702074686572653f0049276d20696e20636861726765206f6620636865636b696e67206f757420626f6f6b732c0a736f2069742773206e6f74206d792070726f626c656d2e0a5374696c6c2c2049206665656c207265616c6c792062616420666f7220746865206769726c0a6f76657220746865726520696e20636861726765206f662072657475726e732e2e2e00466f6c6b7320646f6e277420636f6d65207570206865726520736f206f6674656e2e0a4920676574206120746f756368206c6f6e656c79206f6e206d79206f776e2e0057656c636f6d6520746f20746865206c696272617279210a0a48657921204172656e277420796f7520536d6974682773206772616e64736f6e2c0a06003f20456e6a6f7920796f75722062726f7773696e67210054686520626f6f6b7368656c76657320617265206261636b20696e206f72646572210a41682c2049206665656c20736f2e2e2e736f2e2e2e72656e65776564210a456e6a6f7920796f75722062726f7773696e672100576f6e646572207768617420492073686f756c6420636865636b206f757420746f6461792e004f6820686f20686f2120416c6c2074686520626f6f6b7320617265206261636b0a6f6e20746865207368656c766573212049736e2774206974206772616e64210000 - -ffffffffffffffffffffffffffa0000000a10000001802000019020000dd0200000a030000ab030000ca030000df030000f4030000e2040000f70400008f050000cc050000e1050000f60500000b0600002006000030070000450700005c08000071080000860800009b080000b0080000c5080000910a0000dc0a0000f10a0000060b00001b0b0000300b0000450b00005a0b00006f0b0000a20c0000140d00008a0d0000b50d00006e0e000000 - -0301fd4865792c206865792c20686579212054686973206973206e6f20676f6f64210a4e6f20676f6f6420617420616c6c210a5468652068756d616e732068617665200203636865636b656420736f6d6520626f6f6b730a6f7574206f6620746865206c6962726172790200210a5468616e6b7320746f207468656d2c206e6f6e65206f662075732063616e206765740a6261636b20746f200202456c646572204c69627261726902002e2e2e0a486f772077696c6c2068652067657420627920616c6c20616c6f6e653f0a49276d20736f20776f72726965642e2e2e0a49276d2073757265207468652002026c696272617269616e0200206b6e6f777320736f6d657468696e670a61626f75742077686572652074686f736520626f6f6b732077656e742e2e2e0a49207769736820492077657265206269672e205768792c204927642077616c6b2072696768740a757020616e642061736b206865722077686572652074686f736520626f6f6b732077656e742100000301fd4865792c206865792c2068657921204c697374656e20757021204c697374656e20676f6f64210a54686520626f6f6b7320617265206261636b206e6f77210a4974277320747275652120497427732074727565212048616861210a4e6f772077652063616e20676574206261636b20746f200202456c646572204c6962726172690200210a536f20796f752062726f756768742074686520626f6f6b73206261636b3f0a476f6f6420666f7220796f7521205468616e6b20796f75210a074a04000301fe506c656173652074616b65207468697320617320610a7369676e206f66206f7572207468616e6b7321000302004927642062657474657220676574206261636b20746f200202456c646572204c69627261726902000a6e6f7721204865276c6c20626520776f6e646572696e67207768657265204920616d2e0a457370656369616c6c79206e6f77207468617420492063616e20636c696d62206f766572207468650a626f6f6b732c2072696768743f2049206d65616e2c206974277320736f2065617379206e6f7721000302055468616e6b7320616761696e20666f7220796f75722068656c7021004b4f4249544f0f1f484f4e44414e410f1f303037004b4f4249544f0f1f484f4e44414e410f1f303038000301f757686174206120677265617420636f6d626f210a0a596f7527726520676f696e6720746f206d6565740a0202456c646572204c696272617269020020616e642002024a6f746f726902003f0a4f682c20616e6420686f772061626f7574204c6962726172692773206c6f6e672c0a626f72696e6720616476656e747572652073746f726965733f2048616861210a54616c6b2061626f757420746872696c6c696e67212048617220686172210a0a57656c6c2c20696620796f7527726520676f696e67206f7665722074686572652c0a6a75737420636c696d62206f7665722074686520626f6f6b7321004b4f4249544f0f1f484f4e44414e410f1f303130000301f857652063616e27742067657420757020746865207368656c662c20626563617573650a736f6d652068756d616e20636865636b6564207468617420626f6f6b206f7574210a427574206174206c6561737420776520646f6e2774206861766520746f206c697374656e20746f0a0202456c646572204c6962726172690200277320626f72696e67206f6c642073746f7269657321000301f94168682c206974277320736f206e69636520746f206861766520616c6c206d79206c6974746c650a626f6f6b7320696e206120726f77210f0b004b4f4249544f0f1f484f4e44414e410f1f303133004b4f4249544f0f1f484f4e44414e410f1f303134004b4f4249544f0f1f484f4e44414e410f1f303135004b4f4249544f0f1f484f4e44414e410f1f303136000302054920616d2002024a6f746f726902002c206f6e65206f662002024c696272617269020027732073747564656e7473210a0a416e6420746f20626520706572666563746c7920686f6e6573742c2049207468696e6b0a746861742002024c6962726172690200277320616476656e747572652073746f72696573206172652e2e2e0a0301fd546865206265737421210a4e6f2c207265616c6c79210a49206d61792062652061206d656e74616c206769616e742c20627574204920686176650a74686520626f6479206f66206a75737420612074696e79204d696e697368206c61642e2e2e0a546861742773207768792049207265616c6c792061646d697265207374726f6e6720666f6c6b21004b4f4249544f0f1f484f4e44414e410f1f303138000301fd4f682120536f20796f75207061737365642074686520747269616c20616e640a72657475726e65642077697468200202456c646572204c6962726172690200277320666c6970706572733f0a49276d20736f206a65616c6f7573210a49276d206e6f74206d75636820666f72206578657263697365206d7973656c662e2e2e0a42757420696620796f7527726520676f696e67206f6e20616e20616476656e747572652c0a74686572652773206e6f206f6e652062657474657220746f206c6561726e2066726f6d210a41682c2074686174200202456c646572204c696272617269020021204865277320736f206d616e6c79210a536f2062726176652120416e6420736f2066756c6c206f66204649524521004b4f4249544f0f1f484f4e44414e410f1f303230004b4f4249544f0f1f484f4e44414e410f1f303231004b4f4249544f0f1f484f4e44414e410f1f303232004b4f4249544f0f1f484f4e44414e410f1f303233004b4f4249544f0f1f484f4e44414e410f1f3032340003020d576f686f686f686f21205768617420627573696e657373206861766520796f750a77697468206f6c642002024c69627261726902003f0a42757421204265666f726520796f752061736b2c20706c6561736520616c6c6f77206d650a746f20696e74726f64756365206d7973656c662e0a576f686f686f686f21204168656d2c20616865656565656d2e2e2e0a0a4d79206e616d652069732002024c69627261726902002c20616e6420492068617665206c697665640a6d616e79206c6f6e672079656172732e0a536f206d616e792c20696e20666163742c20746861742049277665207261746865720a666f72676f7474656e20686f77206f6c64204920616d210a427574207768656e20492077617320796f756e672c206f682c0a492063726f73736564206d6f756e7461696e20616e6420736561210a4920686164206d616e7920677265617420616476656e74757265732c20627574206e6f770a492073746179206865726520616e642074656163682073747564656e74732e0a5965732c204920656e6a6f79206d79206c696665206f662071756965742073747564792e0a49206861766520736f206d616e792073746f726965732079657420746f2074656c6c2e2e2e0003020d5965732c20796f752061726520737065616b696e6720746f2074686520776f726c642d0a66616d6f75732074726561737572652d68756e7465722002024c696272617269020021004b4f4249544f0f1f484f4e44414e410f1f303237004b4f4249544f0f1f484f4e44414e410f1f303238004b4f4249544f0f1f484f4e44414e410f1f303239004b4f4249544f0f1f484f4e44414e410f1f303330004b4f4249544f0f1f484f4e44414e410f1f303331004b4f4249544f0f1f484f4e44414e410f1f303332004b4f4249544f0f1f484f4e44414e410f1f3033330003020d576f686f686f686f21204f683f0a412076697369746f72206166746572206d616e79206c6f6e67207765656b73210a4576656e2002024a6f74617269020020686173206265656e206177617920736f206c6f6e672c0a492776652067726f776e20616c6d6f73742e2e2e6c6f6e656c792e0a2e2e2e42757420776861742069732069743f205768617420646f20796f75206e6565643f0a0a486d3f20596f752077616e7420746f2076697369742074686520020254656d706c65206f660a44726f706c65747302003f0a566572792077656c6c2e2e2e20596f75206172652074686520666972737420737563680a627261766520706572736f6e20696e2061206c6f6e67207768696c65210a5374616e64206f6e2074686520636c6f76657220696e2066726f6e74206f66206d65210003020d48726d6d3f0a57686174277320746869733f2057686174277320746869733f0a596f752077616e74206d6520746f2063757420746f2074686520636861736520616e640a74656c6c20796f752061626f75742074686520020254656d706c65206f662044726f706c65747302003f0003020d416c6c2072696768742c20616c6c2072696768742e20596f75206b69647320746f6461792e2e2e0a4e6f2070617469656e636520666f7220616e206f6c64206d616e2e0a57656c6c2c206a757374207374616e642072696768742074686572652c206c696b650a4920746f6c6420796f752100576f686f686f210a4e6f772e2e2e4f50454e2c20736563726574206d7973746572792070616e656c212100576f686f686f21205761736e277420746861742066756e3f0a4e6f77207468656e2e2e2e0a4974277320757020746f20796f7520746f20706173732074686973200203747269616c200200736166656c790a616e64207265636f766572207468652002016974656d200200796f7520726571756972652e0a4f682c20776861742066756e21204920646f20736f206c6f766520746865207265616c0a6e697474792d677269747479206f6620616476656e747572696e67210003020d57656c6c20646f6e652c20696e6465656421205768792c20796f7527726520616c6d6f73740a617320737072792061732049207761732061742074686174206167652100 - -ffffffffffffffffffffffa4000000a5000000bd000000f000000022010000520100007d0100009f010000c5010000dc010000f40100003602000065020000a0020000bd020000d6020000190300006003000078030000a6030000f1030000350400006a040000a6040000e80400003b0500004d0500005f050000710500008305000095050000a70500004106000093060000d4060000ca07000062080000cc080000150900004e0900006009000000 - -0301f7576861742061206e69636520736d656c6c2e2e2e000301fb49206c696b652074686f73652072656420686174732074686520466f72657374204d696e6973680a776561722e2e2e000301f849206c696b6520746865736520626c756520686174732074686520546f776e0a4d696e69736820776561722e2e2e000301fd546865200202466f72657374204d696e69736802000a6861766520636f6d6520666f7220612076697369742e000301ff49206b6e6577207468652063697479206c69666520776f756c64206265206578636974696e67210003020145766572796f6e65206865726520697320736f20726566696e65642e2e2e0003020249206765742068756e677279206a7573742066726f6d207468617420736d656c6c21000301fc492077616e74206120726564206861742e2e2e000301fc492077616e74206120626c7565206861742e2e2e000301ff4f7572207265756e696f6e207769746820746865200202466f72657374204d696e69736802002069730a7374696c6c20696e2066756c6c207377696e67210003020157652772652067657474696e67206d6f726520726566696e6564206a7573740a4245494e47206865726521000302014d6179626520492073686f756c64206a7573742073746179206865726520616e640a6e6576657220676f206261636b20686f6d652e2e2e0003020557686174206120776f6e64657266756c20736d656c6c2e2e2e000302035765206a757374206c6f76652062726561642e2e2e00030202536f6d6574696d6573204920736e65616b206f666620776974682061206c6974746c650a6e6962626c65206f66206c6566746f7665722062726561642e0f0b0003020054686520627265616420020257686561746f6e2002006d616b65732068617320676f740a746f20626520746865206265737420627265616420696e20487972756c6521000301fb49736e277420020250697461200200637574653f000301ff4576657279206f6e65206f66207468656972206272656164732069730a736f2064656c6963696f757321000301fe54686f73652074776f206e65776c797765647320617265206265696e67206d6f72650a6672657368207468616e20746869732066726573682d62616b6564206272656164210f0b000301fa497427732073756368206120746872696c6c20636f6d696e6720757020686572652066726f6d0a62656c6f772c206a757374206c696b65205053484f4f4f4f21000301fd466577657220616e642066657765722070656f706c652061726520636f6d696e670a746f206275792062726561642e2e2e000301fc492063616e27742062656c6965766520686f772064616e6765726f75730a6974277320676f7474656e2061726f756e6420686572652e2e2e000301fb4e6f77206d6f7265207468616e20657665722c20776520616c6c206e65656420746f206765740a736f6d6520676f6f642d6c75636b206272656164210f0b000301fe49206c696b6520656174696e67206c6566746f766572732c206275742049206a75737420776973680a627573696e657373207765726520676f696e672062657474657220666f72207468656d2e2e2e004b4f4249544f0f1f484152490f1f303235004b4f4249544f0f1f484152490f1f303236004b4f4249544f0f1f484152490f1f303237004b4f4249544f0f1f484152490f1f303238004b4f4249544f0f1f484152490f1f303239004b4f4249544f0f1f484152490f1f303330000301f8486d6d6d2120492073656521204f682c2074686174206d616b65732073656e7365210a2e2e2e48756d616e20626f6f6b732061726520736f20696e746572657374696e67210a416e6420746861742067757920020244722e204c6566740200206c6976696e6720646f776e2074686572650a68617320677265617420746173746520696e2072656164696e67206d6174657269616c21000301f949276d20616c6d6f737420646f6e652077697468207468697320626f6f6b2e20492073686f756c640a676f206e616220616e6f74686572206f662074686520646f63746f72277320626f6f6b732e000301fa4920776f756c64206c6f766520746f207265616420736f6d657468696e672061206c6974746c650a6d6f726520726f6d616e746963206e6578742e2e2e000301fb486f21204861212048657921210a0a506865772e2e2e20492077616e7420746f20020372657475726e207468697320626f6f6b2062790a64726f7070696e6720697420646f776e2062656c6f7702002e0a4974277320696d706f737369626c6520776974686f757420736f6d650a65787472612077656967687420686572652e2e2e0a427574206d792062726f7468657220697320736f20627573792077697468206120626f6f6b0a6f6620686973206f776e207468617420686520776f6e27742068656c70206d65206f7574210a4d6179626520492063616e20646f20697420696620492074727920616761696e2e2e2e000301fc49207468696e6b206d792062726f7468657220697320676f696e6720746f2066696e6973680a7468617420626f6f6b20686527732072656164696e6720736f6f6e2e0a49206265742049276c6c206861766520746f2072657475726e2074686174206f6e652c20746f6f2e0a4775657373204927642062657474657220707574206f6e2061206c6974746c652077656967687421000301fe4d792062726f74686572206c6f7665732072656164696e6720626f6f6b73210a0a416e642049206c6f76652070757368696e67206d792062726f74686572277320626f6f6b730a6f666620746865207261667465727320746f2072657475726e207468656d21000302014974277320612062697420647573747920757020686572652c206875683f0a4d6179626520492073686f756c6420646f2061206c6974746c6520636c65616e696e672e2e2e000302025468616e6b7320666f7220636c65616e696e67207570210a4e6f772c20616c6c2074686174206475737420697320676f6e65210f0b004b4f4249544f0f1f484152490f1f303339004b4f4249544f0f1f484152490f1f30343000 - -ffff5c0000006d0000007101000031020000d3020000200300008a030000ce0300009504000031050000d40500000206000044060000af06000084070000260800009a0800001d090000a7090000380a0000490a0000df0a0000120b0000 - -53484943594f0f1f5445490f1f303030004168657272726d20686572726d6d6d210a4920616d200202486167656e02002c206d61796f72206f662074686973206661697220746f776e210a4d61796f72732061726520757375616c6c79207665727920696d706f7274616e7420616e640a6275737920666f6c6b2c2049276c6c206861766520796f75206b6e6f772e2e2e0a4275742049207374696c6c2068617665206120686f6262792c206f6620636f75727365210a4920636f6c6c65637420756e757375616c206d61736b73210a49206a757374206c6f7665207468656d210a546865792772652062656175746966756c210a53696d706c79206d61676e69666963656e742c20492074656c6c20796f75210041686572726d210a0a5965732120546861742773206d652c200202486167656e02002e0a4920616d206d61796f72206f66207468697320746f776e2e0a57686174277320746861743f20596f752077616e74206120626f6f6b3f0a02014120486973746f7279206f66204d61736b7302003f0a416e6420796f7520736179204920636865636b6564206974206f75742c0a646f20796f753f205965732c20696e646565642049206469642e2e2e0a4f7220776169742e2e2e2044696420493f004168682c20796f75207365656d20746f206861766520666f756e642074686520626f6f6b2c0a7361666520616e6420736f756e6420616e6420696e2066696e65207368617065210a427574206f6e6c79206265636175736520796f75206c697374656e656420746f206d790a6d61736b73206c696b65206120676f6f64206c6974746c6520626f792c2072696768743f0a576172206861722068617220686172210049276d20676f696e6720746f206861766520746f207069636b20757020766f6c756d6520322e0a54686174206c61737420626f6f6b20776173206a7573742067657474696e6720676f6f6421000301fe54686520706572736f6e206c6976696e67206865726520697320746865206d61796f722c0a7665727920696d706f7274616e7420796f75206b6e6f772e0a446f65736e277420697420616c6c206a75737420736f756e6420736f2e2e2e6f6666696369616c3f000301f8546865206d61796f72206c696b657320737472616e6765206d61736b732e0a536f6d6574696d65732c206865206576656e206d616b657320686973206f776e2e000301fd546865206d61796f7220746f6f6b206f666620666f7220686973200202636162696e206279207468650a6c616b65020020636c75746368696e672061200201626f6f6b02002e205765207361772068696d20676f2e2e2e0a4275742061667465722074686520636865737420776173206f70656e65642c207468650a726f616420746f2002024d696e69736820576f6f647302002077617320626c6f636b65642e0a596f7520776f6e27742062652061626c6520746f20676574207468726f7567682e000301f65768656e207468652002026d61796f7220020063616d65206261636b2c206865206469646e27740a686176652074686174200201626f6f6b200200616e796d6f72652e0a49276d2073757265206865206a757374206c656674206974206174206869732002026c616b65736964650a636162696e02002e20486527732070726574747920666f7267657466756c206c696b6520746861742e000301fc596f752077616e7420746f20676f20746f2074686520636162696e0a627920746865206c616b653f0a57656c6c2c206c6574206d65206a757374206d61726b0a69742068657265206f6e20796f75722002016d617002002e0a4572722e2e2e20596573212054686572652e204974277320726967687420686572652e0a596f752073686f756c642062652061626c6520746f2066696e64206974206e6f772e000301fd536f20746865200201626f6f6b200200574153206174207468652002026c616b6502002c207468656e2e000301f941682c20627574204920646f206c6f7665206f757220616273656e746d696e6465640a6f6c64206d61796f722e204865277320612066696e65206d616e2e00596f75206b6e6f772c207468657365206d61736b73207365652065766572797468696e670a7468617420676f6573206f6e20696e206d792070726976617465206c6966652e0a4d6179626520796f752073686f756c64206a7573742061736b206d79206d61736b73210a0049207468696e6b20492776652066696e616c6c7920676f74206120676f6f642067726173700a6f6620686f77207468696e67732072756e20696e200202487972756c6502002e0a5468696e67732072756e20736f20736d6f6f74686c792061726f756e6420686572652c0a616e64204920686176656e2774206576656e20646f6e652061207468696e67210a4920776f6e64657220686f77206d75636820626574746572207468697320706c6163650a776f756c6420626520696620492061637475616c6c792064696420616e797468696e67210041686572726d2121205468617420686f6c6520696e207468652067617264656e206c656164730a746f2061207368656c746572206f6620736f7274732e0a4275742069742773206e6f74206c696b652049276d20747279696e6720746f2072756e206f66660a616e642073617665206d7973656c6620616c6f6e65206f7220616e797468696e67210a4a757374206b656570207468617420696e206d696e64210a0049276d207468696e6b696e67206f66207761797320746f20696e637265617365207468650a6c69627261727927732062756467657420746f20627579206d6f726520626f6f6b732e0a457370656369616c6c7920746865206f6e65732061626f7574206d61736b732c0a796f75206b6e6f772e0049206d6179206c6f6f6b20736f6d65776861742069646c6520746f20796f752c0a627574206e6f2c20736972210a492077696c6c20626520776f726b696e67207465727269666963616c6c7920686172642061730a736f6f6e20617320796f75206c656176652e0a596f752063616e20626574206f6e20746861742120486f686f2100546865736520617265207468652074696d65732074686174207265616c6c792074657374206d790a6d6574746c652061732061206d61796f722c20492074656c6c20796f752e0a487972756c65206973206d7920726573706f6e736962696c69747920746f20746865206c6173742e0a45766572796f6e6520746f20746865207368656c7465727321004d6f6e73746572732061726520636f6d696e67210a45766572796f6e65207374617920696e646f6f7273210a4f682c207468617420646f65736e2774206170706c7920746f20796f752c206d7920626f79210a596f7520676f206765742027656d2c200600210a596f75722073776f726420616e6420627261766572790a77696c6c20736176652074686520646179210053484943594f0f1f5445490f1f303139004920686f7065204920646f6e277420736f756e64206c696b652049276d206272616767696e672c0a62757420492068617665206120636162696e2061742002024c616b652048796c696102002e0a49742773206120676f7267656f7573206c6974746c6520706c616365207768657265204920676f0a746f20656e6a6f79206d7920686f6262792c206d61736b206d616b696e672e000301f954686174200202636162696e20627920746865206c616b6502002069730a7265616c6c79207175697465206661722e000301fd546865206d61796f7220776f756c646e2774206265206e6561726c7920736f0a636861726d696e6720696620686520776572656e277420736f2063617265667265652e00 - -ffffff400000004a000000c9000000300100003a01000044010000ce02000033030000c40400006f060000e70600002a070000c7080000ae090000d90900002c0a0000 - -4c4546540f1f303030005768617420697320616c6c206f662074686973213f0a49276d20627573792c20646f6e277420796f752073656520746861743f0a446f206e6f742064697374757262206d792072657365617263682120496620796f7520686176650a6e6f20627573696e6573732c206265676f6e652120596f75206865617264206d652100576861742c206875683f0a4120626f6f6b3f2046726f6d20746865206c6962726172793f0a41682c207965732e2e2e6f6620636f757273652e2049206b6e657720746869730a64617920776f756c6420636f6d652e20506c656173652c20636f6d6520696e2e004c4546540f1f303033004c4546540f1f303034004920616d20612072657365617263686572206f66205069636f7269206c6567656e640a616e64206c6f72652e204d79206e616d6520697320020344722e204c65667402002e0a596f7527726520686572652061626f7574207468617420626f6f6b2c0a02014c6567656e64206f6620746865205069636f726902002c206172656e277420796f753f0a57656c6c2c2049206861746520746f2073617920746869732c20627574204920686176656e27740a7365656e20697420696e207365766572616c20646179732e0a506572686170732061206d697363686965766f7573206c6974746c65206d6f7573650a6861732074616b656e2069743f0a57656c6c2c2049276d2073757265206974277320696e207468697320686f7573650a736f6d6577686572652e2049206a75737420646f6e2774206b6e6f772077686572652e0a4275742049276d20766572792062757379207269676874206e6f772c20736f207768790a646f6e277420796f75206a757374206c6f6f6b20666f7220697420796f757273656c663f004120626f6f6b2066656c6c2077697468206120225448554421222061206c6974746c650a7768696c652061676f2e0a49742067617665206d65207375636820612073686f636b20746861740a6d7920686561727420736b6970706564206120626561742100596f7520666f756e6420616e642072657475726e65642074686520626f6f6b20666f720a6d652c2064696420796f753f2049276d207665727920677261746566756c2e0a486572652c206c6574206d652074656c6c20796f7520736f6d657468696e670a696e746572657374696e67206173207468616e6b732e0a596f75207365652c20746865204d696e69736820646964206e6f7420616c77617973206c6976650a696e206f757220776f726c642e0a4e6f2c20746865792063616d65207468726f75676820612073656372657420706f7274616c0a6d616e7920616765732061676f2066726f6d20746865697220776f726c6420746f206f757273210a42757420646f6e27742074656c6c20616e796f6e6521204974277320612076616c7561626c650a626974206f66206b6e6f776c656467652074686174206f6e6c792049206b6e6f77210a416e64204920676c65616e6564206974206f6e6c7920616674657220686f757273206f660a73747564792066726f6d20616e20696e6372656469626c79206f6c6420626f6f6b2e00536f20796f7527766520636f6d6520746f2068656172206d6f72652061626f7574207468650a4d696e6973682c206861766520796f753f0a57656c6c2c20492063616e20706172742077697468206f6e65206d6f7265207469646269742c0a4920737570706f73652e2e2e20497420636f756c642062652075736566756c2e0a54686520706f7274616c206c696e6b696e6720757320746f20746865204d696e6973680a776f726c64206f70656e73206f6e6c79206f6e6365206576657279203130302079656172732e0a54686174206d65616e7320746865204d696e6973682068657265206e6f77206172650a64657363656e64616e7473206f662074686f73652077686f2063616d65206265666f72652e0a546861742773207269676874212054686f7365204d696e6973682063616d6520686572650a3130302079656172732061676f2c206f72206576656e206c6f6e6765722061676f210a4e6f7720746861742074686520706f7274616c206973206f70656e207468697320796561722c0a70657268617073206e6577204d696e6973682077696c6c20636f6d65207468726f7567682e2e2e00546865206d6f7265204920737475647920746865204d696e6973682c2074686520636c6f7365720a49206665656c20746f207468656d210a4974277320616c6d6f7374206173206966207468657920776572652072696768740a686572652077697468206d652c20616c6c207468652074696d652e2e2e0049206e65766572206c65617665206d7920686f7573652c20776865746865722074686572650a617265206d6f6e7374657273206f757473696465206f72206e6f7421004865792c20646f20796f75206b6e6f772074686520636c75657320746861742072657665616c0a746865206c6f636174696f6e206f66207468652074726561737572653f0a020343726f737320746865206272696467652074686174207370616e730a74686520726170696420666c6f772e2e2e0a5468726f75676820746865206c616e64206f660a7468652066656172736f6d652062656173742e2e2e0a556e74696c20796f752072656163680a746865206d697374792066616c6c732e2e2e0a54686520747265617375726520736c65657073206f6e20746865206f7468657220736964650a6f66207468652073656372657420656e7472616e63652074686572652e2e2e02000a546865792073617920697427732061206d61676963616c20746f6f6c207468617420616c6c6f77730a6576656e206c6974746c652070656f706c6520746f207075736820626967207468696e6773210a4163636f7264696e6720746f20746865206c6567656e642c20796f752772650a737570706f73656420746f2073746172742066726f6d207468697320686f75736521000301fb4168682e2e2e20576861742073686f756c64204920646f3f2053686f756c64204920737461790a6f7220676f3f204966204920676f2c20746865726520636f756c642062652e2e2e0a2e2e2e57686174277320746861743f0a0a596f7527766520616c726561647920666f756e642074686520020162726163656c6574200200746861740a6d616b6573206f6e65207374726f6e673f210a416868682c2049206b6e65772069742120492764206265656e207374756d706564206f6e0a7468617420666f7220736f206c6f6e67212049206b6e657720492764206c6f7365206f757421000301fc596f7527726520736f206272617665210a49207265616c6c792072657370656374207468617421000301fd4861766520796f75206265656e207573696e672074686520020162726163656c6574200200746861740a6d616b657320796f75207374726f6e673f204d75737420636f6d6520696e2068616e647921004f682c206c6f6f6b2120596f7527766520666f756e642069742120436f756c6420492061736b0a796f7520746f2072657475726e2074686174200201626f6f6b200200666f72206d652c206c61643f00 - -ffffffffd0000000d10000000f010000430100004b0100007b010000c801000001020000ed020000ad0300004504000090050000f5050000f6050000f70500004906000067060000cc06000080070000810700008c07000097070000ba0700000c080000200800002a0800007f080000b7080000e608000033090000b0090000030a0000470a0000880a0000d00a0000410b0000760b0000c00b00002b0c0000800c0000190d0000810d0000820d0000830d0000c10d0000f90d00000d0e00003a0e00007a0e0000c80e0000260f0000760f000000 - -4865792e0a5768617420646f20796f752077616e743f0a4d79207369737465722773206e6f7420686572652e0a5368652773206174207363686f6f6c2e00596f7520686176652061207765697264206861742e2057686572652063616e0a4920676574206f6e65206f662074686f73653f0041616161726621004d7920646f672773207265616c20736d6172742e0a416e642061206c6974746c652073706f696c65642c20746f6f2e0002024a756c696574746102002c2066726f6d206e65787420646f6f722c2077656e740a6261636b - -gUnk_089F85D6:: @ 089F85D6 -@ replacing .incbin "baserom.gba", 0x009f85d6, 0x9b4 -.data 20686f6d652e2e2e0a4275742049276c6c207365652068657220746f6d6f72726f77210f0b004d79207369737465722773206261636b206e6f772e0a4920677565737320736865277320737570706f73656420746f207374617920696e2e000300d141776f6f6f2120486f74212041776f6f210a02035468652066697265706c61636520697320746f6f20686f742102000a4d79206d617374657220776f6e277420636f6d6520686f6d652c202763757a20686527730a68656164206f766572206865656c7320666f7220746865206769726c206e65787420646f6f722e0a427574207768656e2068652070757473207468652066697265206f75742c207468656e0a736f6d6574696d6573206d69636520636f6d65206f75742e2e2e0a492068617465206d6963652c20736f20656974686572207761792c0a49276d206e6576657220686170707921000300d14974277320746f6f20686f7421204172662e2e2e0a02035468652066697265706c61636520697320746f6f20686f742e2e2e02000a4e6f7720746865726520617265206576656e206d6f72652070656f706c6520696e20686572652c0a616e6420697427732067657474696e6720746f6f20686f7420746f2062656172210a576861742077696c6c2069742074616b6520746f20636f6f6c207468697320706c6163650a646f776e213f2050616e742c2070616e742c2070616e7421000300d15468616e6b732c20617266210a596f7520707574206f75742074686520666972652e0a4275742049276d207374696c6c206d6966666564206174206d79206d6173746572210a0a492063616e27742062656c6965766520686f77206c6f6e672068652773206265656e0a68616e67696e67206f7574207769746820686973206769726c667269656e64210a417266212041726621004875683f2041200201626f6f6b20020066726f6d207468652002026c69627261727902003f0a0a02014120487972756c65616e20426573746961727902002c206973207468617420746865206f6e653f0a596561682c204920636865636b6564206974206f75742061207768696c652061676f2e0a596f752063616d6520616c6c20746869732077617920746f206765742069743f0a576f772120596f75277265206f6e6520646564696361746564206c696272617269616e210a4275742e2e2e204920646f6e2774206b6e6f7720686f7720746f2074656c6c20796f750a746869732c206275742069742773206261636b206174206d7920686f7573652e0a576f756c6420796f75206d696e6420676f696e6720746865726520746f206765742069743f0a49206a7573742063616e2774206c65617665207269676874206e6f772c207365652e2e2e00546865792073617920746865206b696e672773206265656e207765697264206c6174656c792e0a0a427574207468617420646f65736e2774207265616c6c79206861766520616e797468696e670a746f20646f2077697468206f7572206c6f76652e2e2e00000049276d2077726974696e672061206c6574746572207269676874206e6f772c20736f20490a646f6e2774206861766520616e792074696d6520746f20706c6179207769746820796f752e0a536f7272792e00596f752072657475726e6564206d7920626f6f6b3f0a5468616e6b732100546865792073617920746865206b696e672773206265656e207765697264206c6174656c792e0a0a427574207468617420646f65736e2774207265616c6c79206861766520616e797468696e670a746f20646f2077697468206f7572206c6f76652e2e2e00596f75206f7567687420746f206265206361726566756c207768656e20796f752772650a72756e6e696e672061726f756e642120596f7527726520617766756c6c792074696e79210a416e64206e6f7420616c6c20646f677320616e64206361747320617265206e6963652c0a6c696b65206d652e20576f6f66210a536f6d65206f66207468656d206d69676874206576656e2074616b6520612073776970650a617420796f752c206172662120526172662100004d494e4b410f1f303139004d494e4b410f1f303230004f682c2068656c6c6f2e0a4d792062726f746865722773206174207363686f6f6c2e0049276d2077726974696e672061206c6574746572207269676874206e6f772c20736f20490a646f6e2774206861766520616e792074696d6520746f20706c6179207769746820796f752e0a536f7272792e000300d24d656f7772792d6d656f777777212121000300d2537373737321004d792066616d696c7920697320616c6c207665727920636c6f73652e2053616d6520776974680a0202526f6d696f020027732066616d696c79206e65787420646f6f722c20746f6f2e0a48656520686565210f0b004d792062726f746865722773206261636b2e204e6f772c2068652773206e6f740a616c6c6f776564206f757420616e796d6f72652e2e2e0044656172204d6f6d2c0a476f6e6520746f204a756c6965747461277320686f7573652e204261636b20736f6f6e2e0003020249742773207265616c6c792064616e6765726f75732075702061686561642120596f750a63616e2774206a75737420636861726765207468726f756768207265636b6c6573736c7921000302024865792c20492776652068656172642061626f757420796f752e2e2e20536f20796f752772650a676f6e6e6120676f2061686561642c2061726520796f753f0a57656c6c2c206f6e7761726420746f20676c6f7279207468656e210a4a75737420646f6e277420646965206f75742074686572652c204f4b3f00030202596f75206d616465206974207468726f75676820746861742064656e206f66206576696c0a616e642063616d65206261636b20616c6976653f210a416d617a696e67212057686f6f212057686f6f21004920636f6d652066726f6d20612066617261776179206c616e642e20596f750a63616e2074656c6c206279206d7920636c6f7468696e672c2063616e277420796f753f005468697320706c6163652069736e277420736f20626164206f6e636520796f75206765740a7573656420746f2069742e2049206c696b6520697420686572652e00496e207468697320636f6f6c20636c696d6174652c206d7920636c6f74686573206172650a61206c6974746c65206f6e2074686520756e70726f7465637469766520736964652e0049276d207468696e6b696e672061626f75742063616c6c696e67206d792066616d696c790a6f76657220736f6f6e2e0a4c6976696e67207769746820796f75722066656574206f6e207468652067726f756e640a6973206e6f7420736f206261642c204927766520646563696465642e00536f20796f75277665206265656e20746f206d7920 - -gUnk_089F8F8A:: @ 089F8F8A -@ replacing .incbin "baserom.gba", 0x009f8f8a, 0x27f6 -.data 686f6d65746f776e3f0a497427732067726561742c2069736e27742069743f004d6f6e737465727320636f756c642061747461636b20617420616e792074696d652e0a4d6179626520492073686f756c646e27742063616c6c206d792066616d696c79206f7665722e000301ff49207265616c6c79206c696b65207468697320686f7573652e2054686973206973207468650a6265737420706c61636520696e20746869732077686f6c652068756d616e20746f776e210a492077616e7420746f2073746179206865726520666f72657665722e000301ff5468697320706c6163652069732067657474696e672061206c6974746c652072756e2d646f776e2e0a49276d207468696e6b696e672061626f75742072656275696c64696e672074686520706c6163652e000301ff57656c636f6d65210a0a54686973206973206d79206e657720686f757365212041682e2e2e20446f6e27740a796f75206a757374206c6f76652074686174206e65772d686f75736520736d656c6c3f0a416e64204920776173204a555354207468696e6b696e672061626f7574206275696c64696e670a61206e657720686f7573652c20736f207468697320697320677265617421000301ff496d6167696e65206d6f76696e672066726f6d2061206d75737479206f6c640a6d757368726f6f6d20746f206120666162756c6f757320686f757365206c696b652074686973210a49742773206c696b65206120647265616d20636f6d6520747275652100000057656c6c2c204920737570706f73652049276420626574746572206765742064696e6e65720a737461727465642120486d6d20686d20686d6d6d210f0b004f6f6f682c2073636172792e2e2e2057656c6c2c206173206c6f6e67206173206e6f7468696e670a656c73652068617070656e732e2e2e005768617427732061206d6f73732d737465723f004974277320736f20626f72696e67206e6f74206265696e670a61626c6520746f20676f206f7574736964652e0003020054686520626f7373206d69676874207365656d20726f7567682c2062757420686527730a61207265616c20736f6674792061742068656172742e2e2e0003020054686520626f73732069732061207265616c20726566696e65642066656c6c612c2072696768743f0a416e79626f64792077686174277320736d6172742063616e207365652064617421000302004920776f756c64206c696b6520746f2061707072656e7469636520746f2074686520626f73732c0a746f6f2c2062757420686520626172656c79206576656e206e6f7469636573206d652e2e2e0a4974277320736f207361642e00030200546865792063616c6c2068696d2050756e6368204d75746f68206265636175736520686527730a6c696b652061207265616c2070756e6368792066656c6c6120616e6420616c6c206461742e0003020054686520626f737320697320746865206e756d6265722d6f6e65206275696c64657220696e0a746f776e2e20596f75206e6565642061206275696c64696e672c20796f75207365652068696d2e00 - -ffffffffffffffffff980100003002000080020000cc020000ef02000054030000b70300008d040000a3040000000500002a050000ab050000fb0500001a060000350600006b06000092060000340700004f070000d00700001e08000071080000c10800000809000030090000b0090000ff0900001b0a0000410a0000810a0000a50a00001d0b0000780b0000ef0b0000400c0000680c0000a80c00001e0d0000630d0000930d0000c10d0000140e0000660e0000190f0000750f0000df0f0000071000002c10000052100000e6100000491100006c11000094110000f211000044120000ed1200006e130000d2130000031400001a14000056140000e31400003f15000053150000901500000616000024160000ba1600000e1700008e170000db1700006d180000ce180000e51800000f19000098190000c5190000001a0000841a0000fe1a0000451b0000461b0000c51b0000481c0000c51c0000211d0000b41d00004c1e00001f1f0000ae1f00009220000064210000dd2100002b2200009e22000055230000562300005723000058230000592300005a2300005b230000 - -576520646f206f7572206265737420746f206d616b6520746869732061206e6963652c0a636f7a7920706c6163652c2077686572652070656f706c652063616e2072656c61782e0a4d7920696465616c2063616665206973206120706c6163652077686572652065766572796f6e650a63616e206a757374206c657420697420616c6c2068616e67206f75742e2041682c20796561682e004d7920696465616c2063616665206973206120706c6163652077686572652065766572796f6e650a63616e206a757374206c657420697420616c6c2068616e67206f75742e2041682c20796561682e005765206865617220616c6c20736f727473206f6620696e746572657374696e6720676f737369700a696e20686572652e2053746f702062792066726f6d2074696d6520746f2074696d652e004d616b6520796f757273656c6620617420686f6d652e2e2e0a4865656865652e2e2e004920616d2061206c6169642d6261636b2c2065617379676f696e67206b696e640a6f66206775792e204e6f742061206361726520696e2074686520776f726c642e0a416e6420746861742773206a75737420746865207761792049206c696b65206974210048652077686f2063616e20656e6a6f792061206e69636520637570206f660a737465616d696e6720686f742074656120617420686973206c6569737572652e2e2e0a6973207472756c79206d6173746572206f6620686973206f776e2074696d652e004c6574206d652074656c6c20796f7520736f6d657468696e6720746861740a6d6967687420636f6d6520696e2068616e647920736f6d656461792e0a596f752063616e206d6f766520626f6f6b636173657320616e642073747566662e0a54727920746f2002037075736820616e642070756c6c20646966666572656e74207468696e677302002e2e2e0a416674657220616c6c2c20796f7527726520796f756e672120596f752073686f756c640a626520747279696e6720616c6c206b696e6473206f66206e6577207468696e677321204861210049276d206f6e6520736d61727420636f6f6b696521004368656572732120596161792120436865657273210a526169736520796f7572206d696c6b20666f72206120746f617374210a4920776f6e646572207768617420492073686f756c64206861766520666f720a64696e6e65722e2e2e004920776f6e646572207768617420492073686f756c64206861766520666f720a64696e6e65722e2e2e0045766572796f6e65277320736f2072656c6178656420686572652e0a546861742773206120676f6f64207468696e672e0a4d7920696465616c2063616665206973206120706c6163652077686572652065766572796f6e650a63616e206a757374206c657420697420616c6c2068616e67206f75742e2041682c20796561682e004d7920696465616c2063616665206973206120706c6163652077686572652065766572796f6e650a63616e206a757374206c657420697420616c6c2068616e67206f75742e2041682c20796561682e0057656c636f6f6f6f6f6f6d65210a4e69636520746f2073656520796f75210054616b652061206c6f6164206f66662e0a4865656865652e2e2e0054686973206973206d79207370656369616c2074696d652e2e2e0a0a4a757374206d6520616e64206d79206375707061206a6f652e0057656c6c2c204920646f6e27742061637475616c6c79206472696e6b20636f666665652e2e2e004974207365656d73207468652002026b696e6720020068617320636f6d6d616e64656420616c6c206f660a7468652067756172647320746f2073656172636820666f72206d6167696320706f7765722e0a466f6c6b732073617920746861742074686973202202016c6967687420666f7263650200222077696c6c0a6772616e7420616e7920776973682c20627574204920646f6e2774206275792069742e2e2e0049206b6e6f7720616c6c206b696e6473206f662073747566662e004368656572732120596161792120436865657273210a526169736520796f7572206d696c6c6b20666f72206120746f617374210a43616e2774207765206a7573742068617665207468652073616d65207468696e6720666f720a64696e6e657220746f6e69676874207468617420776520686164206c617374206e696768743f004920776f6e6465722069662077652063616e2774206a7573742068617665207468652073616d650a7468696e6720666f722064696e6e657220776520686164206c617374206e696768742e2e2e000301f854686973206361666520697320736f20627573792e20596f752063616e206865617220616c6c0a736f727473206f662073747566662066726f6d20616c6c207468652070656f706c6520686572652e000301f849742773206a75737420726967687420666f722070656f706c65206c696b652075732077686f0a746872697665206f6e2074686520687573746c6520616e6420627573746c652c206875683f000301f8497427732068617264206e6f7420746f206765742073746570706564206f6e207768656e0a74686572652061726520736f206d616e792070656f706c6520686572652e000301f8416e64206164756c74732063616e2774206576656e207365652075732c2072696768743f0045766572796f6e65277320736f2072656c6178656420686572652e0a546861742773206120676f6f64207468696e672e0a4d7920696465616c2063616665206973206120706c6163652077686572652065766572796f6e650a63616e2072656c61782c2072656c61782c20616e642072656c617820736f6d65206d6f72652e004d7920696465616c2063616665206973206120706c6163652077686572652065766572796f6e650a63616e2072656c61782c2072656c61782c20616e642072656c617820736f6d65206d6f72652e004865792074686572652c20737765657479210a57656c636f6d6521004a7573742073697420616e79776865726520796f75206c696b652c0a6865656865652e2e2e0054616c6b696e67206f6e6c7920746f206f6e6573656c662e2e2e0a0a697320616e20657865726369736520696e20656c6f7175656e742073696c656e63652e004920776f6e6465722069662074686174206d616b657320616e792073656e73652e2e2e005468652002026b696e6720020077617320616c7761797320737563682061206e696365206d616e2c0a627574206c6174656c792c2068652773206265656e207375636820612062727574652e2e2e0a4920776f6e64657220776861742068617070656e656420746f2068696d3f0a486f686f686f2e2e2e004d617962652061206d6f6e7374657220637261776c656420696e2068697320736b696e20616e640a6973207061726164696e672061726f756e6420617320746865207265616c2002026b696e670200210a486f686f686f686f21004368656572732120596161792120436865657273210a526169736520796f7572206d696c6b20666f72206120746f617374210a576f756c642074686579206576656e206e6f746963652069662049206d616465207468650a73616d65207468696e6720666f722064696e6e657220746f6e696768743f004920776f6e6465722e2e2e0a0a576f756c642074686579206576656e206e6f746963652069662049206d616465207468650a73616d65207468696e6720666f722064696e6e657220746f6e696768743f000301f857656c636f6d65206261636b2c20686f6e6579210a476f6f6420746f2073656520796121000301f8546865206f6c64206c61647920696e2066726f6e74206f66207468697320686f7573650a6472696e6b73206e6f7468696e6720627574206d696c6b2e0045766572796f6e65277320736f2072656c6178656420686572652e0a546861742773206120676f6f64207468696e672e0a4120706c61636520796f7520646f6e277420657665722077616e7420746f206c656176652e0a546861742773206d792069646561206f66206120676f6f6420636166652e004120706c61636520796f7520646f6e277420657665722077616e7420746f206c656176652e0a546861742773206d792069646561206f66206120676f6f6420636166652e0057656c636f6d65206261636b2c20796f75210a596f75277265206d79206661766f7269746520637573746f6d65722100536f20796f75277665206265656e20676f6f64206c6174656c793f0a476f6f6f6f642c206865656865652e2e2e00596f752063616e2074656c6c20616c6c206f6620796f757220646565706573740a7365637265747320746f20612077616c6c2e0a5468652077616c6c2077696c6c206e657665722074616c6b206261636b2e00427574204927766520666f756e6420696620796f752074616c6b20746f2027656d2072696768742c0a77616c6c732077696c6c206769766520757020616c6c20736f727473206f6620736563726574732100596f7527726520676f696e6720746f20746865200202526f79616c2056616c6c657902003f0a492068656172207468617420706c616365206973206861756e7465642e2e2e0a427574207468657265277320612073656372657420656e7472616e636520746861742077696c6c0a67657420796f752074686572652066726f6d200202487972756c65204669656c6402002e0a49206d65616e2c20746861742773207768617420492776652068656172642e005468617420706c616365206973206461726b206576656e20696e207468652064617974696d652e0a0a416e6420796f75206b6e6f7720686f772067686f737473206c6f76650a746865206461726b2120486f686f686f686f2e2e2e004368656572732120596161792120436865657273210a526169736520796f7572206d696c6b20666f72206120746f617374210a4865792c2049206b6e6f772e2e2e2057687920646f6e2774207765206a75737420686176650a6d696c6b20666f722064696e6e65723f005768792063616e2774207765206a75737420686176650a6d696c6b20666f722064696e6e65723f000301f84f682c206865792074686572652e2e2e0a476f6f6420746f2073656520796f752e000301f85765204d696e69736820616c6c2067657420616c6f6e6720766572792077656c6c2e0045766572796f6e65277320736f2072656c6178656420686572652e0a546861742773206120676f6f64207468696e672e0a4120706c61636520776865726520796f7527726520736f2066616d696c69617220746861740a796f7520646f6e2774206576656e206861766520746f206f726465722e0a546861742773206d792069646561206f66206120676f6f6420636166652e004120706c61636520776865726520796f7527726520736f2066616d696c69617220746861740a796f7520646f6e2774206576656e206861766520746f206f726465722e0a546861742773206d792069646561206f66206120676f6f6420636166652e00486f7764792c20686f6e2e0a476c616420746f2073656520796f7520616761696e2e004172656e277420796f75206c6f6f6b696e67206d616e6c79206e6f77210a4865656865652e2e2e0041637475616c6c792c2074686572652069732061205645525920474f4f4420726561736f6e0a492063616e6e6f74207374616e642e2e2e0a5768617420776f756c6420796f7520646f206966204920746f6c6420796f7520746861743f00576861742069732074727574683f0a0a5768656e20776520756e6465727374616e6420746869732c207468656e2077652077696c6c0a636f6e71756572206576656e2074696d6520697473656c662e2e2e00546865020220736f75726365206f662074686520666c6f7702003f2057656c6c2c207468617427730a656173792e20497427732074616c6b696e672061626f7574207761746572210a54686520776174657220666c6f77696e6720696e746f200202746f776e200200616e6420696e746f0a7468652002026c616b65200200616c6c20636f6d65732066726f6d207468652073616d6520706c6163652e0a486f686f686f682e2e2e00496620796f75277265206c6f6f6b696e6720666f7220746865200202736f75726365206f660a74686520666c6f7702002e2e2e0a57656c6c2c20796f75276420626574746572206d616b65207375726520796f752772650a77656c6c20657175697070656420697320616c6c2049276d20736179696e272120486f686f686f21004368656572732120596161792120436865657273210a526169736520796f7572206d696c6b20666f72206120746f617374210a4920776f6e6465722e2e2e646f207765206576656e206e65656420746f206561740a64696e6e657220617420616c6c3f004920776f6e6465722e2e2e646f207765206576656e206e65656420746f206561740a64696e6e657220617420616c6c3f000301f857656c636f6d652c2073756761722070696521000301f84974277320736f20636f6e76656e69656e7420746f206c69766520696e20612068756d616e0a686f7573652061732061204d696e6973682e0045766572796f6e65277320736f2072656c6178656420686572652e0a546861742773206120676f6f64207468696e672e0a4120706c61636520776865726520796f752063616e2072656c617820646573706974650a77686174277320676f696e67206f6e206f7574736964652e0a546861742773206d792069646561206f66206120676f6f6420636166652e004120706c61636520776865726520796f752063616e2072656c617820646573706974650a77686174277320676f696e67206f6e206f7574736964652e0a546861742773206d792069646561206f66206120676f6f6420636166652e00486565656579210a57656565656c636f6d652100596f75277265207475726e696e6720696e746f20612066696e65206c6974746c65206d616e2c0a6172656e277420796f7521204865656865652e2e2e0054686f756768204920616d206e6f6e64657363726970742c20796f75206e6f74696365206d650a616e642074616c6b20746f206d652e0a54686174206d616b6573206d6520746865207072697a652c20616e6420796f750a617265207468652077696e6e6572206f662074686174207072697a652100536f6d656461792c20796f752077696c6c20756e6465727374616e642e0049206865617220612067756172642077686f20776173206c6f6f6b696e6720666f72207468650a02016c6967687420666f726365200200676f74207468726f776e20696e207468652064756e67656f6e210a5768792c207468652002026b696e67200200697320686172646c7920776f72746879206f66206265696e670a63616c6c656420226e6f626c652220616e796d6f7265210042757420492073686f756c64206265206361726566756c2c206c6573742049206265206a61696c65640a6d7973656c66206a75737420666f7220637269746963697a696e67207468652002026b696e67020021004368656572732120596161792120436865657273210a526169736520796f7572206d696c6b20666f72206120746f617374210a49742773206e6f74206c696b652074686520776f726c6420776f756c6420636f6d6520746f20616e0a656e642069662049206469646e2774206d616b652064696e6e65722c2072696768743f0049742773206e6f74206c696b652074686520776f726c6420776f756c6420636f6d6520746f20616e0a656e642069662049206469646e2774206d616b652064696e6e65722c2072696768743f0045766572796f6e65277320736f2072656c6178656420686572652e0a546861742773206120676f6f64207468696e672e0a4120706c61636520776865726520796f7520636f756c642068617070696c79206c6574207468650a776f726c64206372756d626c652061726f756e6420796f752e0a546861742773206d792069646561206f66206120676f6f6420636166652e004120706c61636520776865726520796f7520636f756c642068617070696c79206c6574207468650a776f726c64206372756d626c652061726f756e6420796f752e0a546861742773206d792069646561206f66206120676f6f6420636166652e00486579207468657265210a446f696e272077656c6c3f00576527726520636f756e74696e67206f6e20796f752c20796f756e67206d616e210a486565686565210045766572797468696e672077697468206120626567696e6e696e670a616c736f2068617320616e20656e642e0a546f2070757420697420616e6f74686572207761792c20616c6c207468696e6773206d6f76650a746f7761726420746865697220656e642e2e2e0a4576656e2066726f6d20746865206d6f6d656e74207468657920626567696e2e0054686520656e64206973206e6561722e0a466f72206d652c2061732077656c6c20617320666f7220796f752e000202487972756c6520436173746c65020020697320636f766572656420696e206461726b6e6573732e0a546869732069732074686520656e642e0049206e6576657220696d6167696e656420736f6d657468696e67206c696b6520746869730a776f756c642068617070656e20696e206d79206c69666574696d652e0a4920776f6e646572206966207468652002025069636f726920020077696c6c2073686f772075700a616e642068656c70207573206f6e636520616761696e2e2e2e004368656572732120596161792120436865657273210a526169736520796f7572206d696c6b20666f72206120746f617374210a49206e65766572206b6e65772074686174206661696c696e6720746f206d616b650a64696e6e657220776f756c642068617665207375636820636f6e73657175656e636573210049206e65766572206b6e65772074686174206661696c696e6720746f206d616b650a64696e6e657220776f756c642068617665207375636820636f6e73657175656e6365732100004a7573742074727920667573696e672002034b696e73746f6e6520706965636573020020776974680a6c6f7473206f662070656f706c652e0a5468657265206172652061206c6f74206f662070656f706c65206f75742074686572650a6c6f6f6b696e6720666f7220736f6d656f6e6520746f206675736520776974682e00596f7527642062652073757270726973656420746f2066696e642077686f2d2d616e640a776861742d2d796f752063616e20020366757365204b696e73746f6e657320020077697468210a596561682c20796f7527766520676f742061206c6f74206f6620667573696e6720696e0a796f7572206675747572652c2070616c2e2e2e0049207265636f6d6d656e64207669736974696e67200203706c6163657320796f752776650a616c7265616479206265656e02002e0a596f75206d6179207468656e2062652061626c6520746f2066757365204b696e73746f6e650a70696563657320696e2074686f736520706c616365732c20796f75206b6e6f773f00596f752063616e20676574207370656369616c206974656d7320627920667573696e670a02034b696e73746f6e65207069656365730200210a446f6e2774206d697373206f7574206f6e20746865206f70706f7274756e697479210054686572652773206120020267726f7570206f66206c6f76656c7920796f756e67206c61646965730a02007669736974696e6720487972756c652e2e2e0a4d617962652049276c6c206765742061206368616e636520746f2074616c6b20746f207468656d0a69662049206f6666657220746f20667573652002034b696e73746f6e652070696563657302002e204865682e00492068656172207468657265277320612077616c6c20696e2002024d696e69736820576f6f647302000a7769746820612073706f7420666f7220612002034b696e73746f6e6520706965636502002e0a49276d207375726520796f752063616e2066696e64206f7468657220706c616365730a776865726520796f752063616e20706c616365204b696e73746f6e65207069656365732e00446f20796f75206b6e6f77206f6620746865200202476f726f6e204361766502003f204974277320610a74756e6e656c207468617420746865200202476f726f6e732002006172652064696767696e672e0a416e6420696620796f752063616e2067657420616c6c207468652077617920746f207468650a63617665277320656e6420616e6420706c61636520612002034b696e73746f6e6502002e2e2e0a57656c6c2c2077687920646f6e27742049206a757374206c657420796f75207472792069740a666f7220796f757273656c66210049206865617220796f752063616e20667573652002034b696e73746f6e652070696563657302000a776974682074686520020267686f7374200200696e20746865200202526f79616c20437279707402002e0a4f72206174206c6561737420736f204920686561722e2049276d20746f6f207363617265640a746f2066696e64206f757420666f7220737572652e00596f752063616e277420616c77617973206a757374206368617267652073747261696768740a616865616420746f206e657720706c6163657320696e206c6966652c20796f75206b6e6f772e0a596f75206e65656420746f20676f206261636b20746f20706c6163657320796f752776650a616c7265616479206265656e20616e64207265666c656374206f6e207468696e67732e0a57686f206b6e6f77733f2054686174207175696574207265666c656374696f6e206d61790a6769766520796f752061206368616e636520746f20020366757365204b696e73746f6e657302002100596f75206b6e6f772c20667573696e672002034b696e73746f6e652070696563657302002063616e0a67657420796f75206d6f7265207468616e206d65726520020152757065657302002e2e2e0a49742063616e2063616c6c206e65772070656f706c6520746f206120706c616365206f720a6576656e206368616e676520746865207761792074686520746f776e206c6f6f6b732e0a416e6420616c6c2074686f7365207468696e67732063616e206c6561640a746f2068617070696e6573732061732077656c6c2c2072696768743f0041726520796f7520656e6a6f79696e6720667573696e672002034b696e73746f6e650a70696563657302003f0a467573696e672063616e206272696e672068617070696e65737320746f20796f7520616e640a796f757220667573696e672062756464792120546861742773207768617420492073617921004920776f6e64657220776861742068617070656e7320696620796f75206675736520616c6c0a6f6620746865204b696e73746f6e6573206120706572736f6e20697320686f6c64696e672e2e2e000202487972756c6520436173746c650200206861732066616c6c656e20746f207468650a6461726b6e6573732e2e2e0a4920737570706f73652074686973206973206e6f2074696d6520746f20626520667573696e670a02034b696e73746f6e652070696563657302002c2069732069743f004e6f6e73656e736521204d61796265207765206e656564206974206e6f77206d6f72650a7468616e2065766572206265666f7265210a467573696e672002034b696e73746f6e652070696563657302002063616e206272696e670a70656f706c652068617070696e657373210a54686973206973207468652074727565206d6f7469766520666f7220667573696e672c206d790a667269656e6421204e6f74205275706565732c206275742068617070696e657373210000000000000000 - -ffffffffffffffffffffffffffffffff000d0000000000000000000000000000 - -gUnk_089FB780:: @ 089FB780 -@ replacing .incbin "baserom.gba", 0x009fb780, 0xf44 -.data 1004100468044e05ee05bf06680468046804680410046804680410044e0568046804680410041004100468041004680410041004b807c50705080e0810042a08680410041004100410044608100410041004100468049108100410041004df081004ff0810041004100410041004100407091e09680466091004050a390a430a710a10041004860aa90aa90ac60aea0a020b020b1004100410041004170b080b410b4d0b5f0b6b0b720b810b8b0b10041004910b1004100410041004100410041004100468046804100410041004990b1004cd0be10b1004020c1004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410044d0c5f0c10047f0c10041004100410041004100410041004860c10041004c60c10041004100410041004100410046804680410041004680410041004100410041004100410041004680410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004d30c100410041004dc0c100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004e10c1004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410044e05100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100410041004100468041004100468041004100410041004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040506000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001020300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040506000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010708090a0b0c0d0e0f00000010101010000000000000000000000000000000000000000000000000001111121310111213100000000000000000000000000000000000141415161718191a1b000000000000001c1c000000000000000000000000000000000000000000000000011d011e0000000000000000000000000000000000000000000000000101010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f20212223242526272800292a1f2b2c2d2e2f30310000000013101012131313101032333435363738393a3b133c19193d3d000000000000000000000000000000000000000013101012131313101032333435363738393a3b133c19193d3d00000000000000001011111011111011110000000000000010111110111110111100000000000000111010101010111100000000000000003e3e3f3e3e3e000000000000003e0015404001151515404001151501151501151512131312131312131301151501151501151501151501151511010101151501151501151515404015404015404001151501151511010141424241424241424243434444434341424241424241424243000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004245454142424142424641464142424046404642454541424241424242454541424241424200004700480049004a004b000000000000000000000000000000000000000000000000000000004c4040400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004d4e4e4d4d00000000004f50515252534f505152525300000000000017545556555457571754555655545757000000000000000000000000111001100111100110011110011001000000000000461558595959590115000000000000000000000000000000000000000000000000000040115a5b5b5b5b121000000000000000000000000000000000000000005c5d5d5e5f606162636464655c66626700000000000000000000000000000000000000006868696a6b6b6b6c6d6d6e000000000000000000000000001111111111111111110000000000000000000000001515151515151515151515000000000000000000000000000000000000000000000000000000000000006f6f6f0000000000000000001213131213131213130000000000000000001310101310101310100000001310101300000015404015404001151500000000000070717273747570000000101111100000131213124e4d4e4d00000000000000767778797a7b7c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000007d007e0000000000000000000000767f768076804e000000000000818281838184850000000000008687867c860042000000000000000000000000000000000000000000000000000000000000000000000000808080174d4e174d4e174d4e174d4e174d4e174d4e1288764e898a8b4d8c8d8e120000000000001213131213131213138f900000000000000015404640464015919291929111110111011115110000000000000000000000000000000000888e00000000000000000000000000000000000000000000000000000093930000000000000000000000000000000000000000000000000000000000000000000000868686868686868686868686861311101294000000004142004241000000000000000000000000000000000000000000000000000000420000ff0000000000f9000000e9000000ea0000fff8000007ec000007ee00000000fff60000fdf8000000f8000005ee000002ec000000f10000fcf5000001f0000002f300f7000000f8000000f5000000f6000003f9000000fa000003f0000000f10000fef3000001f4000004f1000005f50000ec0c0000fff9000001f90000faf50000f9f40000f8f30000f9f20000faf10000fbf20000fcf30000fbf40000f7ea0000f7ec0000fbf80000faf70000fbf50000faf4000004ee000005ef000006f0000006f1000006ee000000f6f8f900f7f9fa00f7f8fb00f508f900f607fa00f608fa00f6fbf800f7fcfa00f7fafa00f6f8f601f7000001f50000020200000203000000fb000000fd000000fe0000fffd0cfc00fd0cfc00ff000000fc0000000007fe000000ff0000f9fe000000fe0000f9fd02f6000000f3000000f20000fbf9ef00fcf9ef00fdf8ef00fdf7ef00fcf8ef0001f1000001f0000001ef000001f20000fdfb0000fefa0000f9f70000fcf6000000ec00f400eb00f301eb01f401ec00f401ed00f501edfff500edfff5ffec00f4ffeb00f300eb01f400ed00f5ffedfff500f8faf901f8f9f901f8f7f701f8f7f600f800fc00f900fd01f800fc00f000f800faf7fc00fbf7fe00fcf6fe00fbf6fc00fcf7fc00fbf6fb00ef000004f3000008f7000008fb000008ff000004ff000000030000edfd0000edfe000000ee000000f0000007f4000007f3000007f5000005f3000004f20000000200000001000000ec0000f6ff000005e8000003ec00000004000000e8000000ed0000fff50000fef50000fffa0000fffb0000f0ed000000f40000 - - - - diff --git a/include/entity.h b/include/entity.h index 0b76eaa5..bc27562f 100644 --- a/include/entity.h +++ b/include/entity.h @@ -47,8 +47,7 @@ typedef struct Entity { /* */ u8 draw : 2; // 1-2 /* */ u8 ss2 : 1; // 4 /* */ u8 ss3 : 1; // 8 - /* */ u8 bigShadow : 1; //0x10 - /* */ u8 giantShadow : 1; //0x20 + /* */ u8 shadow : 2; //0x10 /* */ u8 flipX : 1; //0x40 /* */ u8 flipY : 1; //0x80 /* */ } PACKED b; @@ -71,7 +70,7 @@ typedef struct Entity { /* */ u8 flipX : 2; //0x10 /* */ u8 flipY : 2; //0x40 /* */ } PACKED spriteOrientation; - /*0x1c*/ u8 filler[1]; + /*0x1c*/ u8 field_0x1c; /*0x1d*/ u8 field_0x1d; /*0x1e*/ u8 frameIndex; /*0x1f*/ u8 lastFrameIndex; diff --git a/include/functions.h b/include/functions.h index dcfcf70d..abfcfe17 100644 --- a/include/functions.h +++ b/include/functions.h @@ -5,7 +5,7 @@ #include "global.h" #include "entity.h" #include "position.h" -#include "link.h" +#include "player.h" #include "structures.h" // Identified - to be sorted into header files @@ -41,6 +41,7 @@ extern void CopyPositionAndSpriteOffset(Entity*, Entity*); extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32); extern u32 LoadFixedGFX(Entity*, u32); extern void ExecuteScriptCommandSet(Entity*, void *); +extern void _DmaFill32(u32, void*, u32); // Unidentified extern void sub_0806ED78(Entity*); @@ -192,12 +193,12 @@ extern void sub_080A70AC(void*); extern void sub_080A7114(u32); extern void sub_08001242(void); extern u32 sub_08003FC4(Entity*, u32); -extern u8 sub_080043E8(Entity*); +extern u32 sub_080043E8(Entity*); extern void sub_08001290(Entity*, u32); extern void sub_08004488(u32); extern void sub_08004596(Entity*, u32); extern u32 sub_0807953C(void); -extern void ResetLink(void); +extern void ResetPlayer(void); extern void sub_080A29BC(Entity*); extern void sub_080AE068(Entity*); extern Entity* sub_0805E8D4(void); @@ -228,4 +229,6 @@ extern u32 sub_0806F3E4(Entity*); extern void sub_0804A7D4(Entity*); extern void sub_08033744(Entity*); extern void sub_0800417E(Entity*, u32); +extern void sub_080784C8(); +extern void sub_08017640(); #endif \ No newline at end of file diff --git a/include/greatFairy.h b/include/greatFairy.h index 1a65fd1c..3ceb31b2 100644 --- a/include/greatFairy.h +++ b/include/greatFairy.h @@ -35,7 +35,7 @@ extern void (*const gUnk_081207A4[])(Entity*); extern u32 gUnk_0810C2E4; extern RoomControls gRoomControls; -extern Entity gLinkEntity; +extern Entity gPlayerEntity; extern const s16 GreatFairy_RippleOffsets[10]; extern u32 gUnk_02034350; extern RoomVars gRoomVars; diff --git a/include/item.h b/include/item.h index d276b5fa..7546d84f 100644 --- a/include/item.h +++ b/include/item.h @@ -3,7 +3,7 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" void extern DebugItem(ItemBehavior*, u32); void extern Sword(ItemBehavior*, u32); diff --git a/include/npc.h b/include/npc.h index 103df393..4551b756 100644 --- a/include/npc.h +++ b/include/npc.h @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #ifndef NPC_H #define NPC_H diff --git a/include/object.h b/include/object.h index b24a30d2..5a2e66cb 100644 --- a/include/object.h +++ b/include/object.h @@ -64,7 +64,7 @@ extern void JarPortal(Entity*); extern void BossDoor(Entity*); extern void Object3A(Entity*); extern void MacroMushromStalks(Entity*); -extern void MacroLink(Entity*); +extern void MacroPlayer(Entity*); extern void Object3D(Entity*); extern void Object3E(Entity*); extern void GiantLeaf(Entity*); diff --git a/include/link.h b/include/player.h similarity index 90% rename from include/link.h rename to include/player.h index 5a7a73a2..75c0b6c7 100644 --- a/include/link.h +++ b/include/player.h @@ -1,7 +1,7 @@ // clang-format off -#ifndef LINK_H -#define LINK_H +#ifndef PLAYER_H +#define PLAYER_H #include "global.h" #include "entity.h" @@ -16,7 +16,7 @@ typedef struct { /*0x08*/ u16 field_0x8; /*0x0a*/ u8 field_0xa; /*0x0b*/ u8 keepFacing; - /*0x0c*/ u8 linkAction; + /*0x0c*/ u8 playerAction; /*0x0d*/ u8 field_0xd[2]; /*0x0f*/ u8 hurtBlinkSpeed; /*0x10*/ u8 field_0x10[4]; @@ -35,7 +35,9 @@ typedef struct { /* */ u32 noMinishCap : 1; /* */ u32 pullingState : 1; /* */ u32 windyState : 1; - /* */ u32 filler10 : 4; + /* */ u32 filler6 : 1; + /* */ u32 unk7 : 1; + /* */ u32 filler8 : 2; /* */ u32 slipperyState : 1; /* */ u32 filler11 : 5; /* */ u32 filler11b : 16; @@ -56,7 +58,7 @@ typedef struct { /*0xa8*/ u8 field_0xa8[3]; /*0xab*/ u8 field_0xab; /*0xac*/ u32 field_0xac; -} LinkState; +} PlayerState; typedef struct { @@ -94,9 +96,9 @@ typedef struct { extern u8 gBombBagSizes[]; -extern LinkState gLinkState; +extern PlayerState gPlayerState; extern Stats gStats; -extern Entity gLinkEntity; +extern Entity gPlayerEntity; extern u32 GetInventoryValue(u32); diff --git a/include/structures.h b/include/structures.h index f3ca87d5..e44f6f76 100644 --- a/include/structures.h +++ b/include/structures.h @@ -3,7 +3,7 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" typedef struct { char header[4]; @@ -62,7 +62,8 @@ typedef struct { u8 playerState; u8 field_0xf; Coords playerStartPos; - u16 playerLayer; + u8 playerLayer; + u8 field_0x13; u8 field_0x14[0xa]; u16 field_0x20; u16 field_0x22; diff --git a/linker.ld b/linker.ld index 73f3db54..389a78d7 100644 --- a/linker.ld +++ b/linker.ld @@ -180,7 +180,7 @@ SECTIONS { . = 0x000010EC; gUnk_030010EC = .; . = 0x0000110C; gUnk_0300110C = .; . = 0x00001150; gRand = .; - . = 0x00001160; gLinkEntity = .; + . = 0x00001160; gPlayerEntity = .; . = 0x00001198; gUnk_03001198 = .; . = 0x000011E8; gUnk_030011E8 = .; . = 0x000015A0; gUnk_030015A0 = .; @@ -201,7 +201,7 @@ SECTIONS { . = 0x00003DE4; gUnk_03003DE4 = .; . = 0x00003DF0; gUnk_03003DF0 = .; . = 0x00003DF8; gUnk_03003DF8 = .; - . = 0x00003F80; gLinkState = .; + . = 0x00003F80; gPlayerState = .; . = 0x00003FC0; gUnk_03003FC0 = .; . = 0x00004010; gUnk_03004010 = .; . = 0x00004020; gUnk_03004020 = .; @@ -448,9 +448,7 @@ SECTIONS { src/sub_08050024.o(.text); asm/code_08050038.o(.text); asm/sub_08052418.o(.text); - asm/initializeLink.o(.text); - src/sub_08052620.o(.text); - src/sub_08052638.o(.text); + src/initializePlayer.o(.text); src/area.o(.text); src/modHealth.o(.text); src/modRupees.o(.text); @@ -647,7 +645,7 @@ SECTIONS { asm/ocarina.o(.text); src/item.o(.text); asm/code_08076C80.o(.text); - asm/respawnLink.o(.text); + asm/respawnPlayer.o(.text); src/code_08077B98.o(.text); src/code_08077DF4.o(.text); asm/code_08077B98.o(.text); @@ -673,6 +671,7 @@ SECTIONS { asm/itemForSale.o(.text); asm/button.o(.text); asm/object4.o(.text); + src/object/pot.o(.text); asm/pot.o(.text); asm/object6.o(.text); asm/blockPushed.o(.text); @@ -734,7 +733,7 @@ SECTIONS { asm/object75.o(.text); /* 75 and 76 are mislocated in base game */ asm/object76.o(.text); asm/code_0808C964.o(.text); - asm/macroLink.o(.text); + asm/macroPlayer.o(.text); asm/object3D.o(.text); asm/object3E.o(.text); src/object/giantLeaf.o(.text); diff --git a/src/area.c b/src/area.c index 4616248c..92a7ed24 100644 --- a/src/area.c +++ b/src/area.c @@ -1,6 +1,17 @@ #include "global.h" +#include "entity.h" extern u8 gArea; +extern u8 gUnk_08127D30[]; + +bool32 sub_08052620(u32 r0) { + return gArea == 0x81; +} + +bool32 sub_08052638(u32 r0) { + + return gUnk_08127D30[r0 * 4] == 0x81; +} u32 sub_08052654() { return (gArea >> 7) & 1; diff --git a/src/code_0805436C.c b/src/code_0805436C.c index cc81546c..8ada4bd5 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "room.h" #include "menu.h" diff --git a/src/code_08077B98.c b/src/code_08077B98.c index a29e2c22..cf2b3b2c 100644 --- a/src/code_08077B98.c +++ b/src/code_08077B98.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "functions.h" @@ -23,8 +23,8 @@ extern struct_0811BE48 gUnk_0811BE48[]; void sub_08077B98(UnkItemStruct* unk) { - if ((gLinkState.field_0x2c == NULL) || (gLinkState.field_0x2c[9] != 1)) { - gLinkState.field_0x2c = sub_08077C54(unk); + if ((gPlayerState.field_0x2c == NULL) || (gPlayerState.field_0x2c[9] != 1)) { + gPlayerState.field_0x2c = sub_08077C54(unk); } } @@ -34,7 +34,7 @@ void sub_08077BB8(UnkItemStruct* unk) if (temp != NULL) { temp[0x10] = 0x20; } - gLinkState.field_0x2c = temp; + gPlayerState.field_0x2c = temp; } Entity* sub_08077BD4(ItemBehavior *beh) diff --git a/src/code_08077DF4.c b/src/code_08077DF4.c index 0b849819..1f6d9246 100644 --- a/src/code_08077DF4.c +++ b/src/code_08077DF4.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "functions.h" typedef struct { @@ -18,29 +18,29 @@ void sub_08077DF4(Entity *ent, u32 arg1) if ((arg1 & 0xff) > 0xb8) { arg1 += (ent->entityType).form >> 1; } - gLinkEntity.spriteIndex = (short)(arg1 >> 8); - InitAnimationForceUpdate(&gLinkEntity, (u8)arg1); + gPlayerEntity.spriteIndex = (short)(arg1 >> 8); + InitAnimationForceUpdate(&gPlayerEntity, (u8)arg1); sub_08077E54(ent); } void UpdateItemAnim(Entity *ent) { - UpdateAnimationSingleFrame(&gLinkEntity); + UpdateAnimationSingleFrame(&gPlayerEntity); sub_08077E54(ent); } void sub_08077E3C(Entity *ent) { - sub_080042BA(&gLinkEntity); + sub_080042BA(&gPlayerEntity); sub_08077E54(ent); } void sub_08077E54(Entity *ent) { - ent->action = gLinkEntity.animIndex; - *(u8 *)&ent->spriteIndex = gLinkEntity.frameIndex; - ent->previousActionFlag = gLinkEntity.frameDuration; - ent->actionDelay = gLinkEntity.frames.all; + ent->action = gPlayerEntity.animIndex; + *(u8 *)&ent->spriteIndex = gPlayerEntity.frameIndex; + ent->previousActionFlag = gPlayerEntity.frameDuration; + ent->actionDelay = gPlayerEntity.frames.all; } void sub_08077E78(void* arg0, u32 bits) @@ -49,27 +49,27 @@ void sub_08077E78(void* arg0, u32 bits) u32 not; if (bits == 0) { - if (gLinkState.field_0x2c != NULL) { - ((Unk_bitfield *)gLinkState.field_0x2c)[0x11].b0 = 6; - gLinkState.field_0x2c = (u8 *)bits; + if (gPlayerState.field_0x2c != NULL) { + ((Unk_bitfield *)gPlayerState.field_0x2c)[0x11].b0 = 6; + gPlayerState.field_0x2c = (u8 *)bits; } else { - gLinkState.field_0x2c = (u8 *)bits; + gPlayerState.field_0x2c = (u8 *)bits; } } not = (8 >> bits); - gLinkState.field_0x3[1] &= ~((u8)((8 >> bits) << 4) | not); + gPlayerState.field_0x3[1] &= ~((u8)((8 >> bits) << 4) | not); not = ~not; - gLinkState.field_0xa &= not; - gLinkState.keepFacing &= not; + gPlayerState.field_0xa &= not; + gPlayerState.keepFacing &= not; _DmaZero(arg0, 0x1c); } u32 sub_08077EC8(Unk_struct* arg0) { - if ((gLinkState.field_0x1a[1] & 8) != 0) { + if ((gPlayerState.field_0x1a[1] & 8) != 0) { sub_08077DF4((Entity *)arg0,0x170); arg0->unk[7] = 0x28; arg0->unk[4] = 7; @@ -83,12 +83,12 @@ u32 sub_08077EC8(Unk_struct* arg0) void sub_08077EFC(ItemBehavior* arg0) { - sub_08077F24(arg0, (u16)gLinkState.field_0x90.HALF.LO); + sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.LO); } void sub_08077F10(ItemBehavior* arg0) { - sub_08077F24(arg0, (u16)gLinkState.field_0x90.HALF.HI); + sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.HI); } NAKED @@ -105,7 +105,7 @@ void sub_08077F50(ItemBehavior *beh, u32 arg1) u32 sub_08077F64(ItemBehavior* arg0, u32 unk) { u32 temp; - if (gLinkState.heldObject == 0) { + if (gPlayerState.heldObject == 0) { sub_08077F50(arg0, unk); temp = 0; } @@ -119,15 +119,15 @@ void sub_08077F84(void) { Entity *obj; - if (((gLinkEntity.collisionLayer & 2) == 0) && - GetTileTypeByPos(gLinkEntity.x.HALF.HI, gLinkEntity.y.HALF.HI - 0xc, 2) - 0x343U < 4) { - sub_0807AA80(&gLinkEntity); - gLinkState.jumpStatus |= 8; + if (((gPlayerEntity.collisionLayer & 2) == 0) && + GetTileTypeByPos(gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI - 0xc, 2) - 0x343U < 4) { + sub_0807AA80(&gPlayerEntity); + gPlayerState.jumpStatus |= 8; obj = CreateObject(0x44, 0, 0); if (obj != NULL) { - obj->x = gLinkEntity.x; - obj->y.HALF.HI = gLinkEntity.y.HALF.HI - 0xc; - gLinkEntity.y.HALF.HI -= 0xc; + obj->x = gPlayerEntity.x; + obj->y.HALF.HI = gPlayerEntity.y.HALF.HI - 0xc; + gPlayerEntity.y.HALF.HI -= 0xc; } } } diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 1dc3d30f..90ae7830 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "functions.h" -#include "link.h" +#include "player.h" extern s32 sub_080012DC(Entity*); extern u32 GetNextFunction(Entity*); @@ -57,7 +57,7 @@ void sub_0802A8C8(Entity* this) void sub_0802A8E0(Entity *this) { this->previousActionFlag = 1; - this->filler[1] = 0x3c; + this->field_0x1d = 0x3c; } void sub_0802A8EC(Entity *this) @@ -72,8 +72,8 @@ void sub_0802A8F4(Entity *this) void sub_0802A8FC(Entity *this) { - if ((gLinkState.field_0x1c & 0xf) == 0) { - this->currentHealth = gLinkState.field_0x1c & 0xf; + if ((gPlayerState.field_0x1c & 0xf) == 0) { + this->currentHealth = gPlayerState.field_0x1c & 0xf; } } diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index 7c960ac7..b30c65df 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -115,26 +115,22 @@ void sub_080324FC(Entity* this) { } } -#if NON_MATCHING // r4-r5 register swap void sub_08032574(Entity* this) { - if (this->attachedEntity == NULL || !(this->attachedEntity->bitfield & 0x80)) { - (this->field_0x76)--; - if ((this->field_0x76 == 0) || (sub_080AEFE0(this) == 0)) { - sub_0803275C(this); - } else { - UpdateAnimationSingleFrame(this); - if (!(this->field_0x76 & 0x7)) { - sub_08032794(this); - } - } + if (this->attachedEntity && (this->attachedEntity->bitfield & 0x80)) { + sub_0803275C(this); + return; + } + + if (--this->field_0x76 == 0 || !sub_080AEFE0(this)) { + sub_0803275C(this); + return; + } + + UpdateAnimationSingleFrame(this); + if ((this->field_0x76 & 0x7) == 0) { + sub_08032794(this); } } -#else -NAKED -void sub_08032574(Entity* this) { - asm(".include \"asm/non_matching/keaton/sub_08032574.inc\""); -} -#endif void sub_080325C4(Entity* this) { this->actionDelay--; diff --git a/src/enemy/keese.c b/src/enemy/keese.c index ea25214b..980237ef 100644 --- a/src/enemy/keese.c +++ b/src/enemy/keese.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "enemy.h" -#include "link.h" +#include "player.h" extern void sub_0804AA30(Entity*, void *); extern u32 sub_0806F520(Entity*); @@ -73,7 +73,7 @@ void sub_08021DF0(Entity *this) this->height.HALF.HI = -0x10; } this->direction = Random() & 0x1f; - this->filler[0] = 1; + this->field_0x1c = 1; this->spritePriority.b0 = 3; this->collisionLayer = 3; UpdateSpriteForCollisionLayer(this); @@ -113,7 +113,7 @@ void sub_08021EBC(Entity *this) this->actionDelay--; } else { - iVar1 = sub_0806FCB8(this, gLinkEntity.x.HALF.HI, gLinkEntity.y.HALF.HI, 0x70); + iVar1 = sub_0806FCB8(this, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, 0x70); if (iVar1 != 0) { sub_08021EF0(this); } @@ -139,7 +139,7 @@ void sub_08021F24(Entity *this) this->actionDelay = gUnk_080CB6F6[Random() & 0xf]; InitializeAnimation(this, 1); } - else if (!this->field_0x7a && !(sub_0806FCB8(this, gLinkEntity.x.HALF.HI, gLinkEntity.y.HALF.HI, 0x70))) { + else if (!this->field_0x7a && !(sub_0806FCB8(this, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, 0x70))) { this->action = 3; this->actionDelay = 0x1e; InitializeAnimation(this, 1); diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c index 94dbd2f4..a6d32f1c 100644 --- a/src/enemy/lakitu.c +++ b/src/enemy/lakitu.c @@ -3,7 +3,7 @@ #include "functions.h" #include "trig.h" #include "random.h" -#include "link.h" +#include "player.h" // Lakitu extern void EnemyFunctionHandler(Entity *, void (*const funcs[])(Entity*)); @@ -268,8 +268,8 @@ void sub_0803CA0C(Entity *this) { } bool32 sub_0803CA4C(Entity *this) { - if (sub_0806FCB8(this, gLinkEntity.x.HALF.HI, gLinkEntity.y.HALF.HI, 0x28) == 0) { - if (sub_080041A0(this, &gLinkEntity, 0x70, 0x50)) { + if (sub_0806FCB8(this, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, 0x28) == 0) { + if (sub_080041A0(this, &gPlayerEntity, 0x70, 0x50)) { return 1; } } @@ -278,7 +278,7 @@ bool32 sub_0803CA4C(Entity *this) { } void sub_0803CA84(Entity *this, u32 unkParameter) { - u32 altAnimState = GetFacingDirection(this, &gLinkEntity); + u32 altAnimState = GetFacingDirection(this, &gPlayerEntity); if (((altAnimState - 3) & 7) > 2 || ((this->animationState - (altAnimState >> 3)) & 3) > 1) { u32 intermediate = (altAnimState + 4) & 0x18; @@ -324,7 +324,7 @@ void sub_0803CB34(Entity *this) { this->action = 5; this->damageType = 0xa6; - this->field_0x78.HALF.LO = GetFacingDirection(this, &gLinkEntity); + this->field_0x78.HALF.LO = GetFacingDirection(this, &gPlayerEntity); InitAnimationForceUpdate(this, this->animationState + 8); } diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c index 0dca3465..241c8f68 100644 --- a/src/enemy/lakituCloud.c +++ b/src/enemy/lakituCloud.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" extern u32 GetNextFunction(Entity *); @@ -60,7 +60,7 @@ void sub_0803CD40(Entity *this) { ModHealth(-2); - sub_0800449C(&gLinkEntity, 122); + sub_0800449C(&gPlayerEntity, 122); sub_08079D84(); sub_0803CE3C(this); diff --git a/src/enemy/leever.c b/src/enemy/leever.c index baefa4fd..93db5f00 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -22,115 +22,100 @@ extern Entity* gUnk_020000B0; extern u8 gUnk_080CA4C8[]; extern u16 gUnk_080CA4CA[]; extern s16 gSineTable[]; -void Leever(Entity *this) -{ - EnemyFunctionHandler(this, gUnk_080CA49C); - SetChildOffset(this, 0, 1, -0x10); +void Leever(Entity* this) { + EnemyFunctionHandler(this, gUnk_080CA49C); + SetChildOffset(this, 0, 1, -0x10); } -void sub_0801FC28(Entity *this) -{ - gUnk_080CA4B4[this->action](this); +void sub_0801FC28(Entity* this) { + gUnk_080CA4B4[this->action](this); } -void sub_0801FC40(Entity *this) -{ - if (this->bitfield == 0x80) { - if (this->action == 3) { - this->field_0x74 = 1; +void sub_0801FC40(Entity* this) { + if (this->bitfield == 0x80) { + if (this->action == 3) { + this->field_0x74 = 1; + } + } else { + if (this->field_0x43 != 0) { + sub_0804A9FC(this, 0x1c); + } } - } - else { - if (this->field_0x43 != 0) { - sub_0804A9FC(this, 0x1c); - } - } - sub_0804AA30(this, gUnk_080CA49C); + sub_0804AA30(this, gUnk_080CA49C); } -void sub_0801FC7C(Entity *this) -{ - if ((this->entityType).form == 0) { - sub_0804A7D4(this); - } - else { - CreateDeathFx(this, 0xf1, 0); - } -} - -void sub_0801FC9C(Entity *this) -{ - sub_0804A720(this); - this->action = 1; - this->actionDelay = Random(); -} - -void sub_0801FCB0(Entity *this) -{ - if (--this->actionDelay == 0) { - if (sub_0801FE68(this, Random() & 0x1f) != 0) { - this->action = 2; - this->spriteSettings.b.draw = TRUE; - this->direction = (GetFacingDirection(this, gUnk_020000B0) + gUnk_080CA4C8[Random() & 1]) & 0x1f; - InitializeAnimation(this, 0); - UpdateSpriteForCollisionLayer(this); - } - else { - this->actionDelay = (Random() & 0x18) + 8; - } - } -} - -void sub_0801FD2C(Entity *this) -{ - - GetNextFrame(this); - - if (this->frames.b.f3 != 0) { - this->action = 3; - if (this->entityType.form == 0) { - this->field_0x74 = 0xb4; - } - else { - this->field_0x74 = 0x6e; - } - InitializeAnimation(this,2); - } - else if (this->frames.b.f0 != 0) { - this->frames.all &= 0xfe; - this->flags |= 0x80; +void sub_0801FC7C(Entity* this) { + if ((this->entityType).form == 0) { + sub_0804A7D4(this); + } else { + CreateDeathFx(this, 0xf1, 0); } } -void sub_0801FD80(Entity *this) -{ - - sub_0801FED4(this); - GetNextFrame(this); - - if (--this->field_0x74 == 0) { - this->action = 4; - this->flags &= 0x7f; - InitializeAnimation(this, 1); - } -} - -void sub_0801FDB4(Entity *this) -{ - sub_0801FED4(this); - GetNextFrame(this); - if ((this->frames.b.f3) != 0) { +void sub_0801FC9C(Entity* this) { + sub_0804A720(this); this->action = 1; - this->actionDelay = 0xf0; - this->spriteSettings.b.draw = FALSE; - } + this->actionDelay = Random(); } -u32 sub_0801FDE4(Entity *ent, s32 x, s32 y) -{ +void sub_0801FCB0(Entity* this) { + if (--this->actionDelay == 0) { + if (sub_0801FE68(this, Random() & 0x1f) != 0) { + this->action = 2; + this->spriteSettings.b.draw = TRUE; + this->direction = (GetFacingDirection(this, gUnk_020000B0) + gUnk_080CA4C8[Random() & 1]) & 0x1f; + InitializeAnimation(this, 0); + UpdateSpriteForCollisionLayer(this); + } else { + this->actionDelay = (Random() & 0x18) + 8; + } + } +} + +void sub_0801FD2C(Entity* this) { + + GetNextFrame(this); + + if (this->frames.b.f3 != 0) { + this->action = 3; + if (this->entityType.form == 0) { + this->field_0x74 = 0xb4; + } else { + this->field_0x74 = 0x6e; + } + InitializeAnimation(this, 2); + } else if (this->frames.b.f0 != 0) { + this->frames.all &= 0xfe; + this->flags |= 0x80; + } +} + +void sub_0801FD80(Entity* this) { + + sub_0801FED4(this); + GetNextFrame(this); + + if (--this->field_0x74 == 0) { + this->action = 4; + this->flags &= 0x7f; + InitializeAnimation(this, 1); + } +} + +void sub_0801FDB4(Entity* this) { + sub_0801FED4(this); + GetNextFrame(this); + if ((this->frames.b.f3) != 0) { + this->action = 1; + this->actionDelay = 0xf0; + this->spriteSettings.b.draw = FALSE; + } +} + +u32 sub_0801FDE4(Entity* ent, s32 x, s32 y) { u32 uVar3; - u16 *puVar4; - + u16* puVar4; + if (sub_080002D4(x, y, gUnk_020000B0->collisionLayer) != 0) { return 0; } else { @@ -147,60 +132,48 @@ u32 sub_0801FDE4(Entity *ent, s32 x, s32 y) } } -bool32 sub_0801FE68(Entity *ent, s32 arg2) -{ - s32 sin, cos; - s32 x, y; - u32 i; +bool32 sub_0801FE68(Entity* ent, s32 arg2) { + s32 sin, cos; + s32 x, y; + u32 i; - - if (sub_08049FDC(ent, 1) == 0) { - return 0; - } - else { - x = gUnk_020000B0->x.WORD; - y = gUnk_020000B0->y.WORD; - sin = gSineTable[arg2 * 8] << 11; - cos = gSineTable[arg2 * 8 + 0x40] << 11; - for (i = 0; i < 8; i++) { - x += sin; - y += -cos; - if (sub_0801FDE4(ent, x >> 0x10, y >> 0x10) == 0) { - return 0; - } + if (sub_08049FDC(ent, 1) == 0) { + return 0; + } else { + x = gUnk_020000B0->x.WORD; + y = gUnk_020000B0->y.WORD; + sin = gSineTable[arg2 * 8] << 11; + cos = gSineTable[arg2 * 8 + 0x40] << 11; + for (i = 0; i < 8; i++) { + x += sin; + y += -cos; + if (sub_0801FDE4(ent, x >> 0x10, y >> 0x10) == 0) { + return 0; + } + } + return 1; } - return 1; - } } -#if NON_MATCHING -void sub_0801FED4(Entity *this) -{ - s16 sVar2; - - if (sub_08049FDC(this, 1) == 0) { - this->field_0x74 = 1; - } - sVar2 = (this->frames.all & 0xf) * 0x20; - this->nonPlanarMovement = sVar2; - if (this->entityType.form == 0) { - this->field_0xf++; - if ((this->field_0xf & 0xf) == 0) { - sub_08004596(this, sub_0800132C(this, gUnk_020000B0)); +extern u32 sub_0800132C(Entity*, Entity*); + +void sub_0801FED4(Entity* this) { + s16 sVar2; + + if (sub_08049FDC(this, 1) == 0) { + this->field_0x74 = 1; } - } - else { - this->nonPlanarMovement = sVar2 + 0x40; - this->field_0xf++; - if ((this->field_0xf & 0x7) == 0) { - sub_08004596(this, sub_0800132C(this, gUnk_020000B0)); + sVar2 = (this->frames.all & 0xf) * 0x20; + this->nonPlanarMovement = sVar2; + if (this->entityType.form == 0) { + if ((this->field_0xf++ & 0xf) == 0) { + sub_08004596(this, sub_0800132C(this, gUnk_020000B0)); + } + } else { + this->nonPlanarMovement = sVar2 + 0x40; + if ((this->field_0xf++ & 0x7) == 0) { + sub_08004596(this, sub_0800132C(this, gUnk_020000B0)); + } } - } - sub_080AEF88(this); + sub_080AEF88(this); } -#else -NAKED -void sub_0801FED4(Entity *this) { - asm(".include \"asm/non_matching/leever/sub_0801FED4.inc\""); -} -#endif \ No newline at end of file diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c index 57fc25e3..a5b63f96 100644 --- a/src/enemy/octorok.c +++ b/src/enemy/octorok.c @@ -62,7 +62,7 @@ void sub_0801EB2C(Entity* ent) { void sub_0801EB68(Entity* ent) { ent->previousActionFlag = 1; - ent->filler[1] = 60; + ent->field_0x1d = 60; } void sub_0801EB74(Entity* ent) { diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c index cbd991c4..714d3788 100644 --- a/src/enemy/rupeeLike.c +++ b/src/enemy/rupeeLike.c @@ -4,7 +4,7 @@ #include "functions.h" #include "npc.h" #include "structures.h" -#include "link.h" +#include "player.h" extern void sub_080293DC(Entity*); extern void sub_080296D8(Entity*); @@ -25,7 +25,7 @@ void RupeeLike(Entity* this) { u32 uVar1; if (this->entityType.parameter == 0) { - uVar1 = sub_080043E8(this); + uVar1 = (u8)sub_080043E8(this); if (uVar1 != 0) { if (this->action == 4) { sub_080296D8(this); @@ -61,7 +61,7 @@ void sub_08029318(Entity* this) { this->field_0xf = 0; this->field_0x82.HALF.HI = 0x41; this->flags2 &= 0xfc; - this->field_0x80.HALF.LO = gLinkEntity.spritePriority.b1; + this->field_0x80.HALF.LO = gPlayerEntity.spritePriority.b1; sub_08004488(0x104); } else { if (this->field_0x43 != 0) { @@ -116,7 +116,7 @@ void sub_08029474(Entity* this) { if (this->frames.b.f3) { this->action = 3; this->actionDelay = 8; - bVar1 = GetFacingDirection(this, &gLinkEntity); + bVar1 = GetFacingDirection(this, &gPlayerEntity); this->direction = bVar1; this->animationState = (bVar1 << 0x18) >> 0x1c; InitializeAnimation(this, this->animationState); @@ -133,7 +133,7 @@ void sub_080294D4(Entity* this) { if (sub_08049FDC(this, 1) != 0) { if (--this->actionDelay == 0) { this->actionDelay = 8; - sub_08004596(this, GetFacingDirection(this, &gLinkEntity)); + sub_08004596(this, GetFacingDirection(this, &gPlayerEntity)); sub_0802969C(this); } sub_080AEF88(this); @@ -162,13 +162,13 @@ void sub_0802953C(Entity* this) { if (((this->field_0xf > 0x2d) || (gUnk_02002A40.stats.rupees == 0)) && (this->actionDelay == 0)) { sub_080296D8(this); } else { - ResetLink(); - gLinkState.field_0x1a[0] |= 0x80; - PositionRelative(this, &gLinkEntity, 0, 0x10000); + ResetPlayer(); + gPlayerState.field_0x1a[0] |= 0x80; + PositionRelative(this, &gPlayerEntity, 0, 0x10000); pbVar3 = GetSpriteSubEntryOffsetDataPointer((u16)this->spriteIndex, this->frameIndex); - gLinkEntity.spriteOffsetX = pbVar3[0]; - gLinkEntity.spriteOffsetY = pbVar3[1] - 1; - gLinkEntity.spritePriority.b1 = 0; + gPlayerEntity.spriteOffsetX = pbVar3[0]; + gPlayerEntity.spriteOffsetY = pbVar3[1] - 1; + gPlayerEntity.spritePriority.b1 = 0; if (--this->field_0x82.HALF.HI == 0) { this->field_0x82.HALF.HI = 0x41; if (gUnk_02002A40.stats.rupees != 0) { @@ -230,16 +230,16 @@ void sub_080296C8(Entity* this) { } void sub_080296D8(Entity* this) { - gLinkState.jumpStatus = 0x41; - gLinkState.flags.all &= 0xffffffef; - gLinkEntity.flags |= 0x80; - gLinkEntity.field_0x20 = 0x18000; - gLinkEntity.hurtBlinkTime = 0xa6; - gLinkEntity.height.HALF.HI = -2; - gLinkEntity.direction = gLinkEntity.animationState << 2; - gLinkEntity.spritePriority.b1 = this->field_0x80.HALF.LO; - gLinkEntity.spriteOffsetY = 0; - gLinkEntity.nonPlanarMovement = 0x140; + gPlayerState.jumpStatus = 0x41; + gPlayerState.flags.all &= 0xffffffef; + gPlayerEntity.flags |= 0x80; + gPlayerEntity.field_0x20 = 0x18000; + gPlayerEntity.hurtBlinkTime = 0xa6; + gPlayerEntity.height.HALF.HI = -2; + gPlayerEntity.direction = gPlayerEntity.animationState << 2; + gPlayerEntity.spritePriority.b1 = this->field_0x80.HALF.LO; + gPlayerEntity.spriteOffsetY = 0; + gPlayerEntity.nonPlanarMovement = 0x140; this->action = 5; this->field_0xf = 0x3c; this->flags2 |= 3; diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c index c29fe80c..94eb8822 100644 --- a/src/enemy/smallPesto.c +++ b/src/enemy/smallPesto.c @@ -46,7 +46,7 @@ void sub_0803169C(Entity *this) void sub_080316DC(Entity *this) { this->previousActionFlag = 1; - this->filler[1] = 0x3c; + this->field_0x1d = 0x3c; } void sub_080316E8(Entity *this) diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c index d6729201..b56ff33a 100644 --- a/src/enemy/wisp.c +++ b/src/enemy/wisp.c @@ -2,7 +2,7 @@ #include "entity.h" #include "enemy.h" #include "structures.h" -#include "link.h" +#include "player.h" #include "functions.h" extern void (*const gUnk_080CEB74[])(Entity*); @@ -34,7 +34,7 @@ void sub_08033564(Entity* this) { this->spriteSettings.b.draw = FALSE; this->flags &= 0x7f; this->field_0x7c.HALF.LO = 0x27c; - gLinkState.flags.all |= 0x4000; + gPlayerState.flags.all |= 0x4000; gUnk_02002A40.stats.filler2[4] = this->entityType.form + 1; gUnk_02002A40.stats.field_0x20 = 600; if (this->entityType.form == 0) { @@ -85,7 +85,7 @@ void sub_08033674(Entity* this) { sub_0804A720(this); this->actionDelay = 0; this->action = 1; - this->filler[0] = 1; + this->field_0x1c = 1; this->field_0x80.HWORD = this->x.HALF.HI; this->field_0x82.HWORD = this->y.HALF.HI; sub_08033744(this); diff --git a/src/entity.c b/src/entity.c index deedca95..1ceabce4 100644 --- a/src/entity.c +++ b/src/entity.c @@ -122,18 +122,18 @@ void DeleteEntity(Entity* ent) } } -extern Entity gLinkEntity; +extern Entity gPlayerEntity; void sub_0805E870(Entity*); void sub_0805E84C(void) { - Entity* ent = &gLinkEntity; + Entity* ent = &gPlayerEntity; do { if ((int)ent->field_0x0 < 0) { sub_0805E870(ent); } - } while (ent++, ent < (&gLinkEntity + 80)); + } while (ent++, ent < (&gPlayerEntity + 80)); return; } diff --git a/src/initializePlayer.c b/src/initializePlayer.c new file mode 100644 index 00000000..589d550e --- /dev/null +++ b/src/initializePlayer.c @@ -0,0 +1,68 @@ +#include "global.h" +#include "entity.h" +#include "player.h" +#include "structures.h" +#include "functions.h" +#include "room.h" +#include "flags.h" + +extern u32 gUnk_03000B80; +extern u32 gUnk_03003FC0; + +extern Entity gPlayerEntity; + +extern u8 gUnk_080FCAC8[]; + +void InitializePlayer(void) +{ + Entity* pl; + + sub_080784C8(); + _DmaZero((void *)&gUnk_03000B80, 0x70); + _DmaZero((void *)&gPlayerState, 0xb0); + + _DmaFill32(0xffffffff, &gPlayerState.field_0x40, 0x40); + pl = &gPlayerEntity; + _DmaZero((void *)pl, 0x88); + gRoomControls.cameraTarget = pl; + gPlayerState.playerAction = gUnk_080FCAC8[gScreenTransition.field_0xf]; + if (!CheckGlobalFlag(0x14)) { + gPlayerState.flags.all |= 8; + } + switch (gScreenTransition.field_0xf) { + case 0x2: + case 0x6: + pl->height.HALF.HI = -0xc0; + break; + case 0x4: + gPlayerState.field_0x34[4] = 0x10; + pl->direction = gScreenTransition.playerState << 2; + case 0x3: + pl->nonPlanarMovement = 0xe0; + break; + case 0x7: + case 0x8: + gPlayerState.field_0x34[4] = 1; + gPlayerState.field_0x34[5] = gScreenTransition.field_0xf; + break; + case 0xa: + gPlayerState.field_0x34[4] = 1; + break; + case 0xb: + gPlayerState.field_0x34[4] = 3; + break; + case 0xc: + gPlayerState.field_0x34[4] = 4; + } + pl->entityType.type = 1; + pl->flags |= 0xa0; + pl->spritePriority.b0 = 4; + pl->currentHealth = gUnk_02002A40.stats.health; + pl->x.HALF.HI = gScreenTransition.playerStartPos.HALF.x; + pl->y.HALF.HI = gScreenTransition.playerStartPos.HALF.y; + pl->animationState = gScreenTransition.playerState; + pl->collisionLayer = gScreenTransition.playerLayer; + UpdateSpriteForCollisionLayer(pl); + sub_0805EA2C(pl, 1); + sub_08017640(); +} \ No newline at end of file diff --git a/src/item.c b/src/item.c index b757fa6c..8d3e0f72 100644 --- a/src/item.c +++ b/src/item.c @@ -61,28 +61,28 @@ extern u8 gUnk_02034490; #if 0 void Ocarina(ItemBehavior* beh, u32 inputFlags) { gOcarinaStates[beh->stateID](beh, inputFlags); - gLinkEntity.field_0x7a++; + gPlayerEntity.field_0x7a++; } void OcarinaUse(ItemBehavior *beh, u32 arg1) { u32 bVar1; - if (gLinkState.linkAction == 0x18) { - LinkChangeState(beh, arg1); + if (gPlayerState.playerAction == 0x18) { + PlayerChangeState(beh, arg1); } else { beh->field_0x5[4] = beh->field_0x5[4] | 0xf; - gLinkEntity.animationState = 4; - gLinkEntity.spriteSettings.b.flipX = 0; - gLinkEntity.flags &= 0x7f; - gLinkEntity.field_0x7a = 2; - gLinkState.flags.all |= 0x10000000; - gLinkState.field_0x27[0] = 0xff; + gPlayerEntity.animationState = 4; + gPlayerEntity.spriteSettings.b.flipX = 0; + gPlayerEntity.flags &= 0x7f; + gPlayerEntity.field_0x7a = 2; + gPlayerState.flags.all |= 0x10000000; + gPlayerState.field_0x27[0] = 0xff; gUnk_02034490 = 1; bVar1 = (8 >> arg1); - gLinkState.field_0xa |= bVar1; - gLinkState.keepFacing |= bVar1; + gPlayerState.field_0xa |= bVar1; + gPlayerState.keepFacing |= bVar1; sub_08078F60(); sub_08077D38(beh, arg1); PlaySFX(0x216); @@ -98,7 +98,7 @@ void PacciCane(ItemBehavior* beh, u32 arg1) { void sub_08076C98(ItemBehavior* beh, u32 arg1) { beh->field_0x5[4] |= 0xf; sub_08077D38(beh, arg1); - sub_0806F948(&gLinkEntity); + sub_0806F948(&gPlayerEntity); sub_08077BB8(beh); } @@ -118,25 +118,25 @@ void Shield(ItemBehavior* beh, u32 arg1) { } void sub_08076D04(ItemBehavior* beh, u32 arg1) { - gLinkState.field_0x3[0] = 0x81; + gPlayerState.field_0x3[0] = 0x81; beh->field_0x5[4] = 2; - sub_0806F948(&gLinkEntity); + sub_0806F948(&gPlayerEntity); sub_08077D38(beh, arg1); sub_08077BB8(beh); } void sub_08076D34(ItemBehavior* beh, u32 arg1) { if (sub_08077EFC() != 0) { - gLinkState.field_0x3[0] |= 1; + gPlayerState.field_0x3[0] |= 1; UpdateItemAnim(beh); if (beh->field_0x5[9] != 0) { beh->stateID++; beh->field_0xf = 0; - gLinkState.field_0xa &= ~(u8)(8 >> arg1); + gPlayerState.field_0xa &= ~(u8)(8 >> arg1); PlaySFX(0x15d); } } else { - gLinkState.field_0x3[0] = 0; + gPlayerState.field_0x3[0] = 0; sub_08077E78(beh, arg1); } } @@ -144,17 +144,17 @@ void sub_08076D34(ItemBehavior* beh, u32 arg1) { void sub_08076D94(ItemBehavior *beh, u32 arg1) { if (sub_08077EFC(beh)) { - gLinkState.field_0x3[0] |= 1; + gPlayerState.field_0x3[0] |= 1; UpdateItemAnim(beh); } else { - gLinkState.field_0x3[0] = 0; + gPlayerState.field_0x3[0] = 0; sub_08077E78(beh, arg1); } } void GustJar(ItemBehavior *beh, u32 arg1) { - gLinkState.field_0xa8[0] = 3; + gPlayerState.field_0xa8[0] = 3; gUnk_0811BDF4[beh->stateID](beh, arg1); } \ No newline at end of file diff --git a/src/item11.c b/src/item11.c index e6ab76de..a47bdaa9 100644 --- a/src/item11.c +++ b/src/item11.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" extern void DeleteThisEntity(); extern void sub_08078CD0(Entity*); @@ -31,14 +31,14 @@ void sub_08018CBC(Entity *this) u8 uVar2; Entity *pEVar3; - *(u32 *)&this->cutsceneBeh = this->x.WORD = gLinkEntity.x.WORD; - *(u32 *)&this->field_0x80 = this->y.WORD = gLinkEntity.y.WORD; - uVar2 = this->animationState = gLinkEntity.animationState & 0xe; + *(u32 *)&this->cutsceneBeh = this->x.WORD = gPlayerEntity.x.WORD; + *(u32 *)&this->field_0x80 = this->y.WORD = gPlayerEntity.y.WORD; + uVar2 = this->animationState = gPlayerEntity.animationState & 0xe; this->direction = (u8)(uVar2 << 2); this->nonPlanarMovement = 0x400; this->damageType = 0x96; - this->field_0x3c = (gLinkEntity.field_0x3c + 1) | 0x80; - this->flags2 = gLinkEntity.flags2; + this->field_0x3c = (gPlayerEntity.field_0x3c + 1) | 0x80; + this->flags2 = gPlayerEntity.flags2; pEVar3 = this->attachedEntity; if (pEVar3 != NULL) { this->action = 1; @@ -51,7 +51,7 @@ void sub_08018CBC(Entity *this) this->attachedEntity->spriteSettings.b.draw = 0; } else { - if (gLinkState.field_0x1c == 0) { + if (gPlayerState.field_0x1c == 0) { DeleteThisEntity(); } this->action = 2; @@ -59,14 +59,14 @@ void sub_08018CBC(Entity *this) this->spriteIndex = 0xa6; this->palette.raw = 0x33; this->spriteVramOffset = 0; - (this->entityType).form = gLinkState.field_0x1d[0] - 1; + (this->entityType).form = gPlayerState.field_0x1d[0] - 1; this->actionDelay = gUnk_080B3DE0[(this->entityType).form * 2]; this->field_0x44 = gUnk_080B3DE0[(this->entityType).form * 2 + 1]; this->field_0x40 = 0x1b; this->boundingBox = gUnk_080B3DE8[(this->entityType).form]; - (u32 *)gLinkEntity.field_0x70.WORD = this; - sub_08078CD0(&gLinkEntity); - (u32 *)gLinkEntity.field_0x70.WORD = pEVar3; + (u32 *)gPlayerEntity.field_0x70.WORD = this; + sub_08078CD0(&gPlayerEntity); + (u32 *)gPlayerEntity.field_0x70.WORD = pEVar3; InitializeAnimation(this, (this->entityType).form + 10); sub_08018FA0(this); } @@ -79,10 +79,10 @@ void sub_08018DE8(Entity *this) bVar1 = this->attachedEntity->field_0x3a & 4; if (bVar1 == 0) { - gLinkState.field_0x1c = bVar1; + gPlayerState.field_0x1c = bVar1; DeleteThisEntity(); } - switch (gLinkState.field_0x1c) { + switch (gPlayerState.field_0x1c) { case 0: sub_08018F6C(this); break; @@ -95,5 +95,5 @@ void sub_08018DE8(Entity *this) sub_08018FA0(this); break; } - sub_08078CD0(&gLinkEntity); + sub_08078CD0(&gPlayerEntity); } \ No newline at end of file diff --git a/src/manager/manager6.c b/src/manager/manager6.c index deb44026..7914a224 100644 --- a/src/manager/manager6.c +++ b/src/manager/manager6.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "manager.h" extern void* GetCurrentRoomProperty(u8); @@ -19,13 +19,13 @@ void sub_08057CB4(Entity * this) { return; } } - if (this->actionDelay == 0 || gLinkState.field_0x10[2] == 0x1e) { + if (this->actionDelay == 0 || gPlayerState.field_0x10[2] == 0x1e) { for (i = ((UnkManagerHelperStruct*) this->field_0x20);i->field_0x00 != 0xFFFF; i++) { tmp = (i->field_0x07.all & 0x3); - if (((tmp & (gLinkEntity.collisionLayer)) != 0) && - (((gLinkState.flags.all & 0x80) != 0) || ((i->field_0x07.b.unk2) != 0)) && + if (((tmp & (gPlayerEntity.collisionLayer)) != 0) && + (((gPlayerState.flags.all & 0x80) != 0) || ((i->field_0x07.b.unk2) != 0)) && (CheckPlayerInRegion(i->field_0x00,i->field_0x02,i->field_0x04,i->field_0x05) != 0) && - (gLinkEntity.height.HALF.HI == 0)) { + (gPlayerEntity.height.HALF.HI == 0)) { DoExitTransition(GetCurrentRoomProperty(i->field_0x06)); } } diff --git a/src/manager/managerA.c b/src/manager/managerA.c index 5eb869e5..699c5634 100644 --- a/src/manager/managerA.c +++ b/src/manager/managerA.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "manager.h" #include "flags.h" #include "area.h" @@ -55,7 +55,7 @@ void sub_080585DC(Manager*); void sub_08058408(Manager* this){ u32 tmp2; - tmp2 = (gLinkState.flags.all & 0x08); + tmp2 = (gPlayerState.flags.all & 0x08); if (tmp2 != 0) return; if (!CheckPlayerInRegion(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) return; switch (this->unk_0a) { @@ -63,7 +63,7 @@ void sub_08058408(Manager* this){ return; case 2: sub_080585DC(this); - if ((gLinkState.flags.all & 0x80) == 0) return; + if ((gPlayerState.flags.all & 0x80) == 0) return; case 0: default: sub_080585DC(this); @@ -85,7 +85,7 @@ void sub_08058408(Manager* this){ u32 sub_0805848C(Manager* this) { - switch (gLinkState.field_0xa8[0]-5) { + switch (gPlayerState.field_0xa8[0]-5) { case 0: case 2: case 3: @@ -122,11 +122,11 @@ extern void UnfreezeTime(void); void sub_08058514(Manager* this) { switch (this->unk_0d) { case 1: - if ((gLinkState.flags.all & 0x1235) != 0) + if ((gPlayerState.flags.all & 0x1235) != 0) return; - if (gLinkEntity.height.HALF.HI != 0) + if (gPlayerEntity.height.HALF.HI != 0) return; - gLinkState.jumpStatus = 0; + gPlayerState.jumpStatus = 0; sub_08078AA8(this->unk_36, this->unk_35); this->unk_0d++; this->unk_0e = 0x1E; @@ -138,8 +138,8 @@ void sub_08058514(Manager* this) { } return; case 3: - if (gLinkEntity.action != 1 && gLinkEntity.action != 9) return; - gLinkState.field_0x8b = 1; + if (gPlayerEntity.action != 1 && gPlayerEntity.action != 9) return; + gPlayerState.field_0x8b = 1; UnfreezeTime(); SetFlag(this->unk_3c); DeleteThisEntity(); diff --git a/src/modHealth.c b/src/modHealth.c index 8706debe..a42917a4 100644 --- a/src/modHealth.c +++ b/src/modHealth.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" s32 ModHealth(s32 deltaHealth) @@ -15,6 +15,6 @@ s32 ModHealth(s32 deltaHealth) newHealth = (u32)gStats.maxHealth; } gStats.health = newHealth; - gLinkEntity.currentHealth = newHealth; + gPlayerEntity.currentHealth = newHealth; return newHealth; } diff --git a/src/modRupees.c b/src/modRupees.c index bbe8b88e..cedec389 100644 --- a/src/modRupees.c +++ b/src/modRupees.c @@ -1,5 +1,5 @@ #include "global.h" -#include "link.h" +#include "player.h" extern u16 gWalletSizes[4]; diff --git a/src/npc/anju.c b/src/npc/anju.c index 19e5a7a2..939e5c45 100644 --- a/src/npc/anju.c +++ b/src/npc/anju.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "room.h" #include "flags.h" #include "sprite.h" @@ -28,7 +28,7 @@ void Anju(Entity *this) if (this->interactType == 2) { this->action = 2; this->interactType = 0; - InitializeAnimation(this,(this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitializeAnimation(this,(this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); sub_0806F118(this); } else { sub_0807DD94(this, 0); diff --git a/src/npc/beedle.c b/src/npc/beedle.c index bdcce8c7..3b30e19b 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -2,7 +2,7 @@ #include "entity.h" #include "functions.h" #include "textbox.h" -#include "link.h" +#include "player.h" #include "room.h" typedef struct { @@ -118,8 +118,8 @@ void sub_0806346C(Entity* this) { s32 iVar2; s32 iVar3; - iVar3 = (gLinkEntity.x.HALF.HI - this->x.HALF.HI); - iVar2 = (gLinkEntity.y.HALF.HI - this->y.HALF.HI); + iVar3 = (gPlayerEntity.x.HALF.HI - this->x.HALF.HI); + iVar2 = (gPlayerEntity.y.HALF.HI - this->y.HALF.HI); iVar3 += 0x30; iVar2 += 0x18; @@ -139,7 +139,7 @@ void sub_0806346C(Entity* this) { iVar3 >>= 4; iVar2 >>= 4; - bVar1 = gUnk_0810C8F0[(gLinkEntity.animationState >> 1) + iVar3 * 4 + iVar2 * 0x18]; + bVar1 = gUnk_0810C8F0[(gPlayerEntity.animationState >> 1) + iVar3 * 4 + iVar2 * 0x18]; if (bVar1 != this->entityType.parameter) { gUnk_0810C89C_struct* temp = &gUnk_0810C89C[bVar1]; sub_08078850(this, 1, temp->unk_04, temp); diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index 3b3a5101..e2024a25 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "structures.h" extern void (*gUnk_081140D4[])(Entity*); @@ -37,10 +37,10 @@ void sub_0806CF30(Entity* this) { case 0: case 1: if (gScreenTransition.frameCount % 4 == 0) { - if (gLinkEntity.x.HALF.HI < this->x.HALF.HI && this->field_0x68.HWORD - 32 < this->x.HALF.HI) { + if (gPlayerEntity.x.HALF.HI < this->x.HALF.HI && this->field_0x68.HWORD - 32 < this->x.HALF.HI) { this->x.HALF.HI--; } - if (gLinkEntity.x.HALF.HI > this->x.HALF.HI && this->field_0x68.HWORD + 32 > this->x.HALF.HI) { + if (gPlayerEntity.x.HALF.HI > this->x.HALF.HI && this->field_0x68.HWORD + 32 > this->x.HALF.HI) { this->x.HALF.HI++; } } diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index 3ebb104f..cc6433f6 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -2,7 +2,7 @@ #include "entity.h" #include "functions.h" #include "flags.h" -#include "link.h" +#include "player.h" #include "room.h" #include "textbox.h" @@ -122,7 +122,7 @@ void FUN_08068b2c(Entity* this) { if (this->interactType == '\x02') { this->action = 2; this->interactType = '\0'; - uVar1 = sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)); + uVar1 = sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)); InitAnimationForceUpdate(this, uVar1); sub_0806F118(this); } else { @@ -345,16 +345,16 @@ void sub_08068E78(Entity* this) { } void sub_08068E90(Entity* this) { - LinkState* s = &gLinkState; + PlayerState* s = &gPlayerState; *(u16*)&s->field_0xac = (1 << (gUnk_08111740[this->actionDelay] - 1)) | *(u16*)&s->field_0xac; } void sub_08068EB4(void) { - gLinkState.field_0xab = 0; + gPlayerState.field_0xab = 0; } void sub_08068EC4(Entity* param_1, Entity* param_2) { - if (gUnk_08111740[param_1->actionDelay] == gLinkState.field_0xab) { + if (gUnk_08111740[param_1->actionDelay] == gPlayerState.field_0xab) { *(u16*)¶m_2->flags = gUnk_0811172A[param_1->actionDelay]; *(u32*)¶m_2->animationState = 1; } else { diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c index bbf9a1ed..b28fc197 100644 --- a/src/npc/carpenter.c +++ b/src/npc/carpenter.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "sprite.h" -#include "link.h" +#include "player.h" extern void DeleteThisEntity(); extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*); @@ -35,7 +35,7 @@ void Carpenter(Entity* this) { this->action = 2; this->interactType = 0; this->field_0x68.HALF.HI = this->animIndex; - InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + 4 + (this->entityType.form * 8)); + InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 4 + (this->entityType.form * 8)); sub_0806F118(this); } else { sub_0807DDAC(this, 0); diff --git a/src/npc/cow.c b/src/npc/cow.c index ed448997..9c62c898 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" extern void sub_0806ED78(Entity*); extern void sub_0806920C(Entity*); @@ -19,7 +19,7 @@ extern u32 gUnk_08111938[]; extern void PlaySFX(u32); extern u32 Random(); extern u32 UpdateFuseInteraction(Entity*); -extern LinkState gLinkState; +extern PlayerState gPlayerState; void Cow(Entity* ent) { gUnk_08111914[ent->action](ent); @@ -191,7 +191,7 @@ void Cow_ShowDialogue(Entity* ent) { void sub_0806920C(Entity* ent) { // TODO: figure out what bitfield flag this is - u32 var0 = gLinkState.flags.all & 0x80; + u32 var0 = gPlayerState.flags.all & 0x80; u32 var1 = -var0 >> 0x1F; if (var1 != ent->field_0x6c.HALF.HI) { @@ -210,7 +210,7 @@ void sub_0806924C(Entity* ent) { s8 itype = ent->interactType; if (itype != 0) { // TODO: figure out what bitfield flag this is - if ((gLinkState.flags.all & 0x80) != 0) { + if ((gPlayerState.flags.all & 0x80) != 0) { if (itype == 2) { ent->action = 4; sub_0806F118(ent); diff --git a/src/npc/dampe.c b/src/npc/dampe.c index 8e9707a7..f424c1d8 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "room.h" #include "flags.h" #include "sprite.h" @@ -36,7 +36,7 @@ void Dampe(Entity* this) { if (this->interactType == 2) { this->action = 2; this->interactType = 0; - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + 4); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 4); sub_0806F118(this); } else { sub_0807DD94(this, 0); diff --git a/src/npc/epona.c b/src/npc/epona.c index 51e2da86..89c18204 100644 --- a/src/npc/epona.c +++ b/src/npc/epona.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "textbox.h" -#include "link.h" +#include "player.h" #include "functions.h" void sub_08065A64(Entity* this); @@ -56,7 +56,7 @@ void sub_08065A50(Entity* this) { void sub_08065A64(Entity* this) { u32 uVar2; - uVar2 = -(gLinkState.flags.all & 0x80) >> 0x1f; + uVar2 = -(gPlayerState.flags.all & 0x80) >> 0x1f; if (uVar2 != this->field_0x68.HALF.HI) { if (uVar2 == 0) { sub_08078778(this); @@ -69,7 +69,7 @@ void sub_08065A64(Entity* this) { void sub_08065AA4(Entity* this) { if (this->interactType != 0) { - if (gLinkState.flags.all & 0x80) { + if (gPlayerState.flags.all & 0x80) { if (this->interactType == 2) { this->action = 4; sub_0806F118(this); @@ -78,7 +78,7 @@ void sub_08065AA4(Entity* this) { sub_0805E3A0(this, 2); sub_08065A50(this); } - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); } else { sub_08065A50(this); sub_080791D0(); diff --git a/src/npc/festari.c b/src/npc/festari.c index 310db3fa..54688ac2 100644 --- a/src/npc/festari.c +++ b/src/npc/festari.c @@ -2,7 +2,7 @@ #include "entity.h" #include "functions.h" #include "npc.h" -#include "link.h" +#include "player.h" extern void sub_0805E3A0(Entity*, u32); extern u32 sub_0801E99C(Entity*); @@ -41,7 +41,7 @@ void sub_0805FE48(Entity *this) if (this->interactType == 2) { this->action = 2; this->interactType = 0; - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); sub_0806F118(this); } else { diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c index 7d0daab7..4fa025c6 100644 --- a/src/npc/forestMinish.c +++ b/src/npc/forestMinish.c @@ -3,7 +3,7 @@ #include "npc.h" #include "flags.h" #include "textbox.h" -#include "link.h" +#include "player.h" #include "structures.h" extern void sub_0805E3A0(Entity*, u32); diff --git a/src/npc/gentari.c b/src/npc/gentari.c index 31b3bdc4..f03f3f0f 100644 --- a/src/npc/gentari.c +++ b/src/npc/gentari.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "npc.h" -#include "link.h" +#include "player.h" extern void sub_0805E3A0(Entity*, u32); extern u32 sub_0801E99C(Entity*); @@ -26,7 +26,7 @@ void Gentari(Entity *this) if (this->interactType == 2) { this->action = 2; this->interactType = 0; - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); sub_0806F118(this); } else { sub_0807DD94(this, 0); diff --git a/src/npc/guard.c b/src/npc/guard.c index a2cd0b25..675e2cb6 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "flags.h" #include "textbox.h" #include "room.h" @@ -30,6 +30,12 @@ extern u32 sub_0805ACC0(Entity*); extern void sub_0807DDAC(Entity*, u32); extern void sub_0807DDE4(Entity*); extern void sub_0807000C(Entity*); +extern void sub_0806EE04(Entity*, void*, u32); +extern Entity* sub_080A7EE0(int); +extern void sub_08078778(Entity*); +extern void sub_0807DD64(Entity*); +void sub_08063DC8(Entity*); +void sub_08063F20(Entity*); extern void (*const gUnk_0810F544[])(Entity*); extern void (*const gUnk_0810F550[])(Entity*); @@ -40,157 +46,195 @@ extern SpriteLoadData gUnk_0810F524[]; extern void* gUnk_0810F6BC[]; extern ScreenTransition gScreenTransition; -void Guard(Entity *this) -{ - if ((this->flags & 2) != 0) { - gUnk_0810F544[this->action](this); - } - else { - sub_08063D24(this); - } +void Guard(Entity* this) { + if ((this->flags & 2) != 0) { + gUnk_0810F544[this->action](this); + } else { + sub_08063D24(this); + } } -void sub_08063D24(Entity *this) -{ - gUnk_0810F550[this->action](this); - sub_0806ED78(this); +void sub_08063D24(Entity* this) { + gUnk_0810F550[this->action](this); + sub_0806ED78(this); } -NAKED void sub_08063D44(Entity* this) { - asm(".include \"asm/non_matching/guard/sub_08063D44.inc\""); -} + Entity* ent; + u32 temp, idx; -void sub_08063DC8(Entity *this) -{ - if ((this->entityType).form == 0xff) { - this->action = 2; - this->actionDelay = 0x1e; - this->animationState = sub_0806F5A4(GetFacingDirection(this,&gLinkEntity)); - InitAnimationForceUpdate(this, this->animationState + 4); - } - else { - sub_0806EE20(this); - if (this->field_0x3e != this->animationState) { - this->animationState = this->field_0x3e; - InitializeAnimation(this, this->animationState + 4); + if (gUnk_03003DBC > 0x46) + return; + + temp = this->entityType.subtype; + temp ^= 0x15; + idx = ((-temp | temp) >> 0x1f) * 4; + if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx])) + return; + + InitializeAnimation(this, 4); + sub_0806EE04(this, gUnk_0810F6BC[this->entityType.form], 0); + switch (this->entityType.form) { + case 0 ... 3: + ent = sub_080A7EE0(0xc); + ent->parent = this; + ent->field_0xf = 0x3c; + break; + case 4 ... 5: + sub_08078778(this); + break; } - else { - GetNextFrame(this); - } - if (this->interactType != 0) { - this->action = 3; - this->interactType = 0; - InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this,&gLinkEntity))); - sub_08064428(this); - } - } -} - -void sub_08063E54(Entity *this) -{ - if (--this->actionDelay == 0) { - SetRoomFlag(0xf); - } -} - -void sub_08063E6C(Entity *this) -{ - if ((gTextBox.doTextBox & 0x7f) == 0) { - this->action = 1; - InitializeAnimation(this, this->animationState + 4); - } -} - -NAKED -void sub_08063E90(Entity* this) { - asm(".include \"asm/non_matching/guard/sub_08063E90.inc\""); -} - -void sub_08063F20(Entity *this) -{ - sub_0807DDAC(this, 0); - sub_0807DDE4(this); - GetNextFrame(this); - if (this->interactType != 0) { this->action++; - this->interactType = 0; - InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + *(s8 *)&this->field_0x70); - sub_08064428(this); - } + this->entityType.form = 0; + sub_08063DC8(this); } -void sub_08063F78(Entity *this) -{ - if ((gTextBox.doTextBox & 0x7f) == 0) { - this->action = this->action - 1; - InitializeAnimation(this,(this->animationState >> 1) + 4 + *(s8 *)&this->field_0x70); - } -} - -void Guard_Head(Entity *this) -{ - u8 bVar1; - u32 uVar2; - u32 pbVar3; - u32 uVar4; - u32 pbVar5; - - uVar2 = this->frames.all & 0x3f; - pbVar5 = (this->frameIndex & 0x3f); - uVar4 = this->frameSpriteSettings & 0x3f; - if ((this->entityType).subtype == 0x15) { - if ((this->frameIndex & 0x40) != 0) { - pbVar5 = pbVar5 + 0x21; - pbVar3 = 0xffffffff; - uVar4 = 0; +void sub_08063DC8(Entity* this) { + if ((this->entityType).form == 0xff) { + this->action = 2; + this->actionDelay = 0x1e; + this->animationState = sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)); + InitAnimationForceUpdate(this, this->animationState + 4); + } else { + sub_0806EE20(this); + if (this->field_0x3e != this->animationState) { + this->animationState = this->field_0x3e; + InitializeAnimation(this, this->animationState + 4); + } else { + GetNextFrame(this); + } + if (this->interactType != 0) { + this->action = 3; + this->interactType = 0; + InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); + sub_08064428(this); + } } - else { - pbVar3 = (uVar2 + 0x19); - if ((this->frameSpriteSettings & 0x3f) != 0) { - uVar4 += 0x1f; - } +} + +void sub_08063E54(Entity* this) { + if (--this->actionDelay == 0) { + SetRoomFlag(0xf); } - } - else { - pbVar3 = (uVar2 + 0x46); - pbVar5 = pbVar5 + 0x2d; - if ((this->frameSpriteSettings & 0x3f) != 0) { - uVar4 += 0x4c; +} + +void sub_08063E6C(Entity* this) { + if ((gTextBox.doTextBox & 0x7f) == 0) { + this->action = 1; + InitializeAnimation(this, this->animationState + 4); } - } - uVar4--; - SetExtraSpriteFrame(this, 0, pbVar3); - SetExtraSpriteFrame(this, 1, pbVar5); - SetExtraSpriteFrame(this, 2, uVar4); - SetSpriteSubEntryOffsetData1(this, 1, 0); - SetSpriteSubEntryOffsetData2(this, 1, 2); - sub_0807000C(this); } -void sub_08064030(Entity *arg0,Entity *arg1) -{ - *(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f; +void sub_08063E90(Entity* this) { + Entity* ent; + u32 temp, idx; + u32 unk; + + temp = this->entityType.subtype; + temp ^= 0x15; + idx = ((-temp | temp) >> 0x1f) * 4; + if (!LoadExtraSpriteData(this, &gUnk_0810F524[idx])) + return; + + this->action++; + if (this->actionDelay) { + this->field_0x70.BYTES.byte0 = 8; + } else { + this->field_0x70.BYTES.byte0 = 0; + } + this->actionDelay = 0; + + unk = sub_0805ACC0(this); + if (unk == 0) { + this->field_0x68.HWORD = this->x.HALF.HI; + this->field_0x6a.HWORD = this->y.HALF.HI; + } else { + this->field_0x68.HWORD = unk >> 0x10; + this->field_0x6a.HWORD = unk; + } + this->field_0x70.BYTES.byte1 = 0; + this->collisionLayer = 1; + UpdateSpriteForCollisionLayer(this); + sub_0807DD64(this); + sub_08063F20(this); } -void sub_08064044(void) -{ - gScreenTransition.unk = 1; +void sub_08063F20(Entity* this) { + sub_0807DDAC(this, 0); + sub_0807DDE4(this); + GetNextFrame(this); + if (this->interactType != 0) { + this->action++; + this->interactType = 0; + InitializeAnimation(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + *(s8*)&this->field_0x70); + sub_08064428(this); + } } -void sub_08064050(Entity *arg0, struct_08064050 *arg1) -{ - u32 unk; - - arg1->unk2 = 0; - switch (arg0->entityType.parameter) { - case 0x11: - arg1->unk2 = 1; - break; - case 0x12: - arg1->unk2 = 2; - break; - case 0x13: - arg1->unk2 = 3; - } +void sub_08063F78(Entity* this) { + if ((gTextBox.doTextBox & 0x7f) == 0) { + this->action = this->action - 1; + InitializeAnimation(this, (this->animationState >> 1) + 4 + *(s8*)&this->field_0x70); + } +} + +void Guard_Head(Entity* this) { + u8 bVar1; + u32 uVar2; + u32 pbVar3; + u32 uVar4; + u32 pbVar5; + + uVar2 = this->frames.all & 0x3f; + pbVar5 = (this->frameIndex & 0x3f); + uVar4 = this->frameSpriteSettings & 0x3f; + if ((this->entityType).subtype == 0x15) { + if ((this->frameIndex & 0x40) != 0) { + pbVar5 = pbVar5 + 0x21; + pbVar3 = 0xffffffff; + uVar4 = 0; + } else { + pbVar3 = (uVar2 + 0x19); + if ((this->frameSpriteSettings & 0x3f) != 0) { + uVar4 += 0x1f; + } + } + } else { + pbVar3 = (uVar2 + 0x46); + pbVar5 = pbVar5 + 0x2d; + if ((this->frameSpriteSettings & 0x3f) != 0) { + uVar4 += 0x4c; + } + } + uVar4--; + SetExtraSpriteFrame(this, 0, pbVar3); + SetExtraSpriteFrame(this, 1, pbVar5); + SetExtraSpriteFrame(this, 2, uVar4); + SetSpriteSubEntryOffsetData1(this, 1, 0); + SetSpriteSubEntryOffsetData2(this, 1, 2); + sub_0807000C(this); +} + +void sub_08064030(Entity* arg0, Entity* arg1) { + *(u32*)&arg1->animationState = (-gRoomVars.greatFairyState | gRoomVars.greatFairyState) >> 0x1f; +} + +void sub_08064044(void) { + gScreenTransition.unk = 1; +} + +void sub_08064050(Entity* arg0, struct_08064050* arg1) { + u32 unk; + + arg1->unk2 = 0; + switch (arg0->entityType.parameter) { + case 0x11: + arg1->unk2 = 1; + break; + case 0x12: + arg1->unk2 = 2; + break; + case 0x13: + arg1->unk2 = 3; + } } \ No newline at end of file diff --git a/src/npc/malon.c b/src/npc/malon.c index 4a599435..15b8c1f4 100644 --- a/src/npc/malon.c +++ b/src/npc/malon.c @@ -2,7 +2,7 @@ #include "functions.h" #include "entity.h" -extern Entity gLinkEntity; +extern Entity gPlayerEntity; extern void (*gUnk_0810FF5C[])(Entity* this); extern void (*gUnk_0810FF64[])(Entity* this); @@ -41,7 +41,7 @@ void sub_080658BC(Entity* this) { if (this->interactType == 2) { this->action = 2; this->interactType = 0; - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); sub_0806F118(this); } else { sub_0807DD94(this, 0); diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c index 9c9cbe51..222ec32c 100644 --- a/src/npc/mayorHagen.c +++ b/src/npc/mayorHagen.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "room.h" #include "flags.h" #include "sprite.h" @@ -41,7 +41,7 @@ void MayorHagen(Entity *this) this->action = v; this->interactType = 0; this->field_0x68.HALF.HI = this->animIndex; - InitAnimationForceUpdate(this,4 + sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitAnimationForceUpdate(this,4 + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); sub_0806F118(this); break; } diff --git a/src/npc/moblinLady.c b/src/npc/moblinLady.c index 2dc1e5f6..8d3f2f49 100644 --- a/src/npc/moblinLady.c +++ b/src/npc/moblinLady.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "room.h" #include "flags.h" #include "sprite.h" diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c index e20d6ea6..b0e95a36 100644 --- a/src/npc/mutoh.c +++ b/src/npc/mutoh.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "flags.h" #include "textbox.h" #include "npc.h" @@ -40,7 +40,7 @@ void Mutoh(Entity* this) if (this->interactType == 2) { this->action = 2; this->interactType = 0; - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)) + 4); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)) + 4); sub_0806F118(this); } else { sub_0807DD94(this, 0); diff --git a/src/npc/postman.c b/src/npc/postman.c index c26dc457..2f357b57 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -3,7 +3,7 @@ #include "functions.h" #include "npc.h" #include "textbox.h" -#include "link.h" +#include "player.h" #include "room.h" #include "structures.h" @@ -145,14 +145,14 @@ void sub_08060528(Entity *this) this->action = 3; this->interactType = 0; sub_0806F118(this); - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); } else { if (this->interactType != 0) { this->action = 2; this->interactType = 0; sub_080606D8(this); - InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); } else { sub_0807DD94(this, 0); @@ -192,7 +192,7 @@ void sub_08060528(Entity *this) sub_080606C0(this); } if ((-1 < this->height.WORD) && - ((gLinkEntity.collisionLayer == 0 || (this->collisionLayer == gLinkEntity.collisionLayer)))) { + ((gPlayerEntity.collisionLayer == 0 || (this->collisionLayer == gPlayerEntity.collisionLayer)))) { sub_0806ED78(this); } sub_0800451C(this); diff --git a/src/npc/smith.c b/src/npc/smith.c index ef3b80ac..ca588dba 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -49,7 +49,7 @@ void Smith(Entity *this) this->action = 4; this->interactType = 0; iVar4 = (this->animIndex == 0xc) ? 8 : 0; - iVar2 = sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)); + iVar2 = sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)); InitAnimationForceUpdate(this, iVar2 + iVar4); sub_0806F118(this); } diff --git a/src/npc/talon.c b/src/npc/talon.c index 5b01b650..b4ddbe84 100644 --- a/src/npc/talon.c +++ b/src/npc/talon.c @@ -2,7 +2,7 @@ #include "entity.h" #include "textbox.h" #include "functions.h" -#include "link.h" +#include "player.h" extern void (*gUnk_0810FEC4[])(Entity* this); extern void (*gUnk_0810FEBC[])(Entity* this); @@ -126,7 +126,7 @@ void sub_080656D4(Entity* this) { void sub_0806574C(Entity* this) { u32 j; - j = (this->animIndex & ~3) + sub_0806F5A4(GetFacingDirection(this, &gLinkEntity)); + j = (this->animIndex & ~3) + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)); if (this->animIndex != j) { InitAnimationForceUpdate(this, j); } diff --git a/src/npc/teachers.c b/src/npc/teachers.c index 1a98617f..0d3a9527 100644 --- a/src/npc/teachers.c +++ b/src/npc/teachers.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" typedef struct { u8 filler[8]; @@ -41,7 +41,7 @@ void Teachers(Entity* this) { this->interactType = 0; this->field_0x68.HALF.HI = this->animIndex; InitializeAnimation(this, - (this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + (this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); sub_0806F118(this); } else { sub_0807DD94(this, 0); diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index d6595f2b..80d207ef 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -50,7 +50,7 @@ void sub_0806ABFC(Entity *this) s32 unk; u8 field_0x68; - Entity *link = &gLinkEntity; + Entity *link = &gPlayerEntity; if (sub_080041A0(this, link, 0x18, 0x18)) { unk = GetFacingDirection(this, link) & (u8)0x1e; } diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index 60748042..7fe6e64a 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "npc.h" -#include "link.h" +#include "player.h" #include "textbox.h" #include "flags.h" #include "structures.h" @@ -145,7 +145,7 @@ void sub_08061D64(Entity* this) { this->interactType = 0; sub_0806F118(this); this->field_0x68.HALF.HI = this->animIndex; - InitializeAnimation(this, (this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitializeAnimation(this, (this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); } else { sub_0807DDAC(this, 0); sub_0807DDE4(this); @@ -158,7 +158,7 @@ void sub_08061D64(Entity* this) { this->interactType = 0; sub_08062048(this); this->field_0x68.HALF.HI = this->animIndex; - InitializeAnimation(this, (this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gLinkEntity))); + InitializeAnimation(this, (this->animIndex & -4) + sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity))); } } } diff --git a/src/npc/zelda.c b/src/npc/zelda.c index 43a8e36f..4516b40e 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -20,7 +20,7 @@ extern void sub_0806F62C(Entity*, u32, u32); extern void PlaySFX(u32); extern void SetTileType(u32, u32, u32); -extern Entity gLinkEntity; +extern Entity gPlayerEntity; extern RoomControls gRoomControls; extern void (*gUnk_08110BD8[])(Entity* ent); @@ -86,7 +86,7 @@ void sub_08066D94(Entity* ent) { SetGlobalFlag(ZELDA_CHASE); npc = CreateNPC(0x2E, 0, 0); if (npc != NULL) { - npc->animationState = gLinkEntity.animationState; + npc->animationState = gPlayerEntity.animationState; npc->flags |= 0x20; npc->animationState = GetAnimationState(ent); roomID = gRoomControls.roomID; diff --git a/src/object.c b/src/object.c index d657e5de..6713b8e7 100644 --- a/src/object.c +++ b/src/object.c @@ -63,7 +63,7 @@ void (*const gObjectFunctions[])(Entity*) = { /*0x39*/ BossDoor, /*0x3a*/ Object3A, /*0x3b*/ MacroMushromStalks, - /*0x3c*/ MacroLink, + /*0x3c*/ MacroPlayer, /*0x3d*/ Object3D, /*0x3e*/ Object3E, /*0x3f*/ GiantLeaf, diff --git a/src/object/cloud.c b/src/object/cloud.c index 54fa6621..fce592f1 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "room.h" -#include "link.h" +#include "player.h" #include "flags.h" extern void sub_0809F7BC(Entity*); @@ -25,8 +25,8 @@ extern void sub_0807BB68(u32*, u32, u32); extern u8 gUnk_02034490; extern u32 gScreenTransition; extern void* gUnk_080DD750; -extern Entity gLinkEntity; -extern LinkState gLinkState; +extern Entity gPlayerEntity; +extern PlayerState gPlayerState; extern u8 gUnk_081247C0[]; extern u16 gUnk_081247C8[]; extern u32 gUnk_081247D0; @@ -123,7 +123,7 @@ void sub_0809F69C(Entity* this) { if (--this->actionDelay == 0) { this->actionDelay = 30; this->action = 4; - gRoomControls.cameraTarget = &gLinkEntity; + gRoomControls.cameraTarget = &gPlayerEntity; PlaySFX(115); } } @@ -131,7 +131,7 @@ void sub_0809F69C(Entity* this) { void sub_0809F6CC(Entity* this) { if (((gRoomControls.unk6 & 4) == 0) && (--this->actionDelay == 0)) { - gLinkState.field_0x8b = 1; + gPlayerState.field_0x8b = 1; DeleteThisEntity(); } } diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index 4e2c4d40..bfdf0807 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -32,12 +32,12 @@ void GreatFairy(Entity* this) { void GreatFairy_CallBehavior(Entity* this) { GreatFairy_Behaviors[this->action](this); - if ((gLinkEntity.y.HALF.HI - gRoomControls.roomOriginY) < 168) { + if ((gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY) < 168) { gRoomControls.cameraTarget = this; gRoomControls.unk5 = 2; } else { - gRoomControls.cameraTarget = &gLinkEntity; + gRoomControls.cameraTarget = &gPlayerEntity; gRoomControls.unk5 = 2; } } diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c index b32b1981..d55f7171 100644 --- a/src/object/heartContainer.c +++ b/src/object/heartContainer.c @@ -63,7 +63,7 @@ static void sub_0808E714(Entity* this) { static void sub_0808E764(Entity* this) { sub_08080CB4(this); - if (!(gLinkState.flags.all & 0x80) && sub_08017850(this)) { + if (!(gPlayerState.flags.all & 0x80) && sub_08017850(this)) { SetFlag(this->cutsceneBeh.HWORD); CreateItemEntity(0x62, 0, 0); DeleteThisEntity(); diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c index c68f6b23..4b53add6 100755 --- a/src/object/houseDoorExterior.c +++ b/src/object/houseDoorExterior.c @@ -166,9 +166,9 @@ void sub_0808692C(Entity* this) { static u8 sub_08086954(Entity* this) { if (sub_0800445C(this)) { if (sub_0806ED9C(this, 6, 20) >= 0 && - gLinkEntity.animationState == 0 && - (u16)gLinkState.field_0x90.HALF.LO == 0x400 && - gLinkState.jumpStatus == 0) { + gPlayerEntity.animationState == 0 && + (u16)gPlayerState.field_0x90.HALF.LO == 0x400 && + gPlayerState.jumpStatus == 0) { this->actionDelay--; } } else { diff --git a/src/object/mask.c b/src/object/mask.c index 033039e4..dfabc160 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -3,7 +3,7 @@ #include "room.h" #include "random.h" -extern Entity gLinkEntity; +extern Entity gPlayerEntity; extern u16 gScreenTransition[]; extern void (*MaskActionFuncs[])(Entity *); @@ -76,20 +76,20 @@ void sub_080929A4(Entity *this) { // Probably related to knocking it down void sub_08092A94(Entity *this) { // Check for the first frame of bonking animation - if (gLinkEntity.action != 6) { + if (gPlayerEntity.action != 6) { return; } - if (gLinkEntity.animationState != 0) { + if (gPlayerEntity.animationState != 0) { return; } // Check if link is close enough to the mask - if (this->y.HALF.HI + 40 < gLinkEntity.y.HALF.HI) { + if (this->y.HALF.HI + 40 < gPlayerEntity.y.HALF.HI) { return; } - if (this->x.HALF.HI - gLinkEntity.x.HALF.HI >= this->field_0xf || this->x.HALF.HI - gLinkEntity.x.HALF.HI <= -this->field_0xf) { + if (this->x.HALF.HI - gPlayerEntity.x.HALF.HI >= this->field_0xf || this->x.HALF.HI - gPlayerEntity.x.HALF.HI <= -this->field_0xf) { return; } diff --git a/src/object/minecart.c b/src/object/minecart.c index 5bf59c5d..783e9696 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -3,6 +3,13 @@ #include "functions.h" #include "room.h" +extern u32 sub_08091DDC(Entity*); +extern u32 sub_080002B4(Entity*, u32, u32); +extern u32 sub_08007DD6(u32, u32); +extern void sub_08017744(Entity*); +extern u32 sub_080002B8(Entity*); +extern void sub_08091C0C(Entity*); + typedef struct { u16 field_0x0; u16 field_0x2; @@ -17,6 +24,9 @@ extern void (*const gUnk_081223A8[])(Entity*); extern struct_030010EC gUnk_030010EC[]; extern BoundingBox gUnk_080FD310; +extern const s8 gUnk_081223C8[]; +extern const u32 gUnk_081223D8[]; + void Minecart(Entity* this) { gUnk_081223A8[this->action](this); this->bitfield = 0; @@ -26,7 +36,7 @@ void sub_080916EC(Entity* this) { struct_030010EC* unk = &gUnk_030010EC[this->actionDelay]; *(struct_030010EC**)&this->cutsceneBeh.HWORD = unk; - if ((gRoomControls.roomID != unk->field_0x4) || (gLinkState.flags.all & 0x1000) != 0) { + if ((gRoomControls.roomID != unk->field_0x4) || (gPlayerState.flags.all & 0x1000) != 0) { DeleteThisEntity(); } this->x.HALF.HI = gRoomControls.roomOriginX + ((unk->field_0x0 & 0x3f) << 4) + 8; @@ -56,8 +66,8 @@ void sub_080917DC(Entity* this) { PlaySFX(0x13b); } else { if (sub_0800445C(this) != 0) { - if (((gLinkState.flags.all & 0x40080) == 0) && (gLinkState.field_0x1c == 0) && - (gLinkState.heldObject == 0) && (gLinkState.jumpStatus == 0)) { + if (((gPlayerState.flags.all & 0x40080) == 0) && (gPlayerState.field_0x1c == 0) && + (gPlayerState.heldObject == 0) && (gPlayerState.jumpStatus == 0)) { this->actionDelay++; } else { this->actionDelay = 0; @@ -68,12 +78,12 @@ void sub_080917DC(Entity* this) { if ((this->entityType).parameter == 0) { if (8 < this->actionDelay) { this->action = this->action + 1; - gLinkState.jumpStatus = 0x81; - gLinkState.flags.all |= 0x4000000; - gLinkEntity.field_0x20 = 0x20000; - gLinkEntity.nonPlanarMovement = 0x100; - gLinkEntity.flags &= 0x7f; - ResetLink(); + gPlayerState.jumpStatus = 0x81; + gPlayerState.flags.all |= 0x4000000; + gPlayerEntity.field_0x20 = 0x20000; + gPlayerEntity.nonPlanarMovement = 0x100; + gPlayerEntity.flags &= 0x7f; + ResetPlayer(); sub_0807A108(); PlaySFX(0x7c); } @@ -85,21 +95,21 @@ void sub_080917DC(Entity* this) { void sub_080918A4(Entity *this) { - if (sub_080041A0(this, &gLinkEntity, 2, 2) != 0) { - gLinkEntity.x.HALF.HI = this->x.HALF.HI; - gLinkEntity.y.HALF.HI = this->y.HALF.HI; - if (gLinkEntity.height.HALF.HI > -0x10) { - if ((s32)gLinkEntity.field_0x20 > -1) { + if (sub_080041A0(this, &gPlayerEntity, 2, 2) != 0) { + gPlayerEntity.x.HALF.HI = this->x.HALF.HI; + gPlayerEntity.y.HALF.HI = this->y.HALF.HI; + if (gPlayerEntity.height.HALF.HI > -0x10) { + if ((s32)gPlayerEntity.field_0x20 > -1) { return; } - gLinkEntity.animationState = this->animationState << 1; - gLinkState.flags.all = (gLinkState.flags.all ^ 0x4000000) | 0x1000; + gPlayerEntity.animationState = this->animationState << 1; + gPlayerState.flags.all = (gPlayerState.flags.all ^ 0x4000000) | 0x1000; this->action++; this->field_0xf = 1; this->flags |= 0x20; this->damageType = 0x97; - this->field_0x3c = (gLinkEntity.field_0x3c + 1) | 0x20; - this->flags2 = gLinkEntity.flags2; + this->field_0x3c = (gPlayerEntity.field_0x3c + 1) | 0x20; + this->flags2 = gPlayerEntity.flags2; this->field_0x40 = 0x18; this->field_0x44 = 8; sub_0801766C(this); @@ -108,118 +118,99 @@ void sub_080918A4(Entity *this) } } else { - gLinkEntity.direction = GetFacingDirection(&gLinkEntity, this); + gPlayerEntity.direction = GetFacingDirection(&gPlayerEntity, this); } - if (gLinkEntity.field_0x20 < 0) { - gLinkEntity.spritePriority.b0 = this->spritePriority.b0 - 1; + if (gPlayerEntity.field_0x20 < 0) { + gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1; } } -#if 0 - -typedef struct { - u8 field_0x0; - u8 field_0x1; -} struct_081223C8; - -extern struct_081223C8 gUnk_081223C8[]; - -extern u32 gUnk_081223D8[]; - void sub_080919AC(Entity *this) { - u32 iVar2; - u32 uVar3; - u32 uVar4; - struct_081223C8* temp; + u32 iVar2; + u32 uVar3; - gRoomControls.unk5 = 7; - if ((gLinkState.flags.all & 0x1000) == 0) { - this->action = 1; - } - else { - if ((gLinkEntity.frames.all & 0xf) == 0) { - this->flags = this->flags & 0x7f; - CopyPosition(this,&gLinkEntity); - if ((gLinkEntity.frames.all & 0xf0) == 0x10) { - this->spriteOffsetY = 1; - } - else { - this->spriteOffsetY = 0; - } + gRoomControls.unk5 = 7; + if ((gPlayerState.flags.all & 0x1000) == 0) { + this->action = 1; + return; } - else { - this->flags = this->flags | 0x80; - gLinkEntity.nonPlanarMovement = 0; - sub_0806F69C(this); - CopyPosition(this,&gLinkEntity); - gLinkEntity.spritePriority.b0 = this->spritePriority.b0 - 1; - if (!sub_08091DDC(this)) { - if ((gScreenTransition.field_0x0 & 0xf) == 0) { - PlaySFX(0x138); - } - if (--this->field_0xf == 0xff) { - PlaySFX(0x7b); - this->field_0xf = 0x3c; + if ((gPlayerEntity.frames.all & 0xf) == 0) { + this->flags = this->flags & 0x7f; + CopyPosition(this,&gPlayerEntity); + if ((gPlayerEntity.frames.all & 0xf0) == 0x10) { + this->spriteOffsetY = 1; + } else { + this->spriteOffsetY = 0; } - uVar3 = sub_03005800(this, gUnk_081223C8[this->animationState].field_0x0, gUnk_081223C8[this->animationState].field_0x1); - iVar2 = sub_08007DD6(uVar3, gUnk_081223D8[this->animationState]); - if (iVar2 == 0) { - this->direction = this->direction ^ 0x10; - this->animationState = this->animationState ^ 2; - } - else { - switch(uVar3) { - case 100: - this->flags = this->flags & 0xdf; - this->damageType = 1; - this->field_0x3c = 0x47; - this->field_0x40 = 0x44; - this->flags2 = 0x80; - this->action = 6; - sub_08017744(this); - gLinkState.jumpStatus = 0x41; - gLinkState.flags.all = (gLinkState.flags.all ^ 0x1000) | 0x4000000; - gLinkEntity.field_0x20 = 0x20000; - gLinkEntity.nonPlanarMovement = 0x200; - gLinkEntity.animationState = this->animationState << 1; - gLinkEntity.direction = this->direction; - gLinkEntity.flags |= 0x80; - sub_08004168(this); - InitAnimationForceUpdate(this, this->animationState + 0xc); - PlaySFX(0x78); - PlaySFX(0x139); - return; - case 0x67: - case 0x68: - case 0x69: - case 0x6a: - case 0x6c: - case 0x6d: - case 0x6e: - case 0x6f: - if (uVar3 == sub_080002B8()) { - sub_08091C0C(this); - gLinkEntity.animationState *= 2; - return; - } + } else { + this->flags = this->flags | 0x80; + gPlayerEntity.nonPlanarMovement = 0; + sub_0806F69C(this); + CopyPosition(this,&gPlayerEntity); + gPlayerEntity.spritePriority.b0 = this->spritePriority.b0 - 1; + if (!sub_08091DDC(this)) { + if ((gScreenTransition.frameCount & 0xf) == 0) { + PlaySFX(0x138); + } + + if (--this->field_0xf == 0xff) { + PlaySFX(0x7b); + this->field_0xf = 0x3c; + } + + uVar3 = sub_080002B4(this, gUnk_081223C8[this->animationState * 2], gUnk_081223C8[this->animationState * 2 + 1]); + iVar2 = sub_08007DD6(uVar3, gUnk_081223D8[this->animationState]); + if (iVar2 == 0) { + this->direction = this->direction ^ 0x10; + this->animationState = this->animationState ^ 2; + } else { + switch (uVar3) { + case 0x64: + this->flags = this->flags & 0xdf; + this->damageType = 1; + this->field_0x3c = 0x47; + this->field_0x40 = 0x44; + this->flags2 = 0x80; + this->action = 6; + sub_08017744(this); + gPlayerState.jumpStatus = 0x41; + gPlayerState.flags.all = (gPlayerState.flags.all ^ 0x1000) | 0x4000000; + gPlayerEntity.field_0x20 = 0x20000; + gPlayerEntity.nonPlanarMovement = 0x200; + gPlayerEntity.animationState = this->animationState << 1; + gPlayerEntity.direction = this->direction; + gPlayerEntity.flags |= 0x80; + sub_08004168(this); + InitAnimationForceUpdate(this, this->animationState + 0xc); + PlaySFX(0x78); + PlaySFX(0x139); + return; + case 0x67: + case 0x68: + case 0x69: + case 0x6a: + case 0x6c: + case 0x6d: + case 0x6e: + case 0x6f: + if (uVar3 == sub_080002B8(this)) { + sub_08091C0C(this); + gPlayerEntity.animationState = this->animationState << 1; + return; + } + break; + } + } + + gPlayerEntity.animationState = this->animationState << 1; + if (this->animIndex == this->animationState) { + UpdateAnimationSingleFrame(this); + } + else { + InitAnimationForceUpdate(this, this->animationState); } } - gLinkEntity.animationState *= 2; - if (this->animIndex == this->animationState) { - UpdateAnimationSingleFrame(this); - } - else { - InitAnimationForceUpdate(this, this->animationState); - } - } } - } } -#else -NAKED -void sub_080919AC(Entity *this) { - asm(".include \"asm/non_matching/minecart/sub_080919AC.inc\""); -} -#endif \ No newline at end of file diff --git a/src/object/object49.c b/src/object/object49.c index 925e47ea..e3fa37dd 100644 --- a/src/object/object49.c +++ b/src/object/object49.c @@ -236,7 +236,7 @@ void sub_0808F498(Entity* this) { DeleteThisEntity(); } - if (gLinkState.field_0x1c != 1) { + if (gPlayerState.field_0x1c != 1) { DeleteThisEntity(); } } else { diff --git a/src/object/object86.c b/src/object/object86.c index 5a1c0aec..0520cb55 100644 --- a/src/object/object86.c +++ b/src/object/object86.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "link.h" +#include "player.h" #include "flags.h" extern u32 sub_080041A0(Entity*, Entity*, u32, u32); @@ -58,7 +58,7 @@ void sub_08099E58(Entity *this) void sub_08099E8C(Entity *this) { - if (sub_080041A0(this, &gLinkEntity, 0xc, 0xc)) { + if (sub_080041A0(this, &gPlayerEntity, 0xc, 0xc)) { if (this->previousActionFlag == 0) { sub_08099ECC(this); sub_0805E4E0(this, 0x1e); @@ -74,8 +74,8 @@ void nullsub_534(Entity* this) {} void sub_08099ECC(Entity *this) { this->previousActionFlag = 1; - CopyPosition(this, &gLinkEntity); - gLinkState.linkAction = 3; - gLinkState.field_0x34[4] = 0; - gLinkState.flags.all |= 0x8000; + CopyPosition(this, &gPlayerEntity); + gPlayerState.playerAction = 3; + gPlayerState.field_0x34[4] = 0; + gPlayerState.flags.all |= 0x8000; } diff --git a/src/object/objectA8.c b/src/object/objectA8.c index b68a141a..ab7713c5 100644 --- a/src/object/objectA8.c +++ b/src/object/objectA8.c @@ -7,7 +7,7 @@ extern void sub_08080CB4(Entity*); extern void (*gUnk_08124824[])(Entity*); -extern Entity gLinkEntity; +extern Entity gPlayerEntity; void ObjectA8(Entity *this) { @@ -26,7 +26,7 @@ void ObjectA8(Entity *this) case 0x1e: case 0x1f: this->action = 5; - this->attachedEntity = &gLinkEntity; + this->attachedEntity = &gPlayerEntity; CreateItemEntity((this->entityType).form, 0, 0); DeleteThisEntity(); } diff --git a/src/object/pot.c b/src/object/pot.c new file mode 100755 index 00000000..a31a5567 --- /dev/null +++ b/src/object/pot.c @@ -0,0 +1,169 @@ +#include "global.h" +#include "entity.h" +#include "functions.h" +#include "flags.h" +#include "player.h" +#include "room.h" + +extern void (*const gUnk_0811F090[])(Entity*); +extern void (*const gUnk_0811F0A8[])(Entity*); + +extern BoundingBox gUnk_080FD338; // TODO: should be const +extern BoundingBox gUnk_080FD340; // TODO: should be const + +extern u32 sub_08016A30(Entity*); +extern u32 sub_080001DA(u32, u32); +extern u32 GetTileTypeByEntity(Entity*); +extern void sub_08078930(Entity*); +extern void sub_08082824(Entity*); +extern u32 sub_080002B8(Entity*); +extern void sub_08082850(Entity*, Entity*); +extern void sub_08082608(Entity*); + +void Pot(Entity* this) { + gUnk_0811F090[this->action](this); + this->bitfield = 0; +} + +void sub_0808222C(Entity* this) { + if (this->entityType.parameter == 1 && CheckFlags(this->field_0x86)) { + DeleteThisEntity(); + } + + this->action = 1; + this->boundingBox = &gUnk_080FD338; + this->nonPlanarMovement = 0x80; + this->y.HALF.HI += 3; + this->possibleBool = 0; + this->flags |= 0x80; + this->currentHealth = 1; + this->field_0x3c = 7; + this->damageType = 0x6E; + this->flags2 = 0x84; + this->field_0x1c = 0x12; + if (this->collisionLayer == 0) { + sub_08016A30(this); + } + + this->field_0x70.HALF.LO = sub_080001DA(COORD_TO_TILE(this), this->collisionLayer); + if ((u16)this->field_0x70.HALF.LO == 0x4000) { + DeleteThisEntity(); + } + + SetTile(0x4000, COORD_TO_TILE(this), this->collisionLayer); + InitializeAnimation(this, 5); +} + +void sub_08082310(Entity* this) { + u32 tileType; + u32 var0 = this->bitfield & 0x7F; + switch (var0) { + case 0x13: + this->action = 3; + this->previousActionFlag = 0; + break; + case 0x1D: + SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); + this->action = 5; + this->field_0x20 = 0x2A000; + this->spriteOffsetY = 0; + this->spriteSettings.b.shadow = 1; + this->spritePriority.b1 = 3; + this->flags &= 0x7F; + sub_08082824(this); + break; + default: + tileType = GetTileTypeByEntity(this); + if (tileType != 0x4000) { + switch (tileType) { + case 0x4004: + case 0x4003: + case 0x4002: + case 0x4001: + this->direction = (tileType - 0x4001) * 8; + this->actionDelay = 32; + this->action = 4; + if (gPlayerState.flags.all & 0x80) { + this->nonPlanarMovement >>= 1; + this->actionDelay = 64; + } + SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); + sub_08004488(0x10F); + break; + case 0x4067: + SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); + DeleteThisEntity(); + break; + default: + if (sub_080002B8(this) == 13) { + CreateFx(this, 0, 0); + } else if (tileType == 0x4005) { + gPlayerState.field_0xab = 4; + SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); + } + sub_08082850(this, NULL); + break; + } + } else { + sub_08078930(this); + } + break; + } +} + +void sub_080824F8(Entity* this) { + gUnk_0811F0A8[this->previousActionFlag](this); +} + +void sub_08082510(Entity* this) { + this->flags |= 0x80; + this->boundingBox = &gUnk_080FD340; + this->field_0x3c = 7; + this->damageType = 1; + this->flags2 = gPlayerEntity.flags2; + this->spriteOffsetY = 0; + SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); + this->previousActionFlag++; +} + + +void nullsub_511(Entity* this) { +} + +void sub_08082588(Entity* this) { + this->spritePriority.b1 = 3; +} + +void sub_0808259C(Entity* this) { + switch (sub_080043E8(this)) { + case 2: + CreateFx(this, 11, 0); + break; + case 1: + CreateFx(this, 0, 0); + break; + case 3: + CreateFx(this, 12, 0); + break; + default: + sub_08082850(this, &gPlayerEntity); + return; + } + + DeleteThisEntity(); +} + +void sub_080825E8(Entity* this) { + DeleteThisEntity(); +} + +void sub_080825F0(Entity* this) { + if (gPlayerState.heldObject == 0) { + sub_08082608(this); + } +} + +void sub_08082608(Entity* this) { + this->action = 1; + this->previousActionFlag = 0; +} diff --git a/src/object/railtrack.c b/src/object/railtrack.c index 95c418f4..f2e9a10a 100644 --- a/src/object/railtrack.c +++ b/src/object/railtrack.c @@ -12,8 +12,8 @@ extern void SetTile(u32, u32, u32); extern void (*const gUnk_081205D0[])(Entity*); +extern s8 gUnk_080B4488[][2]; extern u16 gUnk_081205E0[]; -extern s8 gUnk_080B4488[]; void Railtrack(Entity* this) { gUnk_081205D0[this->action](this); @@ -135,14 +135,30 @@ void sub_0808543C(Entity *this) u32 uVar2; s8 temp; - temp = gUnk_080B4488[(this->animationState >> 1) << 1]; + temp = gUnk_080B4488[this->animationState / 2][0]; uVar2 = COORD_TO_TILE(this); SetTile(this->field_0x74, uVar2 - temp, this->collisionLayer); SetTile(this->field_0x76, uVar2, this->collisionLayer); SetTile(this->field_0x78.HWORD, uVar2 + temp, this->collisionLayer); } -NAKED u32 sub_080854A8(Entity *this) { - asm(".include \"asm/non_matching/railtrack/sub_080854A8.inc\""); + u16 var0; + u16* var1; + s8* var2; + + var0 = gUnk_081205E0[this->animationState / 2]; + var2 = gUnk_080B4488[this->animationState / 2]; + var1 = (u16 *)this->field_0x70.WORD; + if (var0 != *(var1 - var2[0])) { + return TRUE; + } + if (var0 != *var1) { + return TRUE; + } + if (var0 != *(var1 + var2[0])) { + return TRUE; + } + + return FALSE; } \ No newline at end of file diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index 5b8522b3..52fa5a25 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "flags.h" -#include "link.h" +#include "player.h" #include "room.h" extern void sub_0809E96C(Entity*); @@ -34,7 +34,7 @@ void sub_0809E83C(Entity* this) { void sub_0809E86C(Entity* this) { - if (sub_0800419C(this, &gLinkEntity, 0x30, 0x30)) { + if (sub_0800419C(this, &gPlayerEntity, 0x30, 0x30)) { if (CheckGlobalFlag(EZERO_1ST)) { if (((gScreenTransition & 3) == 0)) { sub_080A2B80(this); diff --git a/src/object/well.c b/src/object/well.c index 07c1237b..fda35fed 100644 --- a/src/object/well.c +++ b/src/object/well.c @@ -1,7 +1,7 @@ #include "global.h" #include "entity.h" #include "room.h" -#include "link.h" +#include "player.h" void SetTile(u32 tileIndex, s32 tilePosition, s32 layerIndex); s32 GetTileType(s32 tilePosition, s32 layerIndex); @@ -29,8 +29,8 @@ void sub_080A0EF0(Entity* ent) { tileIndex = GetTileType(ent->field_0x80.HWORD, 1); if (tileIndex != 0x407D) { sub_08078B48(); - gLinkEntity.x.WORD = ent->x.WORD; - gLinkEntity.y.HALF.HI = ent->y.HALF.HI + 4; + gPlayerEntity.x.WORD = ent->x.WORD; + gPlayerEntity.y.HALF.HI = ent->y.HALF.HI + 4; DeleteThisEntity(); } } diff --git a/src/room.c b/src/room.c index 7d9e46d4..6a8136c6 100644 --- a/src/room.c +++ b/src/room.c @@ -5,7 +5,7 @@ #include "functions.h" #include "flags.h" #include "npc.h" -#include "link.h" +#include "player.h" #include "screen.h" #include "main.h" #include "structures.h" @@ -218,7 +218,7 @@ void sub_0804B580(void) { sub_080575C8(0x20); - if (gLinkEntity.y.HALF.HI - gRoomControls.roomOriginY > 0x40) + if (gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY > 0x40) LoadRoomEntityList(&gUnk_080D6138); } @@ -391,8 +391,8 @@ void sub_0804B7E8(void) { if (CheckLocalFlag(0x91)) { ClearLocalFlag(0x91); DoFade(5, 0x100); - gLinkEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; - gLinkEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; + gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; + gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; sub_080751E8(1, 2, &gUnk_08010A5C); } } @@ -417,8 +417,8 @@ void sub_0804B86C(void) { if (CheckLocalFlag(0x91) != 0) { ClearLocalFlag(0x91); DoFade(5, 0x100); - gLinkEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; - gLinkEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; + gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; + gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; sub_080751E8(1, 2, &gUnk_08010A5C); } } @@ -445,8 +445,8 @@ void sub_0804B8F0(void) { if (CheckLocalFlag(0x91)) { ClearLocalFlag(0x91); DoFade(5, 0x100); - gLinkEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x60; - gLinkEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; + gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x60; + gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; sub_080751E8(1, 2, &gUnk_08010A5C); } } @@ -652,8 +652,8 @@ extern u32 gUnk_08009E88; void sub_0804BC70(void) { if (!CheckLocalFlag(0x9f)) { DoFade(5, 0x100); - gLinkEntity.x.HALF.HI = gRoomControls.roomOriginX + 0xb0; - gLinkEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x40; + gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0xb0; + gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x40; sub_080751E8(0, 6, &gUnk_08009E88); } if (!CheckGlobalFlag(TABIDACHI)) { @@ -2057,7 +2057,7 @@ extern EntityData gUnk_080DE4C8; void sub_0804CBB0(void) { - if ((gLinkEntity.y.HALF.HI - gRoomControls.roomOriginY) < (gRoomControls.filler2[4] >> 1)) { + if ((gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY) < (gRoomControls.filler2[4] >> 1)) { if (!CheckLocalFlag(0x17)) { LoadRoomEntityList(&gUnk_080DE4C8); } @@ -2425,7 +2425,7 @@ void sub_0804CED8(void) { if (CheckGlobalFlag(LV2_CLEAR)) { gUnk_0200B650 = 0; gScreen.lcd.lcdControl2 &= 0xfdff; - sub_0807AABC(&gLinkEntity); + sub_0807AABC(&gPlayerEntity); LoadRoomEntityList(&gUnk_080E1814); } else { PlaySFX(0x80100000); @@ -3511,14 +3511,14 @@ void sub_0804D6F0(void) { if ((gScreenTransition.field_0x38 & 1) && gScreenTransition.field_0x39) { if (gScreenTransition.field_0x3c == 1) { - gLinkEntity.x.HALF.HI = gScreenTransition.field_0x48; - gLinkEntity.y.HALF.HI = gScreenTransition.field_0x4a + 8; + gPlayerEntity.x.HALF.HI = gScreenTransition.field_0x48; + gPlayerEntity.y.HALF.HI = gScreenTransition.field_0x4a + 8; } else { if (gScreenTransition.field_0x3c) { return; } - gLinkEntity.x.HALF.HI = gScreenTransition.field_0x44; - gLinkEntity.y.HALF.HI = gScreenTransition.field_0x46 + 8; + gPlayerEntity.x.HALF.HI = gScreenTransition.field_0x44; + gPlayerEntity.y.HALF.HI = gScreenTransition.field_0x46 + 8; } } } @@ -4738,7 +4738,7 @@ void sub_0804E7A4(void) { // dog food if ((GetInventoryValue(0x36) == 1) && !CheckGlobalFlag(BIN_DOGFOOD) && - (gLinkState.flags.all & 0x80) == 0) { + (gPlayerState.flags.all & 0x80) == 0) { LoadRoomEntityList(&gUnk_080F30CC); } } @@ -4764,7 +4764,7 @@ void sub_0804E7DC(void) gArea.musicIndex = gArea.pMusicIndex; PlaySFX(0x800b0036); } - if ((gLinkState.flags.all & 8) == 0) { + if ((gPlayerState.flags.all & 8) == 0) { LoadRoomEntityList(&gUnk_080F31D8); } } @@ -4773,8 +4773,8 @@ extern u32 gUnk_08009E58; void sub_0804E864(void) { - gLinkEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90; - gLinkEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; + gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90; + gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; sub_080751E8(1, 6, &gUnk_08009E58); ModHealth(0xa0); } diff --git a/src/sub_08052620.c b/src/sub_08052620.c deleted file mode 100644 index c4ec163a..00000000 --- a/src/sub_08052620.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "global.h" - -extern u8 gArea; - -bool32 sub_08052620(u32 r0) { - return gArea == 0x81; -} diff --git a/src/sub_08052638.c b/src/sub_08052638.c deleted file mode 100644 index 987572d8..00000000 --- a/src/sub_08052638.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "global.h" - -extern u8 gUnk_08127D30[69]; - -u32 sub_08052638(u32 r0) { - // u32 r1 = gUnk_08127D30; - // u32 r1 = gUnk_08127D30; - - return gUnk_08127D30[r0 * 4] == 129; -}