From a3be2626358e15dc89a31027113e8995fbf7eade Mon Sep 17 00:00:00 2001 From: theo Date: Fri, 12 Jun 2020 21:55:38 -0700 Subject: [PATCH] definition streamlining --- asm/archway.s | 2 +- asm/code_08018500.s | 8 +- asm/code_08019444.s | 4 +- asm/code_0801C85C.s | 8 +- asm/code_0801D79C.s | 16 +-- asm/code_0804AA84.s | 46 ++++---- asm/code_0804AEB0.s | 4 +- asm/code_0804B058.s | 16 +-- asm/code_0804B9F8.s | 186 ++++++++++++++++----------------- asm/code_08050038.s | 8 +- asm/code_080526F8.s | 90 ++++++++-------- asm/code_0805436C.s | 8 +- asm/code_08056418.s | 160 ++++++++++++++-------------- asm/code_0805E744.s | 4 +- asm/code_0806ED78.s | 8 +- asm/code_0806FA6C.s | 30 +++--- asm/code_080732D0.s | 12 +-- asm/code_08076C80.s | 4 +- asm/code_08077B98.s | 14 +-- asm/code_0807B9B8.s | 28 ++--- asm/code_0807CAA0.s | 16 +-- asm/code_0807CC3C.s | 36 +++---- asm/code_0808C964.s | 4 +- asm/code_080A5574.s | 22 ++-- asm/code_080AD90C.s | 16 +-- asm/enemy50.s | 8 +- asm/ghini.s | 8 +- asm/jarPortal.s | 8 +- asm/lilypadLarge.s | 12 +-- asm/lockedDoor.s | 2 +- asm/macroLink.s | 4 +- asm/minishSizedArchway.s | 2 +- asm/minishSizedEntrance.s | 2 +- asm/object1E.s | 4 +- asm/object3D.s | 12 +-- asm/objectBA.s | 4 +- asm/pesto.s | 4 +- asm/pullableMushroom.s | 2 +- asm/vaatiRebornEnemy.s | 4 +- asm/wallMaster.s | 4 +- asm/wallMaster2.s | 4 +- asm/warpPoint.s | 4 +- include/area.h | 18 ++++ include/flags.h | 30 ++++++ include/link.h | 21 ++++ include/{mainLoop.h => main.h} | 0 include/random.h | 8 ++ include/stats.h | 24 ----- include/textbox.h | 2 + linker.ld | 4 +- src/bitGetters.c | 14 +-- src/mainLoop.c | 2 +- src/modHealth.c | 4 +- src/modRupees.c | 3 +- src/sub_0804AA84.c | 4 +- src/sub_08052620.c | 4 +- 56 files changed, 514 insertions(+), 462 deletions(-) create mode 100644 include/area.h create mode 100644 include/flags.h rename include/{mainLoop.h => main.h} (100%) create mode 100644 include/random.h delete mode 100644 include/stats.h diff --git a/asm/archway.s b/asm/archway.s index a4650d17..21a1c69a 100644 --- a/asm/archway.s +++ b/asm/archway.s @@ -30,7 +30,7 @@ sub_08090F70: @ 0x08090F70 strb r0, [r1] adds r0, r4, #0 bl UpdateSpriteOrderAndFlip - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _08090FB4 adds r2, r4, #0 diff --git a/asm/code_08018500.s b/asm/code_08018500.s index 5f435669..6445a966 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -241,7 +241,7 @@ _080186BC: thumb_func_start sub_080186C0 sub_080186C0: @ 0x080186C0 - ldr r3, _080186D0 @ =gUnk_02033A90 + ldr r3, _080186D0 @ =gArea adds r2, r3, #0 adds r2, #0x28 movs r1, #0xff @@ -249,12 +249,12 @@ sub_080186C0: @ 0x080186C0 strh r0, [r3, #0x2c] bx lr .align 2, 0 -_080186D0: .4byte gUnk_02033A90 +_080186D0: .4byte gArea thumb_func_start sub_080186D4 sub_080186D4: @ 0x080186D4 push {lr} - ldr r0, _080186E8 @ =gUnk_02033A90 + ldr r0, _080186E8 @ =gArea adds r0, #0x28 ldrb r0, [r0] cmp r0, #0xff @@ -263,7 +263,7 @@ sub_080186D4: @ 0x080186D4 _080186E4: pop {pc} .align 2, 0 -_080186E8: .4byte gUnk_02033A90 +_080186E8: .4byte gArea thumb_func_start sub_080186EC sub_080186EC: @ 0x080186EC diff --git a/asm/code_08019444.s b/asm/code_08019444.s index 4e16752c..5e060798 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -3458,7 +3458,7 @@ _0801AE5A: beq _0801AE70 bl sub_0807C898 _0801AE70: - ldr r4, _0801AEE8 @ =gUnk_02033A90 + ldr r4, _0801AEE8 @ =gArea ldrb r0, [r4, #0xc] cmp r0, #0 beq _0801AE8C @@ -3514,7 +3514,7 @@ _0801AED0: .align 2, 0 _0801AEE0: .4byte gRoomControls _0801AEE4: .4byte gUnk_030010A0 -_0801AEE8: .4byte gUnk_02033A90 +_0801AEE8: .4byte gArea _0801AEEC: .4byte 0x0600F000 _0801AEF0: .4byte gUnk_03004030 _0801AEF4: .4byte 0x0000088C diff --git a/asm/code_0801C85C.s b/asm/code_0801C85C.s index 8a3b63c8..f3b0f813 100644 --- a/asm/code_0801C85C.s +++ b/asm/code_0801C85C.s @@ -230,7 +230,7 @@ _0801C9EC: strh r0, [r1, #0xe] _0801CA1E: ldr r0, _0801CA60 @ =gUnk_02002A40 - ldr r3, _0801CA64 @ =gUnk_02033A90 + ldr r3, _0801CA64 @ =gArea ldrb r1, [r3, #3] ldr r5, _0801CA68 @ =0x0000045C adds r2, r0, r5 @@ -261,7 +261,7 @@ _0801CA54: .4byte gUnk_020350E2 _0801CA58: .4byte 0x0000F01C _0801CA5C: .4byte gScreen _0801CA60: .4byte gUnk_02002A40 -_0801CA64: .4byte gUnk_02033A90 +_0801CA64: .4byte gArea _0801CA68: .4byte 0x0000045C thumb_func_start sub_0801CA6C @@ -718,7 +718,7 @@ sub_0801CD94: @ 0x0801CD94 ldrb r2, [r0] cmp r2, #0 bne _0801CDCE - ldr r0, _0801CDC4 @ =gUnk_02033A90 + ldr r0, _0801CDC4 @ =gArea ldrb r0, [r0, #0x18] cmp r0, #2 beq _0801CDC8 @@ -730,7 +730,7 @@ sub_0801CD94: @ 0x0801CD94 b _0801CDCE .align 2, 0 _0801CDC0: .4byte gUnk_0200AF00 -_0801CDC4: .4byte gUnk_02033A90 +_0801CDC4: .4byte gArea _0801CDC8: movs r2, #0xb b _0801CDCE diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index bdbf7158..c2b0ca99 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -575,7 +575,7 @@ sub_0801DBA0: @ 0x0801DBA0 strb r0, [r5, #2] adds r5, #3 ldr r1, _0801DBE8 @ =gUnk_080C9C50 - ldr r0, _0801DBEC @ =gUnk_02033A90 + ldr r0, _0801DBEC @ =gArea ldrb r0, [r0, #3] lsls r0, r0, #2 adds r0, r0, r1 @@ -587,7 +587,7 @@ sub_0801DBA0: @ 0x0801DBA0 .align 2, 0 _0801DBE4: .4byte gUnk_030010A0 _0801DBE8: .4byte gUnk_080C9C50 -_0801DBEC: .4byte gUnk_02033A90 +_0801DBEC: .4byte gArea _0801DBF0: ldrb r0, [r6] ldrb r1, [r6, #1] @@ -692,7 +692,7 @@ _0801DCAE: ands r0, r1 cmp r0, #0 beq _0801DD16 - ldr r0, _0801DD4C @ =gUnk_02033A90 + ldr r0, _0801DD4C @ =gArea ldrb r0, [r0, #3] adds r0, #1 bl CheckGlobalFlag @@ -767,7 +767,7 @@ _0801DD42: mov sb, r4 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0801DD4C: .4byte gUnk_02033A90 +_0801DD4C: .4byte gArea _0801DD50: .4byte gUnk_0811E214 _0801DD54: .4byte gUnk_030010A0 @@ -781,7 +781,7 @@ sub_0801DD58: @ 0x0801DD58 lsls r2, r2, #1 ldr r3, [r0] adds r3, r3, r2 - ldr r0, _0801DD80 @ =gUnk_02033A90 + ldr r0, _0801DD80 @ =gArea ldr r1, _0801DD84 @ =0x0000085C adds r0, r0, r1 ldr r2, [r0] @@ -793,7 +793,7 @@ sub_0801DD58: @ 0x0801DD58 bx lr .align 2, 0 _0801DD7C: .4byte gUnk_0811E214 -_0801DD80: .4byte gUnk_02033A90 +_0801DD80: .4byte gArea _0801DD84: .4byte 0x0000085C thumb_func_start sub_0801DD88 @@ -824,7 +824,7 @@ sub_0801DDA0: @ 0x0801DDA0 b _0801DEEA _0801DDB8: ldr r1, _0801DDD8 @ =gUnk_080C9C50 - ldr r0, _0801DDDC @ =gUnk_02033A90 + ldr r0, _0801DDDC @ =gArea ldrb r0, [r0, #3] lsls r0, r0, #2 adds r0, r0, r1 @@ -839,7 +839,7 @@ _0801DDB8: b _0801DEE2 .align 2, 0 _0801DDD8: .4byte gUnk_080C9C50 -_0801DDDC: .4byte gUnk_02033A90 +_0801DDDC: .4byte gArea _0801DDE0: .4byte gUnk_02019EE0 _0801DDE4: ldrb r0, [r4] diff --git a/asm/code_0804AA84.s b/asm/code_0804AA84.s index e5b3dda0..a0e7d8bb 100644 --- a/asm/code_0804AA84.s +++ b/asm/code_0804AA84.s @@ -8,7 +8,7 @@ thumb_func_start sub_0804AA84 sub_0804AA84: @ 0x0804AA84 push {lr} - ldr r3, _0804AA98 @ =gUnk_02033A90 + ldr r3, _0804AA98 @ =gArea ldrb r0, [r3, #0x19] cmp r0, #0 bne _0804AA9C @@ -17,7 +17,7 @@ sub_0804AA84: @ 0x0804AA84 movs r0, #0 b _0804AAB0 .align 2, 0 -_0804AA98: .4byte gUnk_02033A90 +_0804AA98: .4byte gArea _0804AA9C: ldr r2, _0804AAB4 @ =gUnk_03001000 movs r1, #0 @@ -37,7 +37,7 @@ _0804AAB4: .4byte gUnk_03001000 sub_0804AAB8: @ 0x0804AAB8 push {lr} ldr r1, _0804AACC @ =gUnk_080D4120 - ldr r0, _0804AAD0 @ =gUnk_02033A90 + ldr r0, _0804AAD0 @ =gArea ldrb r0, [r0, #0xe] lsls r0, r0, #2 adds r0, r0, r1 @@ -46,7 +46,7 @@ sub_0804AAB8: @ 0x0804AAB8 pop {pc} .align 2, 0 _0804AACC: .4byte gUnk_080D4120 -_0804AAD0: .4byte gUnk_02033A90 +_0804AAD0: .4byte gArea thumb_func_start sub_0804AAD4 sub_0804AAD4: @ 0x0804AAD4 @@ -58,7 +58,7 @@ sub_0804AAD4: @ 0x0804AAD4 movs r0, #0 str r0, [r4, #0x14] bl sub_0805E60C - ldr r4, _0804AB00 @ =gUnk_02033A90 + ldr r4, _0804AB00 @ =gArea ldrb r1, [r4, #0x17] movs r0, #0x3d movs r2, #0 @@ -69,13 +69,13 @@ sub_0804AAD4: @ 0x0804AAD4 pop {r4, pc} .align 2, 0 _0804AAFC: .4byte gUnk_02018EB0 -_0804AB00: .4byte gUnk_02033A90 +_0804AB00: .4byte gArea thumb_func_start sub_0804AB04 sub_0804AB04: @ 0x0804AB04 push {lr} bl sub_0805E5C0 - ldr r0, _0804AB20 @ =gUnk_02033A90 + ldr r0, _0804AB20 @ =gArea ldrh r0, [r0, #0x10] cmp r0, #0 beq _0804AB1E @@ -85,7 +85,7 @@ sub_0804AB04: @ 0x0804AB04 _0804AB1E: pop {pc} .align 2, 0 -_0804AB20: .4byte gUnk_02033A90 +_0804AB20: .4byte gArea thumb_func_start sub_0804AB24 sub_0804AB24: @ 0x0804AB24 @@ -98,7 +98,7 @@ sub_0804AB24: @ 0x0804AB24 movs r4, #0 strh r1, [r0] bl sub_0801E104 - ldr r0, _0804AB50 @ =gUnk_02033A90 + ldr r0, _0804AB50 @ =gArea strb r4, [r0, #0xe] movs r0, #6 movs r1, #0 @@ -109,13 +109,13 @@ _0804AB46: .align 2, 0 _0804AB48: .4byte gUnk_03000FD0 _0804AB4C: .4byte gScreen -_0804AB50: .4byte gUnk_02033A90 +_0804AB50: .4byte gArea thumb_func_start sub_0804AB54 sub_0804AB54: @ 0x0804AB54 push {lr} ldr r1, _0804AB68 @ =gUnk_080D412C - ldr r0, _0804AB6C @ =gUnk_02033A90 + ldr r0, _0804AB6C @ =gArea ldrb r0, [r0, #0xe] lsls r0, r0, #2 adds r0, r0, r1 @@ -124,7 +124,7 @@ sub_0804AB54: @ 0x0804AB54 pop {pc} .align 2, 0 _0804AB68: .4byte gUnk_080D412C -_0804AB6C: .4byte gUnk_02033A90 +_0804AB6C: .4byte gArea thumb_func_start sub_0804AB70 sub_0804AB70: @ 0x0804AB70 @@ -143,7 +143,7 @@ sub_0804AB70: @ 0x0804AB70 strh r2, [r0, #0xa] strh r2, [r1, #0x18] strh r2, [r0, #0xc] - ldr r0, _0804AC04 @ =gUnk_02033A90 + ldr r0, _0804AC04 @ =gArea ldrb r5, [r0, #0x17] cmp r5, #2 bne _0804ABA4 @@ -180,7 +180,7 @@ _0804ABA4: ldr r0, [r0] bl LoadRoomEntityList bl sub_0805E5B4 - ldr r1, _0804AC04 @ =gUnk_02033A90 + ldr r1, _0804AC04 @ =gArea ldrb r0, [r1, #0xe] adds r0, #1 strb r0, [r1, #0xe] @@ -192,7 +192,7 @@ _0804ABA4: _0804ABF8: .4byte gScreen _0804ABFC: .4byte 0x00009E83 _0804AC00: .4byte gRoomControls -_0804AC04: .4byte gUnk_02033A90 +_0804AC04: .4byte gArea _0804AC08: .4byte gUnk_02032EC0 _0804AC0C: .4byte gUnk_080D4138 _0804AC10: .4byte gUnk_02017700 @@ -252,7 +252,7 @@ _0804AC5E: cmp r0, #0 beq _0804AC96 _0804AC86: - ldr r1, _0804ACA4 @ =gUnk_02033A90 + ldr r1, _0804ACA4 @ =gArea ldrb r0, [r1, #0xe] adds r0, #1 strb r0, [r1, #0xe] @@ -265,7 +265,7 @@ _0804AC96: _0804AC98: .4byte gUnk_02018EB0 _0804AC9C: .4byte gRoomControls _0804ACA0: .4byte gScreen -_0804ACA4: .4byte gUnk_02033A90 +_0804ACA4: .4byte gArea thumb_func_start sub_0804ACA8 sub_0804ACA8: @ 0x0804ACA8 @@ -293,7 +293,7 @@ sub_0804ACC8: @ 0x0804ACC8 ldrb r0, [r0] cmp r0, #0 bne _0804ACE8 - ldr r0, _0804ACF0 @ =gUnk_02033A90 + ldr r0, _0804ACF0 @ =gArea ldrb r0, [r0, #0x17] adds r0, #0x5e bl SetGlobalFlag @@ -305,7 +305,7 @@ _0804ACE8: pop {pc} .align 2, 0 _0804ACEC: .4byte gUnk_03000FD0 -_0804ACF0: .4byte gUnk_02033A90 +_0804ACF0: .4byte gArea _0804ACF4: .4byte gUnk_02032EDC thumb_func_start sub_0804ACF8 @@ -327,7 +327,7 @@ _0804AD14: .4byte gRoomControls thumb_func_start sub_0804AD18 sub_0804AD18: @ 0x0804AD18 push {lr} - ldr r0, _0804AD30 @ =gUnk_02033A90 + ldr r0, _0804AD30 @ =gArea ldrb r1, [r0, #0x17] adds r2, r0, #0 cmp r1, #6 @@ -338,7 +338,7 @@ sub_0804AD18: @ 0x0804AD18 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804AD30: .4byte gUnk_02033A90 +_0804AD30: .4byte gArea _0804AD34: .4byte _0804AD38 _0804AD38: @ jump table .4byte _0804AD54 @ case 0 @@ -374,7 +374,7 @@ sub_0804AD6C: @ 0x0804AD6C movs r6, #1 strb r6, [r3, #8] strb r1, [r3, #9] - ldr r4, _0804ADD4 @ =gUnk_02033A90 + ldr r4, _0804ADD4 @ =gArea ldr r5, _0804ADD8 @ =gUnk_080D4140 ldrb r1, [r4, #0x16] lsls r1, r1, #2 @@ -415,5 +415,5 @@ sub_0804AD6C: @ 0x0804AD6C pop {r4, r5, r6, pc} .align 2, 0 _0804ADD0: .4byte gUnk_030010A0 -_0804ADD4: .4byte gUnk_02033A90 +_0804ADD4: .4byte gArea _0804ADD8: .4byte gUnk_080D4140 diff --git a/asm/code_0804AEB0.s b/asm/code_0804AEB0.s index 930e6b03..08e8443e 100644 --- a/asm/code_0804AEB0.s +++ b/asm/code_0804AEB0.s @@ -128,7 +128,7 @@ _0804AF8C: .4byte gRoomControls thumb_func_start sub_0804AF90 sub_0804AF90: @ 0x0804AF90 push {lr} - ldr r0, _0804AFA8 @ =gUnk_02033A90 + ldr r0, _0804AFA8 @ =gArea ldr r1, _0804AFAC @ =0x0000085C adds r0, r0, r1 ldr r0, [r0] @@ -137,7 +137,7 @@ sub_0804AF90: @ 0x0804AF90 bl sub_080A7C7C pop {pc} .align 2, 0 -_0804AFA8: .4byte gUnk_02033A90 +_0804AFA8: .4byte gArea _0804AFAC: .4byte 0x0000085C thumb_func_start sub_0804AFB0 diff --git a/asm/code_0804B058.s b/asm/code_0804B058.s index 5b111fdf..d2787ae5 100644 --- a/asm/code_0804B058.s +++ b/asm/code_0804B058.s @@ -242,14 +242,14 @@ _0804B210: bl sub_0804B300 b _0804B252 _0804B218: - ldr r0, _0804B224 @ =gUnk_02033A90 + ldr r0, _0804B224 @ =gArea ldr r1, _0804B228 @ =0x00000864 adds r0, r0, r1 ldrb r1, [r4, #3] str r1, [r0] b _0804B252 .align 2, 0 -_0804B224: .4byte gUnk_02033A90 +_0804B224: .4byte gArea _0804B228: .4byte 0x00000864 _0804B22C: adds r0, r4, #0 @@ -300,13 +300,13 @@ _0804B278: .4byte gUnk_02034398 thumb_func_start sub_0804B27C sub_0804B27C: @ 0x0804B27C push {lr} - ldr r1, _0804B28C @ =gUnk_02033A90 + ldr r1, _0804B28C @ =gArea ldrb r0, [r0, #1] strb r0, [r1, #1] bl sub_08054524 pop {pc} .align 2, 0 -_0804B28C: .4byte gUnk_02033A90 +_0804B28C: .4byte gArea thumb_func_start sub_0804B290 sub_0804B290: @ 0x0804B290 @@ -602,14 +602,14 @@ sub_0804B460: @ 0x0804B460 push {lr} movs r0, #9 bl sub_08030118 - ldr r0, _0804B474 @ =gUnk_02033A90 + ldr r0, _0804B474 @ =gArea movs r1, #3 strb r1, [r0, #3] movs r1, #0x4e strb r1, [r0] pop {pc} .align 2, 0 -_0804B474: .4byte gUnk_02033A90 +_0804B474: .4byte gArea thumb_func_start sub_0804B478 sub_0804B478: @ 0x0804B478 @@ -621,14 +621,14 @@ sub_0804B47C: @ 0x0804B47C push {lr} movs r0, #0xa bl sub_08030118 - ldr r0, _0804B490 @ =gUnk_02033A90 + ldr r0, _0804B490 @ =gArea movs r1, #3 strb r1, [r0, #3] movs r1, #0x4e strb r1, [r0] pop {pc} .align 2, 0 -_0804B490: .4byte gUnk_02033A90 +_0804B490: .4byte gArea thumb_func_start sub_0804B494 sub_0804B494: @ 0x0804B494 diff --git a/asm/code_0804B9F8.s b/asm/code_0804B9F8.s index cb9ed8ab..2ddb309e 100644 --- a/asm/code_0804B9F8.s +++ b/asm/code_0804B9F8.s @@ -137,7 +137,7 @@ _0804BAD2: bl CheckGlobalFlag cmp r0, #0 beq _0804BAF4 - ldr r0, _0804BAEC @ =gUnk_02033A90 + ldr r0, _0804BAEC @ =gArea ldr r1, _0804BAF0 @ =0x00000864 adds r0, r0, r1 movs r1, #0x1b @@ -145,14 +145,14 @@ _0804BAD2: b _0804BB0C .align 2, 0 _0804BAE8: .4byte gUnk_080D7328 -_0804BAEC: .4byte gUnk_02033A90 +_0804BAEC: .4byte gArea _0804BAF0: .4byte 0x00000864 _0804BAF4: movs r0, #0x51 bl CheckGlobalFlag cmp r0, #0 beq _0804BB0C - ldr r0, _0804BB10 @ =gUnk_02033A90 + ldr r0, _0804BB10 @ =gArea ldr r2, _0804BB14 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -162,7 +162,7 @@ _0804BAF4: _0804BB0C: pop {pc} .align 2, 0 -_0804BB10: .4byte gUnk_02033A90 +_0804BB10: .4byte gArea _0804BB14: .4byte 0x00000864 thumb_func_start sub_0804BB18 @@ -214,7 +214,7 @@ _0804BB72: cmp r0, #0 beq _0804BB8A _0804BB7C: - ldr r0, _0804BB94 @ =gUnk_02033A90 + ldr r0, _0804BB94 @ =gArea ldr r2, _0804BB98 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -226,7 +226,7 @@ _0804BB8A: .align 2, 0 _0804BB8C: .4byte gUnk_080D73B0 _0804BB90: .4byte gUnk_080D73E0 -_0804BB94: .4byte gUnk_02033A90 +_0804BB94: .4byte gArea _0804BB98: .4byte 0x00000864 thumb_func_start sub_0804BB9C @@ -241,7 +241,7 @@ sub_0804BBA0: @ 0x0804BBA0 bl CheckGlobalFlag cmp r0, #0 beq _0804BBBA - ldr r0, _0804BBDC @ =gUnk_02033A90 + ldr r0, _0804BBDC @ =gArea ldr r2, _0804BBE0 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -255,7 +255,7 @@ _0804BBBA: beq _0804BBE8 ldr r0, _0804BBE4 @ =gUnk_080D7618 bl LoadRoomEntityList - ldr r0, _0804BBDC @ =gUnk_02033A90 + ldr r0, _0804BBDC @ =gArea ldr r2, _0804BBE0 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -264,7 +264,7 @@ _0804BBBA: str r0, [r1] b _0804BC2E .align 2, 0 -_0804BBDC: .4byte gUnk_02033A90 +_0804BBDC: .4byte gArea _0804BBE0: .4byte 0x00000864 _0804BBE4: .4byte gUnk_080D7618 _0804BBE8: @@ -274,7 +274,7 @@ _0804BBE8: bne _0804BC10 ldr r0, _0804BC04 @ =gUnk_080D74C8 bl LoadRoomEntityList - ldr r0, _0804BC08 @ =gUnk_02033A90 + ldr r0, _0804BC08 @ =gArea ldr r1, _0804BC0C @ =0x00000864 adds r0, r0, r1 movs r1, #0x1b @@ -282,7 +282,7 @@ _0804BBE8: b _0804BC2E .align 2, 0 _0804BC04: .4byte gUnk_080D74C8 -_0804BC08: .4byte gUnk_02033A90 +_0804BC08: .4byte gArea _0804BC0C: .4byte 0x00000864 _0804BC10: movs r0, #2 @@ -378,7 +378,7 @@ _0804BCBC: bl CheckGlobalFlag cmp r0, #0 beq _0804BCD0 - ldr r0, _0804BCD4 @ =gUnk_02033A90 + ldr r0, _0804BCD4 @ =gArea ldr r1, _0804BCD8 @ =0x00000864 adds r0, r0, r1 movs r1, #0x1b @@ -386,7 +386,7 @@ _0804BCBC: _0804BCD0: pop {pc} .align 2, 0 -_0804BCD4: .4byte gUnk_02033A90 +_0804BCD4: .4byte gArea _0804BCD8: .4byte 0x00000864 thumb_func_start sub_0804BCDC @@ -1059,7 +1059,7 @@ sub_0804C104: @ 0x0804C104 thumb_func_start sub_0804C108 sub_0804C108: @ 0x0804C108 push {lr} - ldr r2, _0804C124 @ =gUnk_02033A90 + ldr r2, _0804C124 @ =gArea ldrb r1, [r2] movs r0, #0x40 orrs r0, r1 @@ -1071,7 +1071,7 @@ sub_0804C108: @ 0x0804C108 bl sub_0804C128 pop {pc} .align 2, 0 -_0804C124: .4byte gUnk_02033A90 +_0804C124: .4byte gArea thumb_func_start sub_0804C128 sub_0804C128: @ 0x0804C128 @@ -1084,7 +1084,7 @@ sub_0804C128: @ 0x0804C128 bne _0804C13A b _0804C24C _0804C13A: - ldr r1, _0804C160 @ =gUnk_02033A90 + ldr r1, _0804C160 @ =gArea ldrb r3, [r1, #0xd] movs r0, #0xe ands r0, r3 @@ -1103,7 +1103,7 @@ _0804C13A: b _0804C19A .align 2, 0 _0804C15C: .4byte gRoomVars -_0804C160: .4byte gUnk_02033A90 +_0804C160: .4byte gArea _0804C164: ldr r2, _0804C18C @ =gRoomControls ldr r1, _0804C190 @ =gUnk_080D9338 @@ -1225,7 +1225,7 @@ _0804C254: thumb_func_start sub_0804C258 sub_0804C258: @ 0x0804C258 push {lr} - ldr r3, _0804C288 @ =gUnk_02033A90 + ldr r3, _0804C288 @ =gArea ldrb r0, [r3, #0xd] movs r2, #0xf rsbs r2, r2, #0 @@ -1248,13 +1248,13 @@ sub_0804C258: @ 0x0804C258 _0804C284: pop {pc} .align 2, 0 -_0804C288: .4byte gUnk_02033A90 +_0804C288: .4byte gArea _0804C28C: .4byte gUnk_030010A0 thumb_func_start sub_0804C290 sub_0804C290: @ 0x0804C290 push {lr} - ldr r0, _0804C2B4 @ =gUnk_02033A90 + ldr r0, _0804C2B4 @ =gArea ldrb r1, [r0, #0xd] movs r0, #0xe ands r0, r1 @@ -1272,7 +1272,7 @@ sub_0804C290: @ 0x0804C290 _0804C2B2: pop {pc} .align 2, 0 -_0804C2B4: .4byte gUnk_02033A90 +_0804C2B4: .4byte gArea _0804C2B8: .4byte gUnk_080D9348 thumb_func_start sub_0804C2BC @@ -3207,7 +3207,7 @@ _0804CDA4: .4byte gUnk_080DF94C _0804CDA8: ldr r0, _0804CDC0 @ =0x80100000 bl PlaySFX - ldr r0, _0804CDC4 @ =gUnk_02033A90 + ldr r0, _0804CDC4 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -3219,7 +3219,7 @@ _0804CDBE: pop {r4, pc} .align 2, 0 _0804CDC0: .4byte 0x80100000 -_0804CDC4: .4byte gUnk_02033A90 +_0804CDC4: .4byte gArea thumb_func_start sub_0804CDC8 sub_0804CDC8: @ 0x0804CDC8 @@ -3240,7 +3240,7 @@ sub_0804CDD0: @ 0x0804CDD0 sub_0804CDD4: @ 0x0804CDD4 push {lr} bl sub_08058D34 - ldr r2, _0804CDEC @ =gUnk_02033A90 + ldr r2, _0804CDEC @ =gArea ldrb r1, [r2] movs r0, #0x40 orrs r0, r1 @@ -3250,7 +3250,7 @@ sub_0804CDD4: @ 0x0804CDD4 strb r0, [r1, #4] pop {pc} .align 2, 0 -_0804CDEC: .4byte gUnk_02033A90 +_0804CDEC: .4byte gArea _0804CDF0: .4byte gUnk_03001000 thumb_func_start sub_0804CDF4 @@ -3514,7 +3514,7 @@ _0804CF14: .4byte gUnk_080E1814 _0804CF18: ldr r0, _0804CF30 @ =0x80100000 bl PlaySFX - ldr r0, _0804CF34 @ =gUnk_02033A90 + ldr r0, _0804CF34 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -3526,7 +3526,7 @@ _0804CF2E: pop {pc} .align 2, 0 _0804CF30: .4byte 0x80100000 -_0804CF34: .4byte gUnk_02033A90 +_0804CF34: .4byte gArea thumb_func_start sub_0804CF38 sub_0804CF38: @ 0x0804CF38 @@ -3684,7 +3684,7 @@ _0804CFD8: movs r0, #3 bl sub_08078A90 _0804CFEE: - ldr r0, _0804D004 @ =gUnk_02033A90 + ldr r0, _0804D004 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -3696,7 +3696,7 @@ _0804CFFE: pop {pc} .align 2, 0 _0804D000: .4byte 0x80050000 -_0804D004: .4byte gUnk_02033A90 +_0804D004: .4byte gArea thumb_func_start sub_0804D008 sub_0804D008: @ 0x0804D008 @@ -4036,7 +4036,7 @@ _0804D15C: .4byte gUnk_080E49F4 _0804D160: ldr r0, _0804D178 @ =0x80100000 bl PlaySFX - ldr r0, _0804D17C @ =gUnk_02033A90 + ldr r0, _0804D17C @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -4048,7 +4048,7 @@ _0804D176: pop {pc} .align 2, 0 _0804D178: .4byte 0x80100000 -_0804D17C: .4byte gUnk_02033A90 +_0804D17C: .4byte gArea thumb_func_start sub_0804D180 sub_0804D180: @ 0x0804D180 @@ -4537,7 +4537,7 @@ _0804D3B8: bl sub_08078A90 ldr r0, _0804D3EC @ =gUnk_080E72E4 bl LoadRoomEntityList - ldr r0, _0804D3F0 @ =gUnk_02033A90 + ldr r0, _0804D3F0 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -4551,7 +4551,7 @@ _0804D3EA: pop {pc} .align 2, 0 _0804D3EC: .4byte gUnk_080E72E4 -_0804D3F0: .4byte gUnk_02033A90 +_0804D3F0: .4byte gArea _0804D3F4: .4byte 0x80100000 thumb_func_start sub_0804D3F8 @@ -5190,7 +5190,7 @@ sub_0804D6C8: @ 0x0804D6C8 push {lr} ldr r0, _0804D6E4 @ =0x80100000 bl PlaySFX - ldr r0, _0804D6E8 @ =gUnk_02033A90 + ldr r0, _0804D6E8 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -5201,7 +5201,7 @@ sub_0804D6C8: @ 0x0804D6C8 pop {pc} .align 2, 0 _0804D6E4: .4byte 0x80100000 -_0804D6E8: .4byte gUnk_02033A90 +_0804D6E8: .4byte gArea thumb_func_start sub_0804D6EC sub_0804D6EC: @ 0x0804D6EC @@ -5333,7 +5333,7 @@ _0804D7A0: adds r0, r4, #0 movs r2, #1 bl SetTileType - ldr r0, _0804D7E4 @ =gUnk_02033A90 + ldr r0, _0804D7E4 @ =gArea ldr r1, _0804D7E8 @ =0x00000864 adds r0, r0, r1 str r5, [r0] @@ -5344,7 +5344,7 @@ _0804D7D4: .4byte gUnk_080EADB8 _0804D7D8: .4byte 0x00004072 _0804D7DC: .4byte 0x00000145 _0804D7E0: .4byte 0x00000149 -_0804D7E4: .4byte gUnk_02033A90 +_0804D7E4: .4byte gArea _0804D7E8: .4byte 0x00000864 thumb_func_start sub_0804D7EC @@ -5395,7 +5395,7 @@ sub_0804D830: @ 0x0804D830 thumb_func_start sub_0804D834 sub_0804D834: @ 0x0804D834 push {r4, lr} - ldr r4, _0804D86C @ =gUnk_02033A90 + ldr r4, _0804D86C @ =gArea movs r0, #0 movs r1, #0x40 strb r1, [r4] @@ -5418,7 +5418,7 @@ sub_0804D834: @ 0x0804D834 str r0, [r1] b _0804D8BC .align 2, 0 -_0804D86C: .4byte gUnk_02033A90 +_0804D86C: .4byte gArea _0804D870: .4byte gUnk_080EAEC0 _0804D874: .4byte 0x00000864 _0804D878: @@ -5544,7 +5544,7 @@ sub_0804D904: @ 0x0804D904 str r0, [r1, #0x6c] movs r0, #0 str r0, [r1, #0x74] - ldr r0, _0804D938 @ =gUnk_02033A90 + ldr r0, _0804D938 @ =gArea movs r1, #0x86 lsls r1, r1, #4 adds r2, r0, r1 @@ -5557,7 +5557,7 @@ sub_0804D904: @ 0x0804D904 .align 2, 0 _0804D930: .4byte gRoomVars _0804D934: .4byte gUnk_080EB604 -_0804D938: .4byte gUnk_02033A90 +_0804D938: .4byte gArea _0804D93C: movs r0, #0x79 bl CheckLocalFlag @@ -5594,7 +5594,7 @@ sub_0804D97C: @ 0x0804D97C bl CheckGlobalFlag cmp r0, #0 beq _0804D996 - ldr r0, _0804D9A8 @ =gUnk_02033A90 + ldr r0, _0804D9A8 @ =gArea ldr r2, _0804D9AC @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -5610,7 +5610,7 @@ _0804D996: _0804D9A4: pop {pc} .align 2, 0 -_0804D9A8: .4byte gUnk_02033A90 +_0804D9A8: .4byte gArea _0804D9AC: .4byte 0x00000864 thumb_func_start sub_0804D9B0 @@ -5633,7 +5633,7 @@ sub_0804D9B0: @ 0x0804D9B0 bl sub_0807BB98 ldr r0, _0804D9F8 @ =gUnk_080EB684 bl LoadRoomEntityList - ldr r0, _0804D9FC @ =gUnk_02033A90 + ldr r0, _0804D9FC @ =gArea ldr r2, _0804DA00 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -5646,7 +5646,7 @@ _0804D9EC: .4byte 0x00000797 _0804D9F0: .4byte 0x00000357 _0804D9F4: .4byte 0x0000055F _0804D9F8: .4byte gUnk_080EB684 -_0804D9FC: .4byte gUnk_02033A90 +_0804D9FC: .4byte gArea _0804DA00: .4byte 0x00000864 thumb_func_start sub_0804DA04 @@ -6044,7 +6044,7 @@ sub_0804DBDC: @ 0x0804DBDC bl sub_0807BB98 ldr r0, _0804DC0C @ =gUnk_080ECFCC bl LoadRoomEntityList - ldr r0, _0804DC10 @ =gUnk_02033A90 + ldr r0, _0804DC10 @ =gArea ldr r2, _0804DC14 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -6055,7 +6055,7 @@ _0804DC08: pop {pc} .align 2, 0 _0804DC0C: .4byte gUnk_080ECFCC -_0804DC10: .4byte gUnk_02033A90 +_0804DC10: .4byte gArea _0804DC14: .4byte 0x00000864 thumb_func_start sub_0804DC18 @@ -6104,7 +6104,7 @@ sub_0804DC4C: @ 0x0804DC4C bl CheckGlobalFlag cmp r0, #0 beq _0804DC66 - ldr r0, _0804DC68 @ =gUnk_02033A90 + ldr r0, _0804DC68 @ =gArea ldr r2, _0804DC6C @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -6114,7 +6114,7 @@ sub_0804DC4C: @ 0x0804DC4C _0804DC66: pop {pc} .align 2, 0 -_0804DC68: .4byte gUnk_02033A90 +_0804DC68: .4byte gArea _0804DC6C: .4byte 0x00000864 thumb_func_start sub_0804DC70 @@ -6358,7 +6358,7 @@ sub_0804DD34: @ 0x0804DD34 bl sub_0807BB98 ldr r0, _0804DD64 @ =gUnk_080EE314 bl LoadRoomEntityList - ldr r0, _0804DD68 @ =gUnk_02033A90 + ldr r0, _0804DD68 @ =gArea ldr r2, _0804DD6C @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -6369,7 +6369,7 @@ _0804DD60: pop {pc} .align 2, 0 _0804DD64: .4byte gUnk_080EE314 -_0804DD68: .4byte gUnk_02033A90 +_0804DD68: .4byte gArea _0804DD6C: .4byte 0x00000864 thumb_func_start sub_0804DD70 @@ -6412,7 +6412,7 @@ sub_0804DD94: @ 0x0804DD94 bl sub_0807BB98 ldr r0, _0804DDC8 @ =gUnk_080EE5DC bl LoadRoomEntityList - ldr r0, _0804DDCC @ =gUnk_02033A90 + ldr r0, _0804DDCC @ =gArea ldr r2, _0804DDD0 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -6424,7 +6424,7 @@ _0804DDC0: .align 2, 0 _0804DDC4: .4byte 0x00000392 _0804DDC8: .4byte gUnk_080EE5DC -_0804DDCC: .4byte gUnk_02033A90 +_0804DDCC: .4byte gArea _0804DDD0: .4byte 0x00000864 thumb_func_start sub_0804DDD4 @@ -6510,7 +6510,7 @@ _0804DE58: .4byte gUnk_02017654 _0804DE5C: movs r0, #0x1c bl SetGlobalFlag - ldr r4, _0804DEB4 @ =gUnk_02033A90 + ldr r4, _0804DEB4 @ =gArea ldr r0, _0804DEB8 @ =0x0000085C adds r4, r4, r0 ldr r0, [r4] @@ -6546,7 +6546,7 @@ _0804DE5C: bl DoFade b _0804DECC .align 2, 0 -_0804DEB4: .4byte gUnk_02033A90 +_0804DEB4: .4byte gArea _0804DEB8: .4byte 0x0000085C _0804DEBC: .4byte gRoomControls _0804DEC0: .4byte gUnk_030010A0 @@ -7076,7 +7076,7 @@ sub_0804E27C: @ 0x0804E27C bne _0804E2AC ldr r0, _0804E2A0 @ =gUnk_080F0650 bl LoadRoomEntityList - ldr r0, _0804E2A4 @ =gUnk_02033A90 + ldr r0, _0804E2A4 @ =gArea ldr r1, _0804E2A8 @ =0x00000864 adds r0, r0, r1 movs r1, #0x13 @@ -7086,14 +7086,14 @@ sub_0804E27C: @ 0x0804E27C b _0804E2C0 .align 2, 0 _0804E2A0: .4byte gUnk_080F0650 -_0804E2A4: .4byte gUnk_02033A90 +_0804E2A4: .4byte gArea _0804E2A8: .4byte 0x00000864 _0804E2AC: movs r0, #0x64 bl CheckGlobalFlag cmp r0, #0 beq _0804E2C0 - ldr r0, _0804E300 @ =gUnk_02033A90 + ldr r0, _0804E300 @ =gArea ldr r1, _0804E304 @ =0x00000864 adds r0, r0, r1 movs r1, #0x1b @@ -7126,7 +7126,7 @@ _0804E2C0: bl SetTileType b _0804E3A6 .align 2, 0 -_0804E300: .4byte gUnk_02033A90 +_0804E300: .4byte gArea _0804E304: .4byte 0x00000864 _0804E308: .4byte gUnk_080F0800 _0804E30C: .4byte 0x00004072 @@ -7639,7 +7639,7 @@ sub_0804E6E8: @ 0x0804E6E8 bl CheckGlobalFlag cmp r0, #0 bne _0804E70A - ldr r0, _0804E71C @ =gUnk_02033A90 + ldr r0, _0804E71C @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -7659,7 +7659,7 @@ _0804E70A: _0804E71A: pop {pc} .align 2, 0 -_0804E71C: .4byte gUnk_02033A90 +_0804E71C: .4byte gArea _0804E720: .4byte 0x800B0036 _0804E724: .4byte gUnk_080F2E2C @@ -7675,7 +7675,7 @@ sub_0804E72C: @ 0x0804E72C bl CheckGlobalFlag cmp r0, #0 bne _0804E74E - ldr r0, _0804E760 @ =gUnk_02033A90 + ldr r0, _0804E760 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -7694,7 +7694,7 @@ _0804E74E: bl LoadRoomEntityList b _0804E772 .align 2, 0 -_0804E760: .4byte gUnk_02033A90 +_0804E760: .4byte gArea _0804E764: .4byte 0x800B0036 _0804E768: .4byte gUnk_080F2E94 _0804E76C: @@ -7796,7 +7796,7 @@ _0804E818: bl CheckGlobalFlag cmp r0, #0 bne _0804E838 - ldr r0, _0804E854 @ =gUnk_02033A90 + ldr r0, _0804E854 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -7820,7 +7820,7 @@ _0804E84A: .align 2, 0 _0804E84C: .4byte gUnk_02000070 _0804E850: .4byte gUnk_08009B30 -_0804E854: .4byte gUnk_02033A90 +_0804E854: .4byte gArea _0804E858: .4byte 0x800B0036 _0804E85C: .4byte gLinkState _0804E860: .4byte gUnk_080F31D8 @@ -8245,7 +8245,7 @@ nullsub_390: @ 0x0804EB50 thumb_func_start sub_0804EB54 sub_0804EB54: @ 0x0804EB54 - ldr r2, _0804EB64 @ =gUnk_02033A90 + ldr r2, _0804EB64 @ =gArea ldrb r1, [r2] movs r0, #0x48 orrs r0, r1 @@ -8253,7 +8253,7 @@ sub_0804EB54: @ 0x0804EB54 movs r0, #1 bx lr .align 2, 0 -_0804EB64: .4byte gUnk_02033A90 +_0804EB64: .4byte gArea thumb_func_start nullsub_391 nullsub_391: @ 0x0804EB68 @@ -8262,7 +8262,7 @@ nullsub_391: @ 0x0804EB68 thumb_func_start sub_0804EB6C sub_0804EB6C: @ 0x0804EB6C - ldr r2, _0804EB7C @ =gUnk_02033A90 + ldr r2, _0804EB7C @ =gArea ldrb r1, [r2] movs r0, #0x48 orrs r0, r1 @@ -8270,7 +8270,7 @@ sub_0804EB6C: @ 0x0804EB6C movs r0, #1 bx lr .align 2, 0 -_0804EB7C: .4byte gUnk_02033A90 +_0804EB7C: .4byte gArea thumb_func_start nullsub_392 nullsub_392: @ 0x0804EB80 @@ -8279,7 +8279,7 @@ nullsub_392: @ 0x0804EB80 thumb_func_start sub_0804EB84 sub_0804EB84: @ 0x0804EB84 - ldr r2, _0804EB94 @ =gUnk_02033A90 + ldr r2, _0804EB94 @ =gArea ldrb r1, [r2] movs r0, #0x48 orrs r0, r1 @@ -8287,7 +8287,7 @@ sub_0804EB84: @ 0x0804EB84 movs r0, #1 bx lr .align 2, 0 -_0804EB94: .4byte gUnk_02033A90 +_0804EB94: .4byte gArea thumb_func_start nullsub_393 nullsub_393: @ 0x0804EB98 @@ -8300,7 +8300,7 @@ sub_0804EB9C: @ 0x0804EB9C movs r0, #0x58 movs r1, #5 bl sub_0801DD58 - ldr r2, _0804EBB4 @ =gUnk_02033A90 + ldr r2, _0804EBB4 @ =gArea ldrb r1, [r2] movs r0, #0x48 orrs r0, r1 @@ -8308,7 +8308,7 @@ sub_0804EB9C: @ 0x0804EB9C movs r0, #1 pop {pc} .align 2, 0 -_0804EBB4: .4byte gUnk_02033A90 +_0804EBB4: .4byte gArea thumb_func_start nullsub_394 nullsub_394: @ 0x0804EBB8 @@ -8321,7 +8321,7 @@ sub_0804EBBC: @ 0x0804EBBC movs r0, #0x58 movs r1, #6 bl sub_0801DD58 - ldr r2, _0804EBD4 @ =gUnk_02033A90 + ldr r2, _0804EBD4 @ =gArea ldrb r1, [r2] movs r0, #0x48 orrs r0, r1 @@ -8329,7 +8329,7 @@ sub_0804EBBC: @ 0x0804EBBC movs r0, #1 pop {pc} .align 2, 0 -_0804EBD4: .4byte gUnk_02033A90 +_0804EBD4: .4byte gArea thumb_func_start nullsub_395 nullsub_395: @ 0x0804EBD8 @@ -8362,7 +8362,7 @@ sub_0804EC00: @ 0x0804EC00 bl CheckGlobalFlag cmp r0, #0 beq _0804EC1A - ldr r0, _0804EC48 @ =gUnk_02033A90 + ldr r0, _0804EC48 @ =gArea ldr r2, _0804EC4C @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -8389,7 +8389,7 @@ _0804EC2A: bl LoadRoomEntityList b _0804EC5E .align 2, 0 -_0804EC48: .4byte gUnk_02033A90 +_0804EC48: .4byte gArea _0804EC4C: .4byte 0x00000864 _0804EC50: .4byte gUnk_080F4D50 _0804EC54: .4byte gUnk_080F4DB0 @@ -8494,7 +8494,7 @@ _0804ED14: .4byte gUnk_080F5308 thumb_func_start sub_0804ED18 sub_0804ED18: @ 0x0804ED18 - ldr r0, _0804ED28 @ =gUnk_02033A90 + ldr r0, _0804ED28 @ =gArea ldr r2, _0804ED2C @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -8503,7 +8503,7 @@ sub_0804ED18: @ 0x0804ED18 str r0, [r1] bx lr .align 2, 0 -_0804ED28: .4byte gUnk_02033A90 +_0804ED28: .4byte gArea _0804ED2C: .4byte 0x00000864 thumb_func_start sub_0804ED30 @@ -8519,7 +8519,7 @@ sub_0804ED34: @ 0x0804ED34 bl CheckGlobalFlag cmp r0, #0 beq _0804ED4E - ldr r0, _0804ED50 @ =gUnk_02033A90 + ldr r0, _0804ED50 @ =gArea ldr r1, _0804ED54 @ =0x00000864 adds r0, r0, r1 movs r1, #0x31 @@ -8527,7 +8527,7 @@ sub_0804ED34: @ 0x0804ED34 _0804ED4E: pop {pc} .align 2, 0 -_0804ED50: .4byte gUnk_02033A90 +_0804ED50: .4byte gArea _0804ED54: .4byte 0x00000864 thumb_func_start sub_0804ED58 @@ -8640,7 +8640,7 @@ _0804EE46: bl CheckGlobalFlag cmp r0, #0 beq _0804EE5A - ldr r0, _0804EE6C @ =gUnk_02033A90 + ldr r0, _0804EE6C @ =gArea ldr r1, _0804EE70 @ =0x00000864 adds r0, r0, r1 movs r1, #0x31 @@ -8652,7 +8652,7 @@ _0804EE5C: .4byte gUnk_080F55D8 _0804EE60: .4byte gUnk_080F5528 _0804EE64: .4byte gUnk_080F5578 _0804EE68: .4byte gUnk_080F55B8 -_0804EE6C: .4byte gUnk_02033A90 +_0804EE6C: .4byte gArea _0804EE70: .4byte 0x00000864 thumb_func_start sub_0804EE74 @@ -8678,7 +8678,7 @@ _0804EE94: bl CheckGlobalFlag cmp r0, #0 beq _0804EEA8 - ldr r0, _0804EEB0 @ =gUnk_02033A90 + ldr r0, _0804EEB0 @ =gArea ldr r1, _0804EEB4 @ =0x00000864 adds r0, r0, r1 movs r1, #0x31 @@ -8687,7 +8687,7 @@ _0804EEA8: pop {pc} .align 2, 0 _0804EEAC: .4byte gUnk_080F5660 -_0804EEB0: .4byte gUnk_02033A90 +_0804EEB0: .4byte gArea _0804EEB4: .4byte 0x00000864 thumb_func_start sub_0804EEB8 @@ -9115,7 +9115,7 @@ _0804F1B6: movs r0, #8 movs r1, #0 bl sub_08052CA4 - ldr r2, _0804F1D8 @ =gUnk_02033A90 + ldr r2, _0804F1D8 @ =gArea ldrb r1, [r2] movs r0, #0x80 orrs r0, r1 @@ -9123,7 +9123,7 @@ _0804F1B6: pop {pc} .align 2, 0 _0804F1D4: .4byte gUnk_080F66AC -_0804F1D8: .4byte gUnk_02033A90 +_0804F1D8: .4byte gArea thumb_func_start sub_0804F1DC sub_0804F1DC: @ 0x0804F1DC @@ -9273,7 +9273,7 @@ _0804F27A: bl CheckGlobalFlag cmp r0, #0 bne _0804F28E - ldr r0, _0804F2B4 @ =gUnk_02033A90 + ldr r0, _0804F2B4 @ =gArea ldr r1, _0804F2B8 @ =0x00000864 adds r0, r0, r1 movs r1, #0x10 @@ -9298,7 +9298,7 @@ _0804F2AE: pop {r4, pc} .align 2, 0 _0804F2B0: .4byte gUnk_080F70A8 -_0804F2B4: .4byte gUnk_02033A90 +_0804F2B4: .4byte gArea _0804F2B8: .4byte 0x00000864 _0804F2BC: .4byte gUnk_02002A40 _0804F2C0: .4byte gUnk_080F70D8 @@ -9604,7 +9604,7 @@ _0804F540: bl CheckGlobalFlag cmp r0, #0 bne _0804F554 - ldr r0, _0804F570 @ =gUnk_02033A90 + ldr r0, _0804F570 @ =gArea ldr r1, _0804F574 @ =0x00000864 adds r0, r0, r1 movs r1, #0x13 @@ -9618,7 +9618,7 @@ _0804F560: .4byte 0x000007A3 _0804F564: .4byte 0x000007A5 _0804F568: .4byte 0x000007A6 _0804F56C: .4byte 0x000007A7 -_0804F570: .4byte gUnk_02033A90 +_0804F570: .4byte gArea _0804F574: .4byte 0x00000864 thumb_func_start sub_0804F578 @@ -11102,7 +11102,7 @@ sub_0804FE04: @ 0x0804FE04 bl CheckGlobalFlag cmp r0, #0 beq _0804FE28 - ldr r0, _0804FE20 @ =gUnk_02033A90 + ldr r0, _0804FE20 @ =gArea ldr r2, _0804FE24 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -11111,7 +11111,7 @@ sub_0804FE04: @ 0x0804FE04 str r0, [r1] b _0804FE2E .align 2, 0 -_0804FE20: .4byte gUnk_02033A90 +_0804FE20: .4byte gArea _0804FE24: .4byte 0x00000864 _0804FE28: ldr r0, _0804FE3C @ =gUnk_080FACB8 diff --git a/asm/code_08050038.s b/asm/code_08050038.s index 4aa73721..292c3a43 100644 --- a/asm/code_08050038.s +++ b/asm/code_08050038.s @@ -3432,7 +3432,7 @@ _08051B02: cmp r0, #0 bne _08051BAE bl sub_08052F1C - ldr r5, _08051BB8 @ =gUnk_02033A90 + ldr r5, _08051BB8 @ =gArea movs r0, #0x86 lsls r0, r0, #4 adds r3, r5, r0 @@ -3485,7 +3485,7 @@ _08051BAE: .align 2, 0 _08051BB0: .4byte gUnk_03000FD0 _08051BB4: .4byte gRoomControls -_08051BB8: .4byte gUnk_02033A90 +_08051BB8: .4byte gArea _08051BBC: .4byte 0x00000864 _08051BC0: .4byte 0x800B0000 _08051BC4: .4byte gUnk_03001000 @@ -3802,7 +3802,7 @@ sub_08051E84: @ 0x08051E84 bl sub_08053320 ldrb r0, [r5, #4] bl sub_08052D58 - ldr r1, _08051EFC @ =gUnk_02033A90 + ldr r1, _08051EFC @ =gArea movs r6, #0 strh r0, [r1, #4] ldrb r0, [r4] @@ -3840,7 +3840,7 @@ sub_08051E84: @ 0x08051E84 _08051EF0: .4byte gUnk_02032EC0 _08051EF4: .4byte gUnk_080FCA20 _08051EF8: .4byte gRoomControls -_08051EFC: .4byte gUnk_02033A90 +_08051EFC: .4byte gArea _08051F00: .4byte gUnk_02000080 thumb_func_start sub_08051F04 diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 11787dad..91c23ed8 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -13,7 +13,7 @@ sub_080526F8: @ 0x080526F8 bl sub_08052724 cmp r0, #0 beq _08052718 - ldr r0, _0805271C @ =gUnk_02033A90 + ldr r0, _0805271C @ =gArea ldrb r1, [r0, #3] ldr r0, _08052720 @ =gUnk_02002E9C adds r1, r1, r0 @@ -27,19 +27,19 @@ _08052716: _08052718: pop {r4, pc} .align 2, 0 -_0805271C: .4byte gUnk_02033A90 +_0805271C: .4byte gArea _08052720: .4byte gUnk_02002E9C thumb_func_start sub_08052724 sub_08052724: @ 0x08052724 - ldr r0, _08052730 @ =gUnk_02033A90 + ldr r0, _08052730 @ =gArea ldrb r0, [r0] lsrs r0, r0, #1 movs r1, #1 ands r0, r1 bx lr .align 2, 0 -_08052730: .4byte gUnk_02033A90 +_08052730: .4byte gArea thumb_func_start sub_08052734 sub_08052734: @ 0x08052734 @@ -48,7 +48,7 @@ sub_08052734: @ 0x08052734 cmp r0, #0 beq _0805274C ldr r0, _08052758 @ =gUnk_02002A40 - ldr r1, _0805275C @ =gUnk_02033A90 + ldr r1, _0805275C @ =gArea ldr r2, _08052760 @ =0x0000045C adds r0, r0, r2 ldrb r1, [r1, #3] @@ -63,7 +63,7 @@ _08052754: pop {r4, pc} .align 2, 0 _08052758: .4byte gUnk_02002A40 -_0805275C: .4byte gUnk_02033A90 +_0805275C: .4byte gArea _08052760: .4byte 0x0000045C thumb_func_start sub_08052764 @@ -73,7 +73,7 @@ sub_08052764: @ 0x08052764 cmp r0, #0 beq _08052784 ldr r0, _08052790 @ =gUnk_02002A40 - ldr r1, _08052794 @ =gUnk_02033A90 + ldr r1, _08052794 @ =gArea ldr r2, _08052798 @ =0x0000046C adds r0, r0, r2 ldrb r1, [r1, #3] @@ -92,7 +92,7 @@ _0805278C: pop {r4, pc} .align 2, 0 _08052790: .4byte gUnk_02002A40 -_08052794: .4byte gUnk_02033A90 +_08052794: .4byte gArea _08052798: .4byte 0x0000046C thumb_func_start sub_0805279C @@ -102,7 +102,7 @@ sub_0805279C: @ 0x0805279C cmp r0, #0 beq _080527C8 ldr r0, _080527BC @ =gUnk_02002A40 - ldr r1, _080527C0 @ =gUnk_02033A90 + ldr r1, _080527C0 @ =gArea ldr r2, _080527C4 @ =0x0000046C adds r0, r0, r2 ldrb r1, [r1, #3] @@ -114,7 +114,7 @@ sub_0805279C: @ 0x0805279C b _080527CA .align 2, 0 _080527BC: .4byte gUnk_02002A40 -_080527C0: .4byte gUnk_02033A90 +_080527C0: .4byte gArea _080527C4: .4byte 0x0000046C _080527C8: movs r0, #0 @@ -128,7 +128,7 @@ sub_080527CC: @ 0x080527CC cmp r0, #0 beq _080527F8 ldr r0, _080527EC @ =gUnk_02002A40 - ldr r1, _080527F0 @ =gUnk_02033A90 + ldr r1, _080527F0 @ =gArea ldr r2, _080527F4 @ =0x0000046C adds r0, r0, r2 ldrb r1, [r1, #3] @@ -139,7 +139,7 @@ sub_080527CC: @ 0x080527CC b _080527FA .align 2, 0 _080527EC: .4byte gUnk_02002A40 -_080527F0: .4byte gUnk_02033A90 +_080527F0: .4byte gArea _080527F4: .4byte 0x0000046C _080527F8: movs r0, #0 @@ -175,7 +175,7 @@ _08052838: .4byte gUnk_0200B644 thumb_func_start sub_0805283C sub_0805283C: @ 0x0805283C push {r4, lr} - ldr r0, _08052868 @ =gUnk_02033A90 + ldr r0, _08052868 @ =gArea ldr r1, _0805286C @ =0x00000864 adds r4, r0, r1 ldr r1, _08052870 @ =gUnk_08127D30 @@ -196,7 +196,7 @@ sub_0805283C: @ 0x0805283C _08052864: pop {r4, pc} .align 2, 0 -_08052868: .4byte gUnk_02033A90 +_08052868: .4byte gArea _0805286C: .4byte 0x00000864 _08052870: .4byte gUnk_08127D30 _08052874: .4byte gRoomControls @@ -204,7 +204,7 @@ _08052874: .4byte gRoomControls thumb_func_start sub_08052878 sub_08052878: @ 0x08052878 push {lr} - ldr r0, _08052894 @ =gUnk_02033A90 + ldr r0, _08052894 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -216,12 +216,12 @@ sub_08052878: @ 0x08052878 bl PlaySFX pop {pc} .align 2, 0 -_08052894: .4byte gUnk_02033A90 +_08052894: .4byte gArea _08052898: .4byte 0x80010000 thumb_func_start sub_0805289C sub_0805289C: @ 0x0805289C - ldr r0, _080528AC @ =gUnk_02033A90 + ldr r0, _080528AC @ =gArea ldr r2, _080528B0 @ =0x00000864 adds r1, r0, r2 subs r2, #4 @@ -230,7 +230,7 @@ sub_0805289C: @ 0x0805289C str r0, [r1] bx lr .align 2, 0 -_080528AC: .4byte gUnk_02033A90 +_080528AC: .4byte gArea _080528B0: .4byte 0x00000864 thumb_func_start sub_080528B4 @@ -266,7 +266,7 @@ _080528EC: .4byte 0x80100000 thumb_func_start sub_080528F0 sub_080528F0: @ 0x080528F0 push {lr} - ldr r1, _08052914 @ =gUnk_02033A90 + ldr r1, _08052914 @ =gArea ldr r2, _08052918 @ =0x00000888 adds r0, r1, r2 ldr r2, [r0] @@ -283,7 +283,7 @@ sub_080528F0: @ 0x080528F0 _08052910: pop {pc} .align 2, 0 -_08052914: .4byte gUnk_02033A90 +_08052914: .4byte gArea _08052918: .4byte 0x00000888 thumb_func_start sub_0805291C @@ -660,7 +660,7 @@ sub_08052BF8: @ 0x08052BF8 bne _08052C30 movs r0, #1 strb r0, [r1] - ldr r0, _08052C38 @ =gUnk_02033A90 + ldr r0, _08052C38 @ =gArea ldrb r1, [r0, #1] adds r0, r2, #0 adds r0, #0x2e @@ -681,12 +681,12 @@ _08052C30: pop {pc} .align 2, 0 _08052C34: .4byte gUnk_030010A0 -_08052C38: .4byte gUnk_02033A90 +_08052C38: .4byte gArea thumb_func_start sub_08052C3C sub_08052C3C: @ 0x08052C3C push {lr} - ldr r2, _08052C58 @ =gUnk_02033A90 + ldr r2, _08052C58 @ =gArea ldrb r0, [r2, #0x18] cmp r0, #0 bne _08052C48 @@ -702,7 +702,7 @@ _08052C48: _08052C56: pop {pc} .align 2, 0 -_08052C58: .4byte gUnk_02033A90 +_08052C58: .4byte gArea thumb_func_start sub_08052C5C sub_08052C5C: @ 0x08052C5C @@ -724,7 +724,7 @@ sub_08052C5C: @ 0x08052C5C _08052C7C: .4byte gUnk_030010A0 _08052C80: .4byte gLinkEntity _08052C84: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _08052C98 ldr r2, _08052C9C @ =gUnk_030010A0 @@ -788,7 +788,7 @@ _08052CF8: .4byte gUnk_030010A0 thumb_func_start sub_08052CFC sub_08052CFC: @ 0x08052CFC push {r4, lr} - ldr r4, _08052D44 @ =gUnk_02033A90 + ldr r4, _08052D44 @ =gArea ldr r1, _08052D48 @ =0x00000894 adds r0, r4, #0 bl sub_0801D630 @@ -820,7 +820,7 @@ sub_08052CFC: @ 0x08052CFC bl sub_08052DA8 pop {r4, pc} .align 2, 0 -_08052D44: .4byte gUnk_02033A90 +_08052D44: .4byte gArea _08052D48: .4byte 0x00000894 _08052D4C: .4byte gRoomControls _08052D50: .4byte gUnk_08127D30 @@ -850,7 +850,7 @@ sub_08052D74: @ 0x08052D74 ldrb r0, [r0, #4] cmp r0, #7 beq _08052D96 - ldr r0, _08052D9C @ =gUnk_02033A90 + ldr r0, _08052D9C @ =gArea ldr r5, _08052DA0 @ =0x00000888 adds r1, r0, r5 str r3, [r1] @@ -864,7 +864,7 @@ _08052D96: pop {r4, r5, pc} .align 2, 0 _08052D98: .4byte gUnk_03001000 -_08052D9C: .4byte gUnk_02033A90 +_08052D9C: .4byte gArea _08052DA0: .4byte 0x00000888 _08052DA4: .4byte 0x0000088C @@ -905,7 +905,7 @@ _08052DD8: bne _08052DC4 _08052DE8: bl sub_08052E8C - ldr r1, _08052E08 @ =gUnk_02033A90 + ldr r1, _08052E08 @ =gArea ldr r2, _08052E0C @ =0x0000085C adds r1, r1, r2 str r0, [r1] @@ -915,7 +915,7 @@ _08052DF8: .4byte gUnk_0811E214 _08052DFC: .4byte gRoomControls _08052E00: .4byte gUnk_02033ACC _08052E04: .4byte 0x0000FFFF -_08052E08: .4byte gUnk_02033A90 +_08052E08: .4byte gArea _08052E0C: .4byte 0x0000085C thumb_func_start sub_08052E10 @@ -1004,7 +1004,7 @@ sub_08052EA0: @ 0x08052EA0 strb r0, [r4, #0x13] adds r0, #1 strh r0, [r4, #0xc] - ldr r2, _08052EE8 @ =gUnk_02033A90 + ldr r2, _08052EE8 @ =gArea ldr r1, _08052EEC @ =gUnk_08127D30 ldr r0, _08052EF0 @ =gRoomControls ldrb r0, [r0, #4] @@ -1021,7 +1021,7 @@ sub_08052EA0: @ 0x08052EA0 pop {r4, pc} .align 2, 0 _08052EE4: .4byte gRoomVars -_08052EE8: .4byte gUnk_02033A90 +_08052EE8: .4byte gArea _08052EEC: .4byte gUnk_08127D30 _08052EF0: .4byte gRoomControls @@ -1050,7 +1050,7 @@ _08052F18: .4byte gUnk_0811E454 thumb_func_start sub_08052F1C sub_08052F1C: @ 0x08052F1C push {r4, r5, r6, lr} - ldr r2, _08052F4C @ =gUnk_02033A90 + ldr r2, _08052F4C @ =gArea ldrb r1, [r2, #0xd] movs r0, #1 ands r0, r1 @@ -1073,7 +1073,7 @@ sub_08052F1C: @ 0x08052F1C beq _08052F62 b _08052F72 .align 2, 0 -_08052F4C: .4byte gUnk_02033A90 +_08052F4C: .4byte gArea _08052F50: .4byte gRoomVars _08052F54: .4byte gRoomControls _08052F58: @@ -1339,7 +1339,7 @@ sub_08053144: @ 0x08053144 b _0805316E _08053154: movs r1, #0 - ldr r0, _08053170 @ =gUnk_02033A90 + ldr r0, _08053170 @ =gArea ldrb r2, [r0, #1] cmp r2, #0 beq _0805316C @@ -1355,7 +1355,7 @@ _0805316C: _0805316E: pop {pc} .align 2, 0 -_08053170: .4byte gUnk_02033A90 +_08053170: .4byte gArea _08053174: .4byte gUnk_030010A0 thumb_func_start sub_08053178 @@ -1365,7 +1365,7 @@ sub_08053178: @ 0x08053178 cmp r0, #0 beq _080531E6 ldr r0, _080531E8 @ =gUnk_030010A0 - ldr r5, _080531EC @ =gUnk_02033A90 + ldr r5, _080531EC @ =gArea ldrb r1, [r5, #1] adds r0, #0x2e strb r1, [r0] @@ -1404,14 +1404,14 @@ sub_08053178: @ 0x08053178 bl sub_0805E5A8 _080531DC: ldr r0, _080531F4 @ =gUnk_02002AA0 - ldr r1, _080531EC @ =gUnk_02033A90 + ldr r1, _080531EC @ =gArea ldrb r1, [r1, #1] bl sub_0801D5BC _080531E6: pop {r4, r5, pc} .align 2, 0 _080531E8: .4byte gUnk_030010A0 -_080531EC: .4byte gUnk_02033A90 +_080531EC: .4byte gArea _080531F0: .4byte gRoomVars _080531F4: .4byte gUnk_02002AA0 @@ -1432,7 +1432,7 @@ sub_080531F8: @ 0x080531F8 adds r0, r5, #0 movs r2, #0x20 bl sub_0801D66C - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _08053238 adds r1, r5, #0 @@ -1698,7 +1698,7 @@ nullsub_480: @ 0x08053430 sub_08053434: @ 0x08053434 push {lr} adds r1, r0, #0 - ldr r0, _0805345C @ =gUnk_02033A90 + ldr r0, _0805345C @ =gArea ldrb r0, [r0, #1] cmp r0, #0x1d bne _0805345A @@ -1716,7 +1716,7 @@ sub_08053434: @ 0x08053434 _0805345A: pop {pc} .align 2, 0 -_0805345C: .4byte gUnk_02033A90 +_0805345C: .4byte gArea thumb_func_start sub_08053460 sub_08053460: @ 0x08053460 @@ -3361,7 +3361,7 @@ _0805414C: b _0805424E _08054154: ldr r1, _08054168 @ =gUnk_02002A40 - ldr r0, _0805416C @ =gUnk_02033A90 + ldr r0, _0805416C @ =gArea ldr r2, _08054170 @ =0x0000046C adds r1, r1, r2 ldrb r0, [r0, #3] @@ -3372,7 +3372,7 @@ _08054154: b _0805427A .align 2, 0 _08054168: .4byte gUnk_02002A40 -_0805416C: .4byte gUnk_02033A90 +_0805416C: .4byte gArea _08054170: .4byte 0x0000046C _08054174: movs r0, #0x72 diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s index a659a04b..98164dbc 100644 --- a/asm/code_0805436C.s +++ b/asm/code_0805436C.s @@ -277,7 +277,7 @@ _08054520: thumb_func_start sub_08054524 sub_08054524: @ 0x08054524 push {lr} - ldr r0, _08054550 @ =gUnk_02033A90 + ldr r0, _08054550 @ =gArea ldrb r1, [r0, #1] cmp r1, #0 bne _08054534 @@ -300,7 +300,7 @@ _0805453A: bl sub_0801D66C pop {pc} .align 2, 0 -_08054550: .4byte gUnk_02033A90 +_08054550: .4byte gArea _08054554: .4byte gUnk_030010A0 _08054558: .4byte gUnk_080FE1C6 _0805455C: .4byte gUnk_080015BC @@ -833,7 +833,7 @@ sub_08054974: @ 0x08054974 bl sub_08053320 ldrb r0, [r4, #4] bl sub_08052D58 - ldr r1, _080549B8 @ =gUnk_02033A90 + ldr r1, _080549B8 @ =gArea strh r0, [r1, #4] cmp r5, #0 beq _080549BC @@ -844,7 +844,7 @@ sub_08054974: @ 0x08054974 .align 2, 0 _080549B0: .4byte gUnk_080FE320 _080549B4: .4byte gRoomControls -_080549B8: .4byte gUnk_02033A90 +_080549B8: .4byte gArea _080549BC: ldrb r0, [r6, #2] ldrb r1, [r6, #3] diff --git a/asm/code_08056418.s b/asm/code_08056418.s index 18e42670..d7a5b34b 100644 --- a/asm/code_08056418.s +++ b/asm/code_08056418.s @@ -2445,7 +2445,7 @@ _080576EC: bl sub_0806FBFC cmp r0, #0 beq _080577A8 - ldr r5, _08057738 @ =gUnk_02033A90 + ldr r5, _08057738 @ =gArea ldr r0, [r4, #0x20] adds r0, #0x20 strh r0, [r5, #0x12] @@ -2475,7 +2475,7 @@ _080576EC: strb r0, [r5, #0x17] b _080577AA .align 2, 0 -_08057738: .4byte gUnk_02033A90 +_08057738: .4byte gArea _0805773C: .4byte gUnk_08107C6C _08057740: ldr r2, _08057758 @ =gLinkState @@ -2496,7 +2496,7 @@ _0805775C: bl sub_08057810 cmp r0, #0 beq _0805776A - ldr r1, _080577A0 @ =gUnk_02033A90 + ldr r1, _080577A0 @ =gArea movs r0, #3 strb r0, [r1, #0x18] _0805776A: @@ -2525,7 +2525,7 @@ _0805776A: bl PlaySFX b _080577AA .align 2, 0 -_080577A0: .4byte gUnk_02033A90 +_080577A0: .4byte gArea _080577A4: .4byte gRoomControls _080577A8: strb r0, [r4, #0xf] @@ -2599,7 +2599,7 @@ sub_08057810: @ 0x08057810 ldrb r0, [r0] cmp r0, #0 bne _08057850 - ldr r0, _0805784C @ =gUnk_02033A90 + ldr r0, _0805784C @ =gArea ldrb r0, [r0, #0x17] cmp r0, #6 beq _08057850 @@ -2617,7 +2617,7 @@ sub_08057810: @ 0x08057810 b _08057852 .align 2, 0 _08057848: .4byte gLinkState -_0805784C: .4byte gUnk_02033A90 +_0805784C: .4byte gArea _08057850: movs r0, #0 _08057852: @@ -4339,7 +4339,7 @@ _080585AC: .4byte gLinkState sub_080585B0: @ 0x080585B0 push {r4, lr} adds r4, r0, #0 - ldr r0, _080585D8 @ =gUnk_02033A90 + ldr r0, _080585D8 @ =gArea adds r0, #0x28 ldrb r0, [r0] cmp r0, #0xff @@ -4355,7 +4355,7 @@ _080585C2: _080585D4: pop {r4, pc} .align 2, 0 -_080585D8: .4byte gUnk_02033A90 +_080585D8: .4byte gArea thumb_func_start sub_080585DC sub_080585DC: @ 0x080585DC @@ -4443,7 +4443,7 @@ sub_08058650: @ 0x08058650 beq _0805867A adds r3, r0, #0 _0805867A: - ldr r0, _080586A0 @ =gUnk_02033A90 + ldr r0, _080586A0 @ =gArea movs r1, #0x86 lsls r1, r1, #4 adds r0, r0, r1 @@ -4461,7 +4461,7 @@ _08058698: pop {r4, pc} .align 2, 0 _0805869C: .4byte gRoomVars -_080586A0: .4byte gUnk_02033A90 +_080586A0: .4byte gArea _080586A4: .4byte 0x00000B0F thumb_func_start sub_080586A8 @@ -4481,7 +4481,7 @@ sub_080586A8: @ 0x080586A8 ldrb r0, [r0] cmp r0, #0 bne _080586E0 - ldr r1, _080586E8 @ =gUnk_02033A90 + ldr r1, _080586E8 @ =gArea movs r0, #0x86 lsls r0, r0, #4 adds r1, r1, r0 @@ -4496,7 +4496,7 @@ _080586E0: _080586E4: pop {r4, pc} .align 2, 0 -_080586E8: .4byte gUnk_02033A90 +_080586E8: .4byte gArea thumb_func_start sub_080586EC sub_080586EC: @ 0x080586EC @@ -5368,7 +5368,7 @@ sub_08058D34: @ 0x08058D34 adds r1, #0x68 ldr r0, _08058DC4 @ =0x00000909 strh r0, [r1] - ldr r0, _08058DC8 @ =gUnk_02033A90 + ldr r0, _08058DC8 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -5394,7 +5394,7 @@ _08058DB8: .4byte 0x0000BC82 _08058DBC: .4byte 0x00005E86 _08058DC0: .4byte 0x00003456 _08058DC4: .4byte 0x00000909 -_08058DC8: .4byte gUnk_02033A90 +_08058DC8: .4byte gArea _08058DCC: .4byte gUnk_02000070 thumb_func_start sub_08058DD0 @@ -5998,7 +5998,7 @@ _08059254: bne _08059266 movs r0, #1 strb r0, [r5, #0xc] - ldr r1, _08059274 @ =gUnk_02033A90 + ldr r1, _08059274 @ =gArea ldr r0, _08059268 @ =gRoomVars ldrh r0, [r0, #0xc] strh r0, [r1, #0xa] @@ -6008,7 +6008,7 @@ _08059266: _08059268: .4byte gRoomVars _0805926C: .4byte gUnk_08108354 _08059270: .4byte 0x0000FFFF -_08059274: .4byte gUnk_02033A90 +_08059274: .4byte gArea thumb_func_start sub_08059278 sub_08059278: @ 0x08059278 @@ -6355,7 +6355,7 @@ _080594F2: .align 2, 0 _08059518: .4byte 0x00000B0F _0805951C: - ldr r0, _08059544 @ =gUnk_02033A90 + ldr r0, _08059544 @ =gArea adds r0, #0x28 ldrb r0, [r0] cmp r0, #0xff @@ -6373,7 +6373,7 @@ _0805952A: _08059540: pop {r4, pc} .align 2, 0 -_08059544: .4byte gUnk_02033A90 +_08059544: .4byte gArea thumb_func_start sub_08059548 sub_08059548: @ 0x08059548 @@ -6483,7 +6483,7 @@ sub_08059608: @ 0x08059608 lsls r0, r0, #0x18 cmp r0, #0 bne _08059682 - ldr r0, _08059634 @ =gUnk_02033A90 + ldr r0, _08059634 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -6494,12 +6494,12 @@ sub_08059608: @ 0x08059608 bl PlaySFX b _08059682 .align 2, 0 -_08059634: .4byte gUnk_02033A90 +_08059634: .4byte gArea _08059638: bl sub_0805986C cmp r0, #0 beq _08059668 - ldr r0, _0805965C @ =gUnk_02033A90 + ldr r0, _0805965C @ =gArea ldr r2, _08059660 @ =0x00000864 adds r1, r0, r2 ldr r0, [r1] @@ -6513,11 +6513,11 @@ _08059638: bl PlaySFX b _08059682 .align 2, 0 -_0805965C: .4byte gUnk_02033A90 +_0805965C: .4byte gArea _08059660: .4byte 0x00000864 _08059664: .4byte 0x800D0000 _08059668: - ldr r0, _08059684 @ =gUnk_02033A90 + ldr r0, _08059684 @ =gArea ldr r2, _08059688 @ =0x00000864 adds r1, r0, r2 ldr r0, [r1] @@ -6532,7 +6532,7 @@ _08059668: _08059682: pop {r4, pc} .align 2, 0 -_08059684: .4byte gUnk_02033A90 +_08059684: .4byte gArea _08059688: .4byte 0x00000864 _0805968C: .4byte 0x800D0000 @@ -6938,7 +6938,7 @@ sub_08059994: @ 0x08059994 beq _080599AE movs r0, #0x5b bl sub_0801D714 - ldr r0, _080599B0 @ =gUnk_02033A90 + ldr r0, _080599B0 @ =gArea ldr r1, _080599B4 @ =0x00000864 adds r0, r0, r1 movs r1, #0x1e @@ -6946,7 +6946,7 @@ sub_08059994: @ 0x08059994 _080599AE: pop {pc} .align 2, 0 -_080599B0: .4byte gUnk_02033A90 +_080599B0: .4byte gArea _080599B4: .4byte 0x00000864 thumb_func_start sub_080599B8 @@ -9235,7 +9235,7 @@ _0805AB68: bne _0805ABC8 adds r0, #1 strb r0, [r6, #0xc] - ldr r0, _0805ABF0 @ =gUnk_02033A90 + ldr r0, _0805ABF0 @ =gArea ldrb r0, [r0, #8] strb r0, [r1] adds r0, r6, #0 @@ -9298,7 +9298,7 @@ _0805ABC8: adds r5, r2, #0 b _0805ACAA .align 2, 0 -_0805ABF0: .4byte gUnk_02033A90 +_0805ABF0: .4byte gArea _0805ABF4: .4byte gUnk_02031EC0 _0805ABF8: .4byte gUnk_02002A40 _0805ABFC: .4byte gUnk_020342F8 @@ -9551,7 +9551,7 @@ sub_0805ADD8: @ 0x0805ADD8 adds r4, r0, #0 cmp r4, #0 bne _0805AE04 - ldr r0, _0805ADF8 @ =gUnk_02033A90 + ldr r0, _0805ADF8 @ =gArea ldr r1, _0805ADFC @ =0x0000088C adds r0, r0, r1 ldr r0, [r0] @@ -9562,7 +9562,7 @@ sub_0805ADD8: @ 0x0805ADD8 bl _call_via_r1 b _0805AEC4 .align 2, 0 -_0805ADF8: .4byte gUnk_02033A90 +_0805ADF8: .4byte gArea _0805ADFC: .4byte 0x0000088C _0805AE00: .4byte sub_0805AEDC _0805AE04: @@ -9584,7 +9584,7 @@ _0805AE04: adds r0, r4, #0 movs r1, #6 bl sub_0805E3A0 - ldr r0, _0805AE48 @ =gUnk_02033A90 + ldr r0, _0805AE48 @ =gArea ldr r2, _0805AE4C @ =0x0000088C adds r0, r0, r2 ldr r0, [r0] @@ -9597,7 +9597,7 @@ _0805AE04: b _0805AEC4 .align 2, 0 _0805AE44: .4byte gUnk_0810865C -_0805AE48: .4byte gUnk_02033A90 +_0805AE48: .4byte gArea _0805AE4C: .4byte 0x0000088C _0805AE50: .4byte sub_0805AEDC _0805AE54: .4byte sub_0805AF3C @@ -9739,7 +9739,7 @@ sub_0805AF60: @ 0x0805AF60 adds r4, r0, #0 cmp r4, #0 bne _0805AF8C - ldr r0, _0805AF80 @ =gUnk_02033A90 + ldr r0, _0805AF80 @ =gArea ldr r1, _0805AF84 @ =0x0000088C adds r0, r0, r1 ldr r0, [r0] @@ -9750,7 +9750,7 @@ sub_0805AF60: @ 0x0805AF60 bl _call_via_r1 b _0805AFEE .align 2, 0 -_0805AF80: .4byte gUnk_02033A90 +_0805AF80: .4byte gArea _0805AF84: .4byte 0x0000088C _0805AF88: .4byte sub_0805AFFC _0805AF8C: @@ -9766,7 +9766,7 @@ _0805AF8C: adds r0, r4, #0 movs r1, #6 bl sub_0805E3A0 - ldr r0, _0805AFC0 @ =gUnk_02033A90 + ldr r0, _0805AFC0 @ =gArea ldr r2, _0805AFC4 @ =0x0000088C adds r0, r0, r2 ldr r0, [r0] @@ -9778,7 +9778,7 @@ _0805AF8C: bl sub_08052D74 b _0805AFEE .align 2, 0 -_0805AFC0: .4byte gUnk_02033A90 +_0805AFC0: .4byte gArea _0805AFC4: .4byte 0x0000088C _0805AFC8: .4byte sub_0805AFFC _0805AFCC: @@ -11000,7 +11000,7 @@ _0805B8E8: sub_0805B8EC: @ 0x0805B8EC push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r4, _0805B964 @ =gUnk_02033A90 + ldr r4, _0805B964 @ =gArea ldrb r0, [r4, #0xc] cmp r0, #0 bne _0805B90A @@ -11055,7 +11055,7 @@ _0805B952: strh r0, [r2] b _0805BA6C .align 2, 0 -_0805B964: .4byte gUnk_02033A90 +_0805B964: .4byte gArea _0805B968: .4byte gScreen _0805B96C: .4byte 0x0000D7FF _0805B970: .4byte gUnk_03001000 @@ -11102,7 +11102,7 @@ _0805B9BC: ands r0, r1 cmp r0, #0 beq _0805BA2C - ldr r0, _0805B9F4 @ =gUnk_02033A90 + ldr r0, _0805B9F4 @ =gArea ldrb r0, [r0, #0xc] cmp r0, #0 beq _0805BA2C @@ -11118,7 +11118,7 @@ _0805B9BC: _0805B9E8: .4byte gScreen _0805B9EC: .4byte 0x0000DFFF _0805B9F0: .4byte gLinkState -_0805B9F4: .4byte gUnk_02033A90 +_0805B9F4: .4byte gArea _0805B9F8: ldr r0, _0805BA24 @ =gUnk_030010A0 ldr r0, [r0] @@ -11185,7 +11185,7 @@ _0805BA74: .4byte gRoomControls thumb_func_start sub_0805BA78 sub_0805BA78: @ 0x0805BA78 push {r4, lr} - ldr r1, _0805BAA8 @ =gUnk_02033A90 + ldr r1, _0805BAA8 @ =gArea movs r0, #0xa ldrsh r3, [r1, r0] ldr r0, _0805BAAC @ =gRoomVars @@ -11210,7 +11210,7 @@ _0805BA96: bls _0805BAB6 b _0805BABA .align 2, 0 -_0805BAA8: .4byte gUnk_02033A90 +_0805BAA8: .4byte gArea _0805BAAC: .4byte gRoomVars _0805BAB0: subs r0, r3, r2 @@ -11241,7 +11241,7 @@ _0805BAD0: thumb_func_start sub_0805BAD4 sub_0805BAD4: @ 0x0805BAD4 push {lr} - ldr r3, _0805BAF4 @ =gUnk_02033A90 + ldr r3, _0805BAF4 @ =gArea ldrb r0, [r3, #0xc] cmp r0, #0 beq _0805BAF2 @@ -11258,7 +11258,7 @@ sub_0805BAD4: @ 0x0805BAD4 _0805BAF2: pop {pc} .align 2, 0 -_0805BAF4: .4byte gUnk_02033A90 +_0805BAF4: .4byte gArea _0805BAF8: .4byte gScreen _0805BAFC: .4byte gUnk_08108CA8 @@ -11267,7 +11267,7 @@ sub_0805BB00: @ 0x0805BB00 push {r4, r5, lr} adds r4, r0, #0 adds r5, r1, #0 - ldr r0, _0805BB50 @ =gUnk_02033A90 + ldr r0, _0805BB50 @ =gArea ldrb r0, [r0, #0xc] cmp r0, #0 bne _0805BB28 @@ -11298,24 +11298,24 @@ _0805BB28: strh r4, [r0, #0xc] cmp r5, #0 beq _0805BB68 - ldr r1, _0805BB50 @ =gUnk_02033A90 + ldr r1, _0805BB50 @ =gArea movs r0, #1 b _0805BB6C .align 2, 0 -_0805BB50: .4byte gUnk_02033A90 +_0805BB50: .4byte gArea _0805BB54: .4byte 0x0600F000 _0805BB58: .4byte gScreen _0805BB5C: .4byte 0x00001E0C _0805BB60: .4byte 0x00003E48 _0805BB64: .4byte gRoomVars _0805BB68: - ldr r1, _0805BB70 @ =gUnk_02033A90 + ldr r1, _0805BB70 @ =gArea movs r0, #2 _0805BB6C: strb r0, [r1, #0xc] pop {r4, r5, pc} .align 2, 0 -_0805BB70: .4byte gUnk_02033A90 +_0805BB70: .4byte gArea thumb_func_start sub_0805BB74 sub_0805BB74: @ 0x0805BB74 @@ -11327,7 +11327,7 @@ sub_0805BB74: @ 0x0805BB74 movs r0, #0xc ldrsh r1, [r2, r0] _0805BB82: - ldr r0, _0805BBB4 @ =gUnk_02033A90 + ldr r0, _0805BBB4 @ =gArea strh r1, [r0, #0xa] strh r1, [r2, #0xc] movs r0, #9 @@ -11349,14 +11349,14 @@ _0805BBAE: pop {pc} .align 2, 0 _0805BBB0: .4byte gRoomVars -_0805BBB4: .4byte gUnk_02033A90 +_0805BBB4: .4byte gArea _0805BBB8: .4byte gScreen thumb_func_start sub_0805BBBC sub_0805BBBC: @ 0x0805BBBC push {r4, lr} movs r4, #0 - ldr r2, _0805BBF8 @ =gUnk_02033A90 + ldr r2, _0805BBF8 @ =gArea ldrb r0, [r2, #0xc] cmp r0, #0 beq _0805BBF2 @@ -11383,7 +11383,7 @@ _0805BBF2: adds r0, r4, #0 pop {r4, pc} .align 2, 0 -_0805BBF8: .4byte gUnk_02033A90 +_0805BBF8: .4byte gArea _0805BBFC: .4byte gRoomVars _0805BC00: .4byte gScreen @@ -11391,7 +11391,7 @@ _0805BC00: .4byte gScreen sub_0805BC04: @ 0x0805BC04 push {r4, lr} movs r4, #0 - ldr r2, _0805BC40 @ =gUnk_02033A90 + ldr r2, _0805BC40 @ =gArea ldrb r0, [r2, #0xc] cmp r0, #0 beq _0805BC3A @@ -11418,14 +11418,14 @@ _0805BC3A: adds r0, r4, #0 pop {r4, pc} .align 2, 0 -_0805BC40: .4byte gUnk_02033A90 +_0805BC40: .4byte gArea _0805BC44: .4byte gRoomVars _0805BC48: .4byte gScreen thumb_func_start sub_0805BC4C sub_0805BC4C: @ 0x0805BC4C push {lr} - ldr r1, _0805BC68 @ =gUnk_02033A90 + ldr r1, _0805BC68 @ =gArea ldrb r0, [r1, #0xc] cmp r0, #0 beq _0805BC64 @@ -11439,7 +11439,7 @@ sub_0805BC4C: @ 0x0805BC4C _0805BC64: pop {pc} .align 2, 0 -_0805BC68: .4byte gUnk_02033A90 +_0805BC68: .4byte gArea _0805BC6C: .4byte gScreen _0805BC70: .4byte 0x0000D7FF @@ -12022,7 +12022,7 @@ sub_0805C050: @ 0x0805C050 _0805C0D0: .4byte gRoomControls _0805C0D4: .4byte 0x0000FFF8 _0805C0D8: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C0EC _0805C0E0: @@ -12058,7 +12058,7 @@ _0805C11C: adds r1, r5, #0 movs r2, #2 bl SetTileType - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C16E bl sub_0805C608 @@ -12159,7 +12159,7 @@ sub_0805C178: @ 0x0805C178 .align 2, 0 _0805C1F8: .4byte gRoomControls _0805C1FC: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C210 _0805C204: @@ -12194,7 +12194,7 @@ _0805C23E: adds r1, r5, #0 movs r2, #2 bl SetTileType - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C28E bl sub_0805C608 @@ -12292,7 +12292,7 @@ sub_0805C294: @ 0x0805C294 .align 2, 0 _0805C314: .4byte gRoomControls _0805C318: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C32C _0805C320: @@ -12328,7 +12328,7 @@ _0805C35C: adds r1, r5, #0 movs r2, #2 bl SetTileType - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C3AC bl sub_0805C608 @@ -12429,7 +12429,7 @@ sub_0805C3B4: @ 0x0805C3B4 _0805C438: .4byte gRoomControls _0805C43C: .4byte 0x0000FFF0 _0805C440: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C454 _0805C448: @@ -12464,7 +12464,7 @@ _0805C482: adds r1, r5, #0 movs r2, #2 bl SetTileType - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C4D4 bl sub_0805C608 @@ -12566,7 +12566,7 @@ sub_0805C4E0: @ 0x0805C4E0 _0805C560: .4byte gRoomControls _0805C564: .4byte 0x0000FFF0 _0805C568: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C57C _0805C570: @@ -12602,7 +12602,7 @@ _0805C5AC: adds r1, r5, #0 movs r2, #2 bl SetTileType - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0805C5FE bl sub_0805C608 @@ -12644,14 +12644,14 @@ _0805C604: .4byte 0x0000FFF0 thumb_func_start sub_0805C608 sub_0805C608: @ 0x0805C608 ldr r1, _0805C614 @ =gUnk_08108CFC - ldr r0, _0805C618 @ =gUnk_02033A90 + ldr r0, _0805C618 @ =gArea ldrb r0, [r0, #3] adds r0, r0, r1 ldrb r0, [r0] bx lr .align 2, 0 _0805C614: .4byte gUnk_08108CFC -_0805C618: .4byte gUnk_02033A90 +_0805C618: .4byte gArea thumb_func_start sub_0805C61C sub_0805C61C: @ 0x0805C61C @@ -14437,7 +14437,7 @@ sub_0805D3C8: @ 0x0805D3C8 adds r4, r0, #0 cmp r4, #0 bne _0805D3F4 - ldr r0, _0805D3E8 @ =gUnk_02033A90 + ldr r0, _0805D3E8 @ =gArea ldr r1, _0805D3EC @ =0x0000088C adds r0, r0, r1 ldr r0, [r0] @@ -14448,7 +14448,7 @@ sub_0805D3C8: @ 0x0805D3C8 bl _call_via_r1 b _0805D45E .align 2, 0 -_0805D3E8: .4byte gUnk_02033A90 +_0805D3E8: .4byte gArea _0805D3EC: .4byte 0x0000088C _0805D3F0: .4byte sub_0805D470 _0805D3F4: @@ -14464,7 +14464,7 @@ _0805D3F4: adds r0, r4, #0 movs r1, #6 bl sub_0805E3A0 - ldr r0, _0805D428 @ =gUnk_02033A90 + ldr r0, _0805D428 @ =gArea ldr r2, _0805D42C @ =0x0000088C adds r0, r0, r2 ldr r0, [r0] @@ -14476,7 +14476,7 @@ _0805D3F4: bl sub_08052D74 b _0805D45E .align 2, 0 -_0805D428: .4byte gUnk_02033A90 +_0805D428: .4byte gArea _0805D42C: .4byte 0x0000088C _0805D430: .4byte sub_0805D470 _0805D434: @@ -15330,7 +15330,7 @@ sub_0805DA90: @ 0x0805DA90 movs r1, #8 bl sub_0805EA2C _0805DAB4: - ldr r0, _0805DAD8 @ =gUnk_02033A90 + ldr r0, _0805DAD8 @ =gArea ldr r1, _0805DADC @ =0x0000088C adds r4, r0, r1 ldr r0, [r4] @@ -15347,7 +15347,7 @@ _0805DAB4: _0805DAD4: pop {r4, r5, pc} .align 2, 0 -_0805DAD8: .4byte gUnk_02033A90 +_0805DAD8: .4byte gArea _0805DADC: .4byte 0x0000088C _0805DAE0: .4byte gScreen _0805DAE4: .4byte 0x0000F7FF @@ -16080,7 +16080,7 @@ _0805E040: strb r5, [r6, #0xc] movs r0, #3 bl sub_08078A90 - ldr r0, _0805E06C @ =gUnk_02033A90 + ldr r0, _0805E06C @ =gArea ldr r1, _0805E070 @ =0x00000864 adds r0, r0, r1 ldr r1, _0805E074 @ =0x80010000 @@ -16095,7 +16095,7 @@ _0805E062: .align 2, 0 _0805E064: .4byte gRoomControls _0805E068: .4byte gUnk_030010A0 -_0805E06C: .4byte gUnk_02033A90 +_0805E06C: .4byte gArea _0805E070: .4byte 0x00000864 _0805E074: .4byte 0x80010000 @@ -16230,12 +16230,12 @@ sub_0805E140: @ 0x0805E140 movs r1, #7 bl sub_0805E3A0 ldr r1, _0805E184 @ =gUnk_08108DE8 - ldr r0, _0805E188 @ =gUnk_02033A90 + ldr r0, _0805E188 @ =gArea ldrb r0, [r0, #1] lsls r0, r0, #1 adds r0, r0, r1 ldrh r4, [r0] - bl sub_08052660 + bl CheckIsDungeon adds r1, r0, #0 adds r0, r4, #0 bl sub_0805E1F8 @@ -16243,7 +16243,7 @@ sub_0805E140: @ 0x0805E140 .align 2, 0 _0805E180: .4byte gRoomControls _0805E184: .4byte gUnk_08108DE8 -_0805E188: .4byte gUnk_02033A90 +_0805E188: .4byte gArea thumb_func_start sub_0805E18C sub_0805E18C: @ 0x0805E18C diff --git a/asm/code_0805E744.s b/asm/code_0805E744.s index f5993264..8ce676ee 100644 --- a/asm/code_0805E744.s +++ b/asm/code_0805E744.s @@ -265,7 +265,7 @@ _0805E928: .4byte gUnk_020354B4 thumb_func_start sub_0805E92C sub_0805E92C: @ 0x0805E92C push {lr} - ldr r2, _0805E94C @ =gUnk_02033A90 + ldr r2, _0805E94C @ =gArea ldr r1, _0805E950 @ =0x00000888 adds r3, r2, r1 ldr r1, [r3] @@ -282,7 +282,7 @@ sub_0805E92C: @ 0x0805E92C _0805E94A: pop {pc} .align 2, 0 -_0805E94C: .4byte gUnk_02033A90 +_0805E94C: .4byte gArea _0805E950: .4byte 0x00000888 _0805E954: .4byte 0x0000088C diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index ea448c9b..bccabdd4 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -830,7 +830,7 @@ _0806F35E: thumb_func_start sub_0806F364 sub_0806F364: @ 0x0806F364 push {lr} - ldr r2, _0806F384 @ =gUnk_02033A90 + ldr r2, _0806F384 @ =gArea ldrb r0, [r2, #8] movs r1, #0x80 eors r0, r1 @@ -845,19 +845,19 @@ sub_0806F364: @ 0x0806F364 bl sub_0801D630 pop {pc} .align 2, 0 -_0806F384: .4byte gUnk_02033A90 +_0806F384: .4byte gArea _0806F388: .4byte 0x00000868 thumb_func_start sub_0806F38C sub_0806F38C: @ 0x0806F38C - ldr r0, _0806F398 @ =gUnk_02033A90 + ldr r0, _0806F398 @ =gArea ldrb r1, [r0, #8] movs r2, #0x80 eors r1, r2 strb r1, [r0, #8] bx lr .align 2, 0 -_0806F398: .4byte gUnk_02033A90 +_0806F398: .4byte gArea thumb_func_start sub_0806F39C sub_0806F39C: @ 0x0806F39C diff --git a/asm/code_0806FA6C.s b/asm/code_0806FA6C.s index fc4f36c1..cdc8b431 100644 --- a/asm/code_0806FA6C.s +++ b/asm/code_0806FA6C.s @@ -3325,10 +3325,10 @@ sub_08071380: @ 0x08071380 ands r0, r1 cmp r0, #0 beq _080713FC - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 bne _080713D0 - ldr r0, _080713F4 @ =gUnk_02033A90 + ldr r0, _080713F4 @ =gArea ldrb r0, [r0, #0x17] cmp r0, #3 bne _080713F8 @@ -3347,7 +3347,7 @@ _080713D0: _080713E8: .4byte gLinkState _080713EC: .4byte gUnk_0811BA9C _080713F0: .4byte gUnk_03000FF0 -_080713F4: .4byte gUnk_02033A90 +_080713F4: .4byte gArea _080713F8: bl sub_0804ACF8 _080713FC: @@ -3366,7 +3366,7 @@ sub_08071400: @ 0x08071400 adds r0, r4, #0 adds r0, #0x42 strb r1, [r0] - ldr r0, _0807149C @ =gUnk_02033A90 + ldr r0, _0807149C @ =gArea ldrh r3, [r0, #0x12] ldrh r5, [r0, #0x14] movs r0, #0x2e @@ -3410,7 +3410,7 @@ _08071444: subs r0, #0x45 ands r0, r1 strb r0, [r4, #0x18] - ldr r0, _0807149C @ =gUnk_02033A90 + ldr r0, _0807149C @ =gArea ldrb r0, [r0, #0x17] cmp r0, #4 bne _0807147C @@ -3419,7 +3419,7 @@ _08071444: _0807147C: movs r0, #8 strb r0, [r4, #0xe] - ldr r0, _0807149C @ =gUnk_02033A90 + ldr r0, _0807149C @ =gArea ldrb r0, [r0, #0x17] cmp r0, #3 beq _0807149A @@ -3435,7 +3435,7 @@ _0807147C: _0807149A: pop {r4, r5, pc} .align 2, 0 -_0807149C: .4byte gUnk_02033A90 +_0807149C: .4byte gArea _080714A0: .4byte gLinkState _080714A4: .4byte 0x0000052C @@ -3443,7 +3443,7 @@ _080714A4: .4byte 0x0000052C sub_080714A8: @ 0x080714A8 push {r4, lr} adds r4, r0, #0 - ldr r0, _08071524 @ =gUnk_02033A90 + ldr r0, _08071524 @ =gArea ldrb r0, [r0, #0x17] cmp r0, #5 bgt _080714BE @@ -3505,7 +3505,7 @@ _08071516: str r1, [r3, #0x30] b _0807156A .align 2, 0 -_08071524: .4byte gUnk_02033A90 +_08071524: .4byte gArea _08071528: .4byte gLinkEntity _0807152C: .4byte gLinkState _08071530: .4byte 0x0000080C @@ -3518,7 +3518,7 @@ _0807153E: movs r0, #8 strb r0, [r4, #0xe] _08071542: - ldr r0, _0807155C @ =gUnk_02033A90 + ldr r0, _0807155C @ =gArea ldrb r0, [r0, #0x17] cmp r0, #4 bne _08071560 @@ -3531,7 +3531,7 @@ _08071542: bl sub_080042B8 b _0807156A .align 2, 0 -_0807155C: .4byte gUnk_02033A90 +_0807155C: .4byte gArea _08071560: adds r0, r4, #0 bl sub_08077698 @@ -3829,7 +3829,7 @@ sub_0807176C: @ 0x0807176C rsbs r0, r0, #0 ands r0, r1 strb r0, [r4, #0x18] - ldr r1, _080717AC @ =gUnk_02033A90 + ldr r1, _080717AC @ =gArea ldrb r0, [r1, #0x17] cmp r0, #3 bne _080717B0 @@ -3843,7 +3843,7 @@ sub_0807176C: @ 0x0807176C bl sub_080717F8 b _080717CA .align 2, 0 -_080717AC: .4byte gUnk_02033A90 +_080717AC: .4byte gArea _080717B0: cmp r0, #6 bne _080717C0 @@ -3890,7 +3890,7 @@ _080717F4: thumb_func_start sub_080717F8 sub_080717F8: @ 0x080717F8 push {r4, lr} - ldr r2, _08071850 @ =gUnk_02033A90 + ldr r2, _08071850 @ =gArea ldrb r1, [r2, #0x16] lsls r1, r1, #1 strb r1, [r0, #0x14] @@ -3931,7 +3931,7 @@ sub_080717F8: @ 0x080717F8 bl UnfreezeTime pop {r4, pc} .align 2, 0 -_08071850: .4byte gUnk_02033A90 +_08071850: .4byte gArea _08071854: .4byte gUnk_0811BAC4 _08071858: .4byte gUnk_02034490 _0807185C: .4byte gLinkState diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index 8135e4d6..271cd020 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -430,7 +430,7 @@ _080735E0: .align 2, 0 _0807360C: .4byte gUnk_0200AF00 _08073610: - ldr r0, _08073620 @ =gUnk_02033A90 + ldr r0, _08073620 @ =gArea ldrb r0, [r0, #1] cmp r0, #0x10 bne _08073624 @@ -439,7 +439,7 @@ _08073610: strh r0, [r4, #0x24] b _08073626 .align 2, 0 -_08073620: .4byte gUnk_02033A90 +_08073620: .4byte gArea _08073624: strh r5, [r4, #0x24] _08073626: @@ -566,7 +566,7 @@ _080736FA: ldrh r1, [r6, #8] cmp r0, r1 bne _0807372C - ldr r0, _08073720 @ =gUnk_02033A90 + ldr r0, _08073720 @ =gArea ldrb r0, [r0, #1] cmp r0, #0x10 bne _08073724 @@ -576,7 +576,7 @@ _080736FA: b _0807372E .align 2, 0 _0807371C: .4byte gUnk_0811BC28 -_08073720: .4byte gUnk_02033A90 +_08073720: .4byte gArea _08073724: adds r0, r4, #0 bl sub_080042B8 @@ -1648,7 +1648,7 @@ _08073F48: .4byte gLinkState sub_08073F4C: @ 0x08073F4C push {r4, r5, lr} adds r4, r0, #0 - ldr r0, _08073F84 @ =gUnk_02033A90 + ldr r0, _08073F84 @ =gArea ldrh r3, [r0, #0x12] ldrh r5, [r0, #0x14] movs r0, #0x2e @@ -1674,7 +1674,7 @@ _08073F66: bl sub_0806F69C b _08073FC6 .align 2, 0 -_08073F84: .4byte gUnk_02033A90 +_08073F84: .4byte gArea _08073F88: ldrb r1, [r4, #0x10] movs r0, #0x7f diff --git a/asm/code_08076C80.s b/asm/code_08076C80.s index 285100a9..d60e633c 100644 --- a/asm/code_08076C80.s +++ b/asm/code_08076C80.s @@ -1442,7 +1442,7 @@ _080777CC: .align 2, 0 _080777D0: .4byte gLinkState _080777D4: - ldr r2, _080777F4 @ =gUnk_02033A90 + ldr r2, _080777F4 @ =gArea ldrb r0, [r2, #0x18] cmp r0, #2 beq _080777FC @@ -1459,7 +1459,7 @@ _080777D4: bne _0807787A b _08077838 .align 2, 0 -_080777F4: .4byte gUnk_02033A90 +_080777F4: .4byte gArea _080777F8: .4byte gUnk_0200AF00 _080777FC: ldrb r0, [r2, #0x1a] diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index 6f4068e0..80f256b9 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -2646,7 +2646,7 @@ _08078F70: .4byte gLinkState sub_08078F74: @ 0x08078F74 push {lr} adds r2, r0, #0 - ldr r0, _08078FA4 @ =gUnk_02033A90 + ldr r0, _08078FA4 @ =gArea ldrb r0, [r0, #0x18] cmp r0, #3 bne _08078FAC @@ -2668,7 +2668,7 @@ sub_08078F74: @ 0x08078F74 movs r0, #1 b _08078FAE .align 2, 0 -_08078FA4: .4byte gUnk_02033A90 +_08078FA4: .4byte gArea _08078FA8: .4byte gLinkState _08078FAC: movs r0, #0 @@ -4033,7 +4033,7 @@ _080799BA: ands r2, r0 cmp r2, #0 beq _080799D0 - ldr r0, _080799D8 @ =gUnk_02033A90 + ldr r0, _080799D8 @ =gArea ldrb r0, [r0, #0x17] cmp r0, #4 bne _080799CC @@ -4046,7 +4046,7 @@ _080799D0: lsls r4, r4, #3 b _08079AD8 .align 2, 0 -_080799D8: .4byte gUnk_02033A90 +_080799D8: .4byte gArea _080799DC: ldr r4, _080799E0 @ =0x000002C2 b _08079AD8 @@ -4146,7 +4146,7 @@ _08079A72: ands r2, r0 cmp r2, #0 beq _08079AA0 - ldr r0, _08079A98 @ =gUnk_02033A90 + ldr r0, _08079A98 @ =gArea ldrb r0, [r0, #0x17] ldr r4, _08079A9C @ =0x000002C2 cmp r0, #4 @@ -4155,7 +4155,7 @@ _08079A72: lsls r4, r4, #3 b _08079AD8 .align 2, 0 -_08079A98: .4byte gUnk_02033A90 +_08079A98: .4byte gArea _08079A9C: .4byte 0x000002C2 _08079AA0: cmp r1, #0 @@ -5432,7 +5432,7 @@ _0807A468: cmp r2, #0 beq _0807A4F2 _0807A46E: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0807A4B0 ldr r4, _0807A4AC @ =gLinkEntity diff --git a/asm/code_0807B9B8.s b/asm/code_0807B9B8.s index 6fc49a41..2360e828 100644 --- a/asm/code_0807B9B8.s +++ b/asm/code_0807B9B8.s @@ -458,7 +458,7 @@ sub_0807BD14: @ 0x0807BD14 strb r5, [r1, #0x10] bl sub_08052E8C adds r2, r0, #0 - ldr r1, _0807BD6C @ =gUnk_02033A90 + ldr r1, _0807BD6C @ =gArea ldr r3, _0807BD70 @ =0x0000085C adds r0, r1, r3 str r2, [r0] @@ -477,7 +477,7 @@ sub_0807BD14: @ 0x0807BD14 b _0807BD98 .align 2, 0 _0807BD68: .4byte gRoomControls -_0807BD6C: .4byte gUnk_02033A90 +_0807BD6C: .4byte gArea _0807BD70: .4byte 0x0000085C _0807BD74: ldrh r0, [r2, #6] @@ -686,7 +686,7 @@ sub_0807BEEC: @ 0x0807BEEC push {r4, r5, r6, r7, lr} adds r6, r0, #0 adds r7, r1, #0 - ldr r0, _0807BF04 @ =gUnk_02033A90 + ldr r0, _0807BF04 @ =gArea ldrb r1, [r0, #0xd] movs r0, #1 ands r0, r1 @@ -696,7 +696,7 @@ sub_0807BEEC: @ 0x0807BEEC ldrb r0, [r0, #5] b _0807BF7C .align 2, 0 -_0807BF04: .4byte gUnk_02033A90 +_0807BF04: .4byte gArea _0807BF08: .4byte gRoomControls _0807BF0C: cmp r2, #1 @@ -789,7 +789,7 @@ _0807BFA4: thumb_func_start sub_0807BFA8 sub_0807BFA8: @ 0x0807BFA8 ldr r2, _0807BFC4 @ =gRoomControls - ldr r0, _0807BFC8 @ =gUnk_02033A90 + ldr r0, _0807BFC8 @ =gArea ldr r1, _0807BFCC @ =0x0000085C adds r0, r0, r1 ldr r1, [r0] @@ -804,7 +804,7 @@ sub_0807BFA8: @ 0x0807BFA8 bx lr .align 2, 0 _0807BFC4: .4byte gRoomControls -_0807BFC8: .4byte gUnk_02033A90 +_0807BFC8: .4byte gArea _0807BFCC: .4byte 0x0000085C thumb_func_start sub_0807BFD0 @@ -832,7 +832,7 @@ sub_0807BFD0: @ 0x0807BFD0 bl sub_0801D5EC strh r5, [r4] ldr r2, _0807C0C4 @ =gRoomControls - ldr r0, _0807C0C8 @ =gUnk_02033A90 + ldr r0, _0807C0C8 @ =gArea ldr r1, _0807C0CC @ =0x0000085C adds r4, r0, r1 ldr r0, [r4] @@ -925,7 +925,7 @@ _0807C0B8: .4byte 0x0000FFFF _0807C0BC: .4byte gUnk_0202AEB4 _0807C0C0: .4byte gUnk_02010654 _0807C0C4: .4byte gRoomControls -_0807C0C8: .4byte gUnk_02033A90 +_0807C0C8: .4byte gArea _0807C0CC: .4byte 0x0000085C _0807C0D0: .4byte gUnk_020176A0 _0807C0D4: .4byte gUnk_0200B644 @@ -961,7 +961,7 @@ sub_0807C0DC: @ 0x0807C0DC ldr r0, _0807C164 @ =gUnk_02002F00 adds r1, r4, #0 bl sub_0801D630 - ldr r0, _0807C168 @ =gUnk_02033A90 + ldr r0, _0807C168 @ =gArea ldr r1, _0807C16C @ =0x0000085C adds r0, r0, r1 ldr r0, [r0] @@ -992,7 +992,7 @@ _0807C158: .4byte gRoomControls _0807C15C: .4byte gUnk_0200B654 _0807C160: .4byte gUnk_02019EE0 _0807C164: .4byte gUnk_02002F00 -_0807C168: .4byte gUnk_02033A90 +_0807C168: .4byte gArea _0807C16C: .4byte 0x0000085C _0807C170: .4byte gUnk_02025EB0 _0807C174: .4byte 0x0000FFFF @@ -1294,7 +1294,7 @@ _0807C41C: movs r3, #0 orrs r1, r0 strh r1, [r2] - ldr r0, _0807C45C @ =gUnk_02033A90 + ldr r0, _0807C45C @ =gArea ldrb r0, [r0, #0xc] cmp r0, #0 beq _0807C444 @@ -1313,7 +1313,7 @@ _0807C44C: .4byte gUnk_02025EB0 _0807C450: .4byte gUnk_080B77C0 _0807C454: .4byte gUnk_0200B650 _0807C458: .4byte gScreen -_0807C45C: .4byte gUnk_02033A90 +_0807C45C: .4byte gArea thumb_func_start sub_0807C460 sub_0807C460: @ 0x0807C460 @@ -1411,7 +1411,7 @@ sub_0807C4F8: @ 0x0807C4F8 adds r1, r4, #0 bl sub_0801D630 ldr r5, _0807C5A0 @ =gUnk_02022830 - ldr r0, _0807C5A4 @ =gUnk_02033A90 + ldr r0, _0807C5A4 @ =gArea ldr r1, _0807C5A8 @ =0x0000085C adds r0, r0, r1 ldr r0, [r0] @@ -1475,7 +1475,7 @@ _0807C594: .4byte gRoomControls _0807C598: .4byte gUnk_02019EE0 _0807C59C: .4byte gUnk_02002F00 _0807C5A0: .4byte gUnk_02022830 -_0807C5A4: .4byte gUnk_02033A90 +_0807C5A4: .4byte gArea _0807C5A8: .4byte 0x0000085C _0807C5AC: .4byte 0x7FFFFFFF diff --git a/asm/code_0807CAA0.s b/asm/code_0807CAA0.s index a6da3977..8704b9ff 100644 --- a/asm/code_0807CAA0.s +++ b/asm/code_0807CAA0.s @@ -30,7 +30,7 @@ _0807CAC4: .4byte gUnk_02002B32 thumb_func_start sub_0807CAC8 sub_0807CAC8: @ 0x0807CAC8 ldr r2, _0807CAE0 @ =gUnk_02002A40 - ldr r1, _0807CAE4 @ =gUnk_02033A90 + ldr r1, _0807CAE4 @ =gArea ldr r3, _0807CAE8 @ =0x0000047C adds r2, r2, r3 ldrb r1, [r1, #3] @@ -43,14 +43,14 @@ sub_0807CAC8: @ 0x0807CAC8 bx lr .align 2, 0 _0807CAE0: .4byte gUnk_02002A40 -_0807CAE4: .4byte gUnk_02033A90 +_0807CAE4: .4byte gArea _0807CAE8: .4byte 0x0000047C thumb_func_start sub_0807CAEC sub_0807CAEC: @ 0x0807CAEC adds r2, r0, #0 ldr r0, _0807CB04 @ =gUnk_02002A40 - ldr r1, _0807CB08 @ =gUnk_02033A90 + ldr r1, _0807CB08 @ =gArea ldr r3, _0807CB0C @ =0x0000047C adds r0, r0, r3 ldrb r1, [r1, #3] @@ -62,20 +62,20 @@ sub_0807CAEC: @ 0x0807CAEC bx lr .align 2, 0 _0807CB04: .4byte gUnk_02002A40 -_0807CB08: .4byte gUnk_02033A90 +_0807CB08: .4byte gArea _0807CB0C: .4byte 0x0000047C thumb_func_start CheckLocalFlagByOffset CheckLocalFlagByOffset: @ 0x0807CB10 push {lr} adds r2, r0, #0 - ldr r0, _0807CB20 @ =gUnk_02002C9C + ldr r0, _0807CB20 @ =gGlobalFlags adds r2, r2, r1 adds r1, r2, #0 bl sub_0801D5A8 pop {pc} .align 2, 0 -_0807CB20: .4byte gUnk_02002C9C +_0807CB20: .4byte gGlobalFlags thumb_func_start sub_0807CB24 sub_0807CB24: @ 0x0807CB24 @@ -156,12 +156,12 @@ _0807CBCA: CheckLocalFlag: @ 0x0807CBD0 push {lr} adds r1, r0, #0 - ldr r0, _0807CBE0 @ =gUnk_02033A90 + ldr r0, _0807CBE0 @ =gArea ldrh r0, [r0, #4] bl CheckLocalFlagByOffset pop {pc} .align 2, 0 -_0807CBE0: .4byte gUnk_02033A90 +_0807CBE0: .4byte gArea thumb_func_start CheckFlags CheckFlags: @ 0x0807CBE4 diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 99f62a4b..51d76c15 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -19,26 +19,26 @@ _0807CC48: .4byte gUnk_02034364 CheckLocalFlagsByOffset: @ 0x0807CC4C push {lr} adds r3, r0, #0 - ldr r0, _0807CC5C @ =gUnk_02002C9C + ldr r0, _0807CC5C @ =gGlobalFlags adds r3, r3, r1 adds r1, r3, #0 bl sub_08000F10 pop {pc} .align 2, 0 -_0807CC5C: .4byte gUnk_02002C9C +_0807CC5C: .4byte gGlobalFlags thumb_func_start CheckLocalFlags CheckLocalFlags: @ 0x0807CC60 push {lr} adds r3, r0, #0 adds r2, r1, #0 - ldr r0, _0807CC74 @ =gUnk_02033A90 + ldr r0, _0807CC74 @ =gArea ldrh r0, [r0, #4] adds r1, r3, #0 bl CheckLocalFlagsByOffset pop {pc} .align 2, 0 -_0807CC74: .4byte gUnk_02033A90 +_0807CC74: .4byte gArea thumb_func_start CheckGlobalFlags CheckGlobalFlags: @ 0x0807CC78 @@ -68,24 +68,24 @@ SetLocalFlagByOffset: @ 0x0807CC9C adds r2, r0, #0 cmp r1, #0 beq _0807CCAC - ldr r0, _0807CCB0 @ =gUnk_02002C9C + ldr r0, _0807CCB0 @ =gGlobalFlags adds r1, r2, r1 bl sub_0801D5BC _0807CCAC: pop {pc} .align 2, 0 -_0807CCB0: .4byte gUnk_02002C9C +_0807CCB0: .4byte gGlobalFlags thumb_func_start SetLocalFlag SetLocalFlag: @ 0x0807CCB4 push {lr} adds r1, r0, #0 - ldr r0, _0807CCC4 @ =gUnk_02033A90 + ldr r0, _0807CCC4 @ =gArea ldrh r0, [r0, #4] bl SetLocalFlagByOffset pop {pc} .align 2, 0 -_0807CCC4: .4byte gUnk_02033A90 +_0807CCC4: .4byte gArea thumb_func_start SetFlag SetFlag: @ 0x0807CCC8 @@ -142,24 +142,24 @@ _0807CD1C: .4byte gUnk_02034364 ClearLocalFlagByOffset: @ 0x0807CD20 push {lr} adds r2, r0, #0 - ldr r0, _0807CD30 @ =gUnk_02002C9C + ldr r0, _0807CD30 @ =gGlobalFlags adds r2, r2, r1 adds r1, r2, #0 bl sub_0801D5D4 pop {pc} .align 2, 0 -_0807CD30: .4byte gUnk_02002C9C +_0807CD30: .4byte gGlobalFlags thumb_func_start ClearLocalFlag ClearLocalFlag: @ 0x0807CD34 push {lr} adds r1, r0, #0 - ldr r0, _0807CD44 @ =gUnk_02033A90 + ldr r0, _0807CD44 @ =gArea ldrh r0, [r0, #4] bl ClearLocalFlagByOffset pop {pc} .align 2, 0 -_0807CD44: .4byte gUnk_02033A90 +_0807CD44: .4byte gArea thumb_func_start ClearFlag ClearFlag: @ 0x0807CD48 @@ -5021,7 +5021,7 @@ sub_0807EFAC: @ 0x0807EFAC ldrh r0, [r1, #2] cmp r0, #0x63 bls _0807EFCC - ldr r0, _0807EFC8 @ =gUnk_02033A90 + ldr r0, _0807EFC8 @ =gArea movs r1, #0x86 lsls r1, r1, #4 adds r0, r0, r1 @@ -5029,7 +5029,7 @@ sub_0807EFAC: @ 0x0807EFAC bl PlaySFX b _0807EFD2 .align 2, 0 -_0807EFC8: .4byte gUnk_02033A90 +_0807EFC8: .4byte gArea _0807EFCC: ldrh r0, [r1, #2] bl PlaySFX @@ -8163,7 +8163,7 @@ sub_080806BC: @ 0x080806BC mov r8, r1 adds r7, r2, #0 adds r6, r3, #0 - ldr r0, _08080710 @ =gUnk_02033A90 + ldr r0, _08080710 @ =gArea ldr r1, _08080714 @ =0x0000085C adds r0, r0, r1 ldr r0, [r0] @@ -8196,7 +8196,7 @@ _080806E2: movs r0, #1 b _0808072A .align 2, 0 -_08080710: .4byte gUnk_02033A90 +_08080710: .4byte gArea _08080714: .4byte 0x0000085C _08080718: .4byte 0x0000FFFF _0808071C: .4byte gUnk_0811E7AC @@ -8221,7 +8221,7 @@ sub_08080734: @ 0x08080734 push {r7} adds r6, r0, #0 adds r5, r1, #0 - ldr r0, _08080778 @ =gUnk_02033A90 + ldr r0, _08080778 @ =gArea ldr r1, _0808077C @ =0x0000085C adds r0, r0, r1 ldr r0, [r0] @@ -8251,7 +8251,7 @@ _08080756: adds r0, r4, #0 b _0808078E .align 2, 0 -_08080778: .4byte gUnk_02033A90 +_08080778: .4byte gArea _0808077C: .4byte 0x0000085C _08080780: .4byte 0x0000FFFF _08080784: diff --git a/asm/code_0808C964.s b/asm/code_0808C964.s index ad3d2f14..68c04a5d 100644 --- a/asm/code_0808C964.s +++ b/asm/code_0808C964.s @@ -28,7 +28,7 @@ _0808C982: ldrb r0, [r4, #0xa] cmp r0, #4 bls _0808C996 - ldr r0, _0808CA0C @ =gUnk_02033A90 + ldr r0, _0808CA0C @ =gArea ldrb r0, [r0, #0x16] ldrb r1, [r4, #0xb] cmp r0, r1 @@ -94,7 +94,7 @@ _0808CA04: pop {r4, pc} .align 2, 0 _0808CA08: .4byte gUnk_02032EC0 -_0808CA0C: .4byte gUnk_02033A90 +_0808CA0C: .4byte gArea thumb_func_start sub_0808CA10 sub_0808CA10: @ 0x0808CA10 diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index d9aa2f71..c6376422 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -910,7 +910,7 @@ sub_080A5C44: @ 0x080A5C44 bl sub_080A5CFC movs r0, #0x81 bl sub_0801D7EC - ldr r4, _080A5C90 @ =gUnk_02033A90 + ldr r4, _080A5C90 @ =gArea ldrb r0, [r4, #3] movs r1, #1 bl sub_080A6FB4 @@ -935,7 +935,7 @@ sub_080A5C44: @ 0x080A5C44 .align 2, 0 _080A5C88: .4byte gUnk_02000080 _080A5C8C: .4byte gUnk_08128D38 -_080A5C90: .4byte gUnk_02033A90 +_080A5C90: .4byte gArea _080A5C94: .4byte gUnk_08128D43 _080A5C98: .4byte gScreen @@ -945,7 +945,7 @@ sub_080A5C9C: @ 0x080A5C9C bl sub_080A51F4 cmp r0, #0 beq _080A5CFA - ldr r0, _080A5CC4 @ =gUnk_02033A90 + ldr r0, _080A5CC4 @ =gArea ldrb r0, [r0, #3] lsls r0, r0, #2 ldr r1, _080A5CC8 @ =gUnk_080C9C6C @@ -960,7 +960,7 @@ sub_080A5C9C: @ 0x080A5C9C beq _080A5CDC b _080A5CE6 .align 2, 0 -_080A5CC4: .4byte gUnk_02033A90 +_080A5CC4: .4byte gArea _080A5CC8: .4byte gUnk_080C9C6C _080A5CCC: .4byte gUnk_02000080 _080A5CD0: .4byte gUnk_03000FF0 @@ -1009,7 +1009,7 @@ sub_080A5D1C: @ 0x080A5D1C mov r6, sb mov r5, r8 push {r5, r6, r7} - ldr r0, _080A5E98 @ =gUnk_02033A90 + ldr r0, _080A5E98 @ =gArea ldrb r0, [r0, #3] lsls r0, r0, #2 ldr r1, _080A5E9C @ =gUnk_080C9C6C @@ -1192,7 +1192,7 @@ _080A5E88: beq _080A5ECA b _080A5EEE .align 2, 0 -_080A5E98: .4byte gUnk_02033A90 +_080A5E98: .4byte gArea _080A5E9C: .4byte gUnk_080C9C6C _080A5EA0: .4byte gUnk_08128D3C _080A5EA4: .4byte gUnk_03001010 @@ -1262,7 +1262,7 @@ _080A5F20: .4byte 0x000001FB sub_080A5F24: @ 0x080A5F24 push {r4, lr} movs r4, #1 - ldr r0, _080A5F44 @ =gUnk_02033A90 + ldr r0, _080A5F44 @ =gArea ldrb r0, [r0, #3] cmp r0, #6 bne _080A5F40 @@ -1277,7 +1277,7 @@ _080A5F40: adds r0, r4, #0 pop {r4, pc} .align 2, 0 -_080A5F44: .4byte gUnk_02033A90 +_080A5F44: .4byte gArea thumb_func_start sub_080A5F48 sub_080A5F48: @ 0x080A5F48 @@ -3886,7 +3886,7 @@ _080A73B4: bl sub_0801D66C ldrb r0, [r4, #4] bl sub_08052D58 - ldr r4, _080A749C @ =gUnk_02033A90 + ldr r4, _080A749C @ =gArea strh r0, [r4, #4] bl sub_08052E8C ldr r1, _080A74A0 @ =0x0000085C @@ -3922,7 +3922,7 @@ _080A748C: .4byte gUnk_02024490 _080A7490: .4byte gRoomControls _080A7494: .4byte gUnk_03001020 _080A7498: .4byte gScreen -_080A749C: .4byte gUnk_02033A90 +_080A749C: .4byte gArea _080A74A0: .4byte 0x0000085C _080A74A4: .4byte 0x0000FFFF _080A74A8: @@ -9869,7 +9869,7 @@ _080AA0B8: strb r0, [r4, #0x14] ldr r0, _080AA10C @ =gUnk_080FD150 str r0, [r4, #0x48] - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _080AA100 ldrb r0, [r4, #0x1b] diff --git a/asm/code_080AD90C.s b/asm/code_080AD90C.s index f860239c..226d3a96 100644 --- a/asm/code_080AD90C.s +++ b/asm/code_080AD90C.s @@ -3444,7 +3444,7 @@ sub_080AF250: @ 0x080AF250 adds r4, r0, #0 bl sub_08052E8C adds r1, r0, #0 - ldr r0, _080AF26C @ =gUnk_02033A90 + ldr r0, _080AF26C @ =gArea ldr r2, _080AF270 @ =0x0000085C adds r0, r0, r2 str r1, [r0] @@ -3453,7 +3453,7 @@ sub_080AF250: @ 0x080AF250 ldr r0, _080AF274 @ =gUnk_08135190 b _080AF27A .align 2, 0 -_080AF26C: .4byte gUnk_02033A90 +_080AF26C: .4byte gArea _080AF270: .4byte 0x0000085C _080AF274: .4byte gUnk_08135190 _080AF278: @@ -3477,7 +3477,7 @@ sub_080AF284: @ 0x080AF284 cmp r0, #0 beq _080AF2BC bl sub_08052E8C - ldr r1, _080AF2B0 @ =gUnk_02033A90 + ldr r1, _080AF2B0 @ =gArea ldr r2, _080AF2B4 @ =0x0000085C adds r1, r1, r2 str r0, [r1] @@ -3485,7 +3485,7 @@ sub_080AF284: @ 0x080AF284 b _080AF2D4 .align 2, 0 _080AF2AC: .4byte gRoomControls -_080AF2B0: .4byte gUnk_02033A90 +_080AF2B0: .4byte gArea _080AF2B4: .4byte 0x0000085C _080AF2B8: .4byte gUnk_08135048 _080AF2BC: @@ -3494,7 +3494,7 @@ _080AF2BC: cmp r0, #0 beq _080AF2D6 bl sub_08052E8C - ldr r1, _080AF2D8 @ =gUnk_02033A90 + ldr r1, _080AF2D8 @ =gArea ldr r2, _080AF2DC @ =0x0000085C adds r1, r1, r2 str r0, [r1] @@ -3504,7 +3504,7 @@ _080AF2D4: _080AF2D6: pop {pc} .align 2, 0 -_080AF2D8: .4byte gUnk_02033A90 +_080AF2D8: .4byte gArea _080AF2DC: .4byte 0x0000085C _080AF2E0: .4byte gUnk_08134FBC @@ -3516,7 +3516,7 @@ sub_080AF2E4: @ 0x080AF2E4 cmp r0, #0 beq _080AF300 bl sub_08052E8C - ldr r1, _080AF304 @ =gUnk_02033A90 + ldr r1, _080AF304 @ =gArea ldr r2, _080AF308 @ =0x0000085C adds r1, r1, r2 str r0, [r1] @@ -3525,6 +3525,6 @@ sub_080AF2E4: @ 0x080AF2E4 _080AF300: pop {pc} .align 2, 0 -_080AF304: .4byte gUnk_02033A90 +_080AF304: .4byte gArea _080AF308: .4byte 0x0000085C _080AF30C: .4byte gUnk_0813A76C \ No newline at end of file diff --git a/asm/enemy50.s b/asm/enemy50.s index 1e1fdde0..27d37b49 100644 --- a/asm/enemy50.s +++ b/asm/enemy50.s @@ -853,7 +853,7 @@ _08041184: bl sub_0806FD54 cmp r0, #0 bne _080411B6 - ldr r0, _080411C0 @ =gUnk_02033A90 + ldr r0, _080411C0 @ =gArea movs r1, #0xa ldrsh r0, [r0, r1] cmp r0, #0xf @@ -872,7 +872,7 @@ _080411B6: movs r0, #1 b _080411CA .align 2, 0 -_080411C0: .4byte gUnk_02033A90 +_080411C0: .4byte gArea _080411C4: .4byte gUnk_020000B0 _080411C8: movs r0, #0 @@ -923,7 +923,7 @@ _08041204: .align 2, 0 _08041214: .4byte gLinkState _08041218: - ldr r0, _08041228 @ =gUnk_02033A90 + ldr r0, _08041228 @ =gArea movs r1, #0xa ldrsh r0, [r0, r1] cmp r0, #0xf @@ -933,7 +933,7 @@ _08041222: _08041224: pop {r4, pc} .align 2, 0 -_08041228: .4byte gUnk_02033A90 +_08041228: .4byte gArea thumb_func_start sub_0804122C sub_0804122C: @ 0x0804122C diff --git a/asm/ghini.s b/asm/ghini.s index fc68181b..2bdea02c 100644 --- a/asm/ghini.s +++ b/asm/ghini.s @@ -777,7 +777,7 @@ sub_0803F5A8: @ 0x0803F5A8 movs r0, #0 b _0803F5D2 _0803F5BA: - ldr r0, _0803F5CC @ =gUnk_02033A90 + ldr r0, _0803F5CC @ =gArea movs r1, #0xa ldrsh r0, [r0, r1] cmp r0, #0xf @@ -786,7 +786,7 @@ _0803F5BA: bl sub_0806FD54 b _0803F5D2 .align 2, 0 -_0803F5CC: .4byte gUnk_02033A90 +_0803F5CC: .4byte gArea _0803F5D0: movs r0, #1 _0803F5D2: @@ -814,7 +814,7 @@ _0803F5E8: bl sub_0806FD54 cmp r0, #0 bne _0803F61A - ldr r0, _0803F624 @ =gUnk_02033A90 + ldr r0, _0803F624 @ =gArea movs r1, #0xa ldrsh r0, [r0, r1] cmp r0, #0xf @@ -833,7 +833,7 @@ _0803F61A: movs r0, #1 b _0803F62E .align 2, 0 -_0803F624: .4byte gUnk_02033A90 +_0803F624: .4byte gArea _0803F628: .4byte gUnk_020000B0 _0803F62C: movs r0, #0 diff --git a/asm/jarPortal.s b/asm/jarPortal.s index b8cf6f41..993d343e 100644 --- a/asm/jarPortal.s +++ b/asm/jarPortal.s @@ -233,7 +233,7 @@ sub_0808C01C: @ 0x0808C01C bl sub_0806FBFC cmp r0, #0 beq _0808C0A6 - ldr r2, _0808C06C @ =gUnk_02033A90 + ldr r2, _0808C06C @ =gArea ldrh r0, [r4, #0x2e] strh r0, [r2, #0x12] ldrh r0, [r4, #0x32] @@ -260,13 +260,13 @@ _0808C050: strb r6, [r2, #0x18] b _0808C082 .align 2, 0 -_0808C06C: .4byte gUnk_02033A90 +_0808C06C: .4byte gArea _0808C070: .4byte gLinkState _0808C074: bl sub_08057810 cmp r0, #0 beq _0808C082 - ldr r1, _0808C0A8 @ =gUnk_02033A90 + ldr r1, _0808C0A8 @ =gArea movs r0, #3 strb r0, [r1, #0x18] _0808C082: @@ -289,7 +289,7 @@ _0808C082: _0808C0A6: pop {r4, r5, r6, pc} .align 2, 0 -_0808C0A8: .4byte gUnk_02033A90 +_0808C0A8: .4byte gArea thumb_func_start sub_0808C0AC sub_0808C0AC: @ 0x0808C0AC diff --git a/asm/lilypadLarge.s b/asm/lilypadLarge.s index 145849ca..8da18677 100644 --- a/asm/lilypadLarge.s +++ b/asm/lilypadLarge.s @@ -39,7 +39,7 @@ _08085520: ldrb r0, [r4, #0xa] cmp r0, #0 beq _08085552 - ldr r0, _08085540 @ =gUnk_02033A90 + ldr r0, _08085540 @ =gArea ldrb r0, [r0, #1] cmp r0, #0x1b beq _08085544 @@ -51,7 +51,7 @@ _08085520: strb r0, [r4, #0xc] b _080855E2 .align 2, 0 -_08085540: .4byte gUnk_02033A90 +_08085540: .4byte gArea _08085544: ldrb r0, [r4, #0xb] bl CheckLocalFlag @@ -795,7 +795,7 @@ _08085ACC: beq _08085B34 movs r0, #2 strb r0, [r4, #0xd] - ldr r0, _08085B08 @ =gUnk_02033A90 + ldr r0, _08085B08 @ =gArea ldrb r0, [r0, #1] cmp r0, #0x1b bne _08085B10 @@ -814,7 +814,7 @@ _08085ACC: .align 2, 0 _08085B00: .4byte 0x007FFFFF _08085B04: .4byte 0xFFFE0000 -_08085B08: .4byte gUnk_02033A90 +_08085B08: .4byte gArea _08085B0C: .4byte 0x0000FF30 _08085B10: ldrh r0, [r4, #0x32] @@ -879,7 +879,7 @@ _08085B7A: ldrh r1, [r1] subs r2, r0, r1 strh r2, [r4, #0x32] - ldr r0, _08085BA4 @ =gUnk_02033A90 + ldr r0, _08085BA4 @ =gArea ldrb r0, [r0, #1] cmp r0, #0x1b bne _08085BA8 @@ -890,7 +890,7 @@ _08085B7A: .align 2, 0 _08085B9C: .4byte 0x011FFFFF _08085BA0: .4byte gLinkEntity -_08085BA4: .4byte gUnk_02033A90 +_08085BA4: .4byte gArea _08085BA8: subs r0, r3, r1 adds r1, r2, #0 diff --git a/asm/lockedDoor.s b/asm/lockedDoor.s index cd803075..47097de4 100644 --- a/asm/lockedDoor.s +++ b/asm/lockedDoor.s @@ -178,7 +178,7 @@ _08083456: ldrh r2, [r5] adds r0, r4, #0 bl sub_080836DC - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 bne _08083484 movs r0, #5 diff --git a/asm/macroLink.s b/asm/macroLink.s index 52d9436b..0d21e0dc 100644 --- a/asm/macroLink.s +++ b/asm/macroLink.s @@ -429,7 +429,7 @@ sub_0808CDF8: @ 0x0808CDF8 lsls r0, r0, #0x18 cmp r0, #0 bne _0808CE2C - ldr r0, _0808CE30 @ =gUnk_02033A90 + ldr r0, _0808CE30 @ =gArea ldrb r1, [r0, #0x16] ldrb r0, [r3, #0xc] adds r0, #1 @@ -450,7 +450,7 @@ sub_0808CDF8: @ 0x0808CDF8 _0808CE2C: pop {pc} .align 2, 0 -_0808CE30: .4byte gUnk_02033A90 +_0808CE30: .4byte gArea _0808CE34: .4byte gUnk_081216B4 thumb_func_start sub_0808CE38 diff --git a/asm/minishSizedArchway.s b/asm/minishSizedArchway.s index 57c3e5c5..36e444be 100644 --- a/asm/minishSizedArchway.s +++ b/asm/minishSizedArchway.s @@ -24,7 +24,7 @@ sub_080973E4: @ 0x080973E4 strb r0, [r1] adds r0, r4, #0 bl UpdateSpriteOrderAndFlip - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0809741E adds r2, r4, #0 diff --git a/asm/minishSizedEntrance.s b/asm/minishSizedEntrance.s index 6fecaf06..b1c49016 100644 --- a/asm/minishSizedEntrance.s +++ b/asm/minishSizedEntrance.s @@ -38,7 +38,7 @@ sub_08090EC0: @ 0x08090EC0 strb r0, [r2] ldrb r0, [r4, #0xb] strb r0, [r4, #0x1e] - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _08090EFE ldrb r0, [r4, #0x1e] diff --git a/asm/object1E.s b/asm/object1E.s index cb67b6c0..8ac3215f 100644 --- a/asm/object1E.s +++ b/asm/object1E.s @@ -83,7 +83,7 @@ _08087588: .align 2, 0 _08087590: .4byte gLinkEntity _08087594: - ldr r0, _080875B4 @ =gUnk_02033A90 + ldr r0, _080875B4 @ =gArea ldrb r0, [r0, #1] movs r1, #4 cmp r0, #0x10 @@ -100,7 +100,7 @@ _080875A2: bne _080875CE b _080875C0 .align 2, 0 -_080875B4: .4byte gUnk_02033A90 +_080875B4: .4byte gArea _080875B8: ldrb r0, [r4, #0x18] movs r1, #0x40 diff --git a/asm/object3D.s b/asm/object3D.s index b6a7f3d7..74062d14 100644 --- a/asm/object3D.s +++ b/asm/object3D.s @@ -26,7 +26,7 @@ sub_0808CF08: @ 0x0808CF08 adds r4, r0, #0 movs r0, #1 strb r0, [r4, #0xc] - ldr r2, _0808CF50 @ =gUnk_02033A90 + ldr r2, _0808CF50 @ =gArea ldr r3, _0808CF54 @ =gRoomControls ldrh r0, [r2, #0x12] ldrh r1, [r3, #0xa] @@ -57,7 +57,7 @@ sub_0808CF08: @ 0x0808CF08 bl sub_0801E1EC pop {r4, r5, pc} .align 2, 0 -_0808CF50: .4byte gUnk_02033A90 +_0808CF50: .4byte gArea _0808CF54: .4byte gRoomControls _0808CF58: .4byte 0x00001F17 @@ -149,7 +149,7 @@ _0808CFC6: adds r1, r2, #0 movs r3, #0 bl sub_0805EC9C - ldr r0, _0808D02C @ =gUnk_02033A90 + ldr r0, _0808D02C @ =gArea strh r6, [r0, #0x10] movs r0, #5 movs r1, #8 @@ -160,7 +160,7 @@ _0808D01E: _0808D020: .4byte gScreen _0808D024: .4byte gUnk_02024490 _0808D028: .4byte gUnk_081216C8 -_0808D02C: .4byte gUnk_02033A90 +_0808D02C: .4byte gArea thumb_func_start sub_0808D030 sub_0808D030: @ 0x0808D030 @@ -233,7 +233,7 @@ _0808D0A6: bl sub_0805EC9C b _0808D0C2 _0808D0B4: - ldr r1, _0808D0C4 @ =gUnk_02033A90 + ldr r1, _0808D0C4 @ =gArea ldrb r0, [r1, #0xe] adds r0, #1 strb r0, [r1, #0xe] @@ -242,4 +242,4 @@ _0808D0B4: _0808D0C2: pop {r4, pc} .align 2, 0 -_0808D0C4: .4byte gUnk_02033A90 +_0808D0C4: .4byte gArea diff --git a/asm/objectBA.s b/asm/objectBA.s index de5fe7ef..07c60580 100644 --- a/asm/objectBA.s +++ b/asm/objectBA.s @@ -154,7 +154,7 @@ _080A171E: strh r0, [r2, #0x18] ldr r0, _080A1840 @ =0x80100000 bl PlaySFX - ldr r0, _080A1844 @ =gUnk_02033A90 + ldr r0, _080A1844 @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -176,7 +176,7 @@ _080A1834: .4byte 0x00001E07 _080A1838: .4byte gUnk_030010A0 _080A183C: .4byte gLinkState _080A1840: .4byte 0x80100000 -_080A1844: .4byte gUnk_02033A90 +_080A1844: .4byte gArea _080A1848: .4byte 0x00000864 thumb_func_start sub_080A184C diff --git a/asm/pesto.s b/asm/pesto.s index ac703d48..cf133a6e 100644 --- a/asm/pesto.s +++ b/asm/pesto.s @@ -307,7 +307,7 @@ _08024132: _08024136: adds r0, r4, #0 bl UpdateSpriteOrderAndFlip - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _08024150 ldrb r0, [r4, #0x1b] @@ -1385,7 +1385,7 @@ _0802497C: ldrb r0, [r4, #0xb] cmp r0, #0 bne _0802498A - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _080249CE _0802498A: diff --git a/asm/pullableMushroom.s b/asm/pullableMushroom.s index e889f1b6..695864ab 100644 --- a/asm/pullableMushroom.s +++ b/asm/pullableMushroom.s @@ -32,7 +32,7 @@ sub_0808AA1C: @ 0x0808AA1C movs r4, #0 movs r6, #1 strb r6, [r5, #0xc] - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 bne _0808AA36 adds r0, r5, #0 diff --git a/asm/vaatiRebornEnemy.s b/asm/vaatiRebornEnemy.s index 0af9664b..60542ae1 100644 --- a/asm/vaatiRebornEnemy.s +++ b/asm/vaatiRebornEnemy.s @@ -1605,7 +1605,7 @@ _0803DC66: strb r7, [r4, #0xe] ldr r0, _0803DCE8 @ =0x80100000 bl PlaySFX - ldr r0, _0803DCEC @ =gUnk_02033A90 + ldr r0, _0803DCEC @ =gArea movs r2, #0x86 lsls r2, r2, #4 adds r1, r0, r2 @@ -1617,7 +1617,7 @@ _0803DC66: .align 2, 0 _0803DCE4: .4byte gUnk_080D04D0 _0803DCE8: .4byte 0x80100000 -_0803DCEC: .4byte gUnk_02033A90 +_0803DCEC: .4byte gArea _0803DCF0: movs r0, #1 strb r0, [r4, #0xe] diff --git a/asm/wallMaster.s b/asm/wallMaster.s index f73a2e9d..70184360 100644 --- a/asm/wallMaster.s +++ b/asm/wallMaster.s @@ -442,7 +442,7 @@ sub_0802A734: @ 0x0802A734 bne _0802A768 bl sub_0805E5A8 ldr r1, _0802A760 @ =gUnk_0813AB1C - ldr r0, _0802A764 @ =gUnk_02033A90 + ldr r0, _0802A764 @ =gArea ldrb r0, [r0, #3] lsls r0, r0, #2 adds r0, r0, r1 @@ -451,7 +451,7 @@ sub_0802A734: @ 0x0802A734 b _0802A780 .align 2, 0 _0802A760: .4byte gUnk_0813AB1C -_0802A764: .4byte gUnk_02033A90 +_0802A764: .4byte gArea _0802A768: ldr r0, [r4, #0x34] ldr r1, _0802A784 @ =0xFFFE0000 diff --git a/asm/wallMaster2.s b/asm/wallMaster2.s index 074beb62..9d15e91d 100644 --- a/asm/wallMaster2.s +++ b/asm/wallMaster2.s @@ -365,7 +365,7 @@ sub_0802CEF4: @ 0x0802CEF4 bne _0802CF28 bl sub_0805E5A8 ldr r1, _0802CF20 @ =gUnk_0813AB1C - ldr r0, _0802CF24 @ =gUnk_02033A90 + ldr r0, _0802CF24 @ =gArea ldrb r0, [r0, #3] lsls r0, r0, #2 adds r0, r0, r1 @@ -374,7 +374,7 @@ sub_0802CEF4: @ 0x0802CEF4 b _0802CF5A .align 2, 0 _0802CF20: .4byte gUnk_0813AB1C -_0802CF24: .4byte gUnk_02033A90 +_0802CF24: .4byte gArea _0802CF28: ldr r0, [r4, #0x34] ldr r1, _0802CF5C @ =0xFFFE0000 diff --git a/asm/warpPoint.s b/asm/warpPoint.s index e36b43fe..677d8129 100644 --- a/asm/warpPoint.s +++ b/asm/warpPoint.s @@ -84,7 +84,7 @@ sub_0808B474: @ 0x0808B474 _0808B4D8: .4byte gUnk_08121380 _0808B4DC: .4byte gUnk_080FD168 _0808B4E0: - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0808B4F8 ldrb r0, [r4, #0xa] @@ -131,7 +131,7 @@ sub_0808B530: @ 0x0808B530 beq _0808B562 adds r0, r4, #0 bl sub_0808B830 - bl sub_08052660 + bl CheckIsDungeon cmp r0, #0 beq _0808B554 ldrb r0, [r4, #0xa] diff --git a/include/area.h b/include/area.h new file mode 100644 index 00000000..dfcc90df --- /dev/null +++ b/include/area.h @@ -0,0 +1,18 @@ +#ifndef AREA_H +#define AREA_H + +#include "global.h" + +typedef struct { + u8 areaMetadata; + u32 locationIndex; + u8 unk; + u16 localFlagOffset; + u8 filler[19]; + u8 fadeOut; + u8 filler[14]; +} Area; + +extern Area gArea; + +#endif \ No newline at end of file diff --git a/include/flags.h b/include/flags.h new file mode 100644 index 00000000..dbffc985 --- /dev/null +++ b/include/flags.h @@ -0,0 +1,30 @@ +#ifndef FLAGS_H +#define FLAGS_H + +#include "global.h" + +extern u32 CheckFlags(u32); +extern u32 CheckGlobalFlag(u32); +extern u32 CheckGlobalFlags(u32); +extern u32 CheckLocalFlag(u32); +extern u32 CheckLocalFlagByOffset(u32, u32); +extern u32 CheckLocalFlags(u32); +extern u32 CheckLocalFlagsByOffset(u32, u32); +extern u32 CheckRoomFlag(u32); +extern u32 CheckRoomFlags(u32); + +extern void ClearFlag(u32); +extern void ClearGlobalFlag(u32); +extern void ClearLocalFlag(u32); +extern void ClearLocalFlagByOffset(u32, u32); +extern void ClearRoomFlag(u32); + +extern void SetFlag(u32); +extern void SetGlobalFlag(u32); +extern void SetLocalFlag(u32); +extern void SetLocalFlagByOffset(u32, u32); +extern void SetRoomFlag(u32); + +extern u32 gGlobalFlags; + +#endif \ No newline at end of file diff --git a/include/link.h b/include/link.h index dac6500c..3050756a 100644 --- a/include/link.h +++ b/include/link.h @@ -2,6 +2,7 @@ #define LINK_H #include "global.h" +#include "entity.h" typedef struct { u8 filler[2]; @@ -47,5 +48,25 @@ typedef struct { u8 unk7; } LinkState; +typedef struct { + u8 walletType; + u8 heartPieces; + u8 health; + u8 maxHealth; + u8 bombCount; + u8 arrowCount; + u8 bombBagType; + u8 quiverType; + u8 filler[4]; + u8 itemOnA; + u8 itemonB; + u8 filler2[10]; + u16 rupees; + u8 filler3[12]; +} Stats; + +extern LinkState gLinkState; +extern Stats gStats; +extern Entity gLinkEntity; #endif \ No newline at end of file diff --git a/include/mainLoop.h b/include/main.h similarity index 100% rename from include/mainLoop.h rename to include/main.h diff --git a/include/random.h b/include/random.h new file mode 100644 index 00000000..8d0356b3 --- /dev/null +++ b/include/random.h @@ -0,0 +1,8 @@ +#ifndef RANDOM_H +#define RANDOM_H + +extern u32 Random(void); + +extern u32 gRand; + +#endif \ No newline at end of file diff --git a/include/stats.h b/include/stats.h deleted file mode 100644 index ae9f97aa..00000000 --- a/include/stats.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef STATS_H -#define STATS_H - -#include "global.h" -#include "item.h" - -typedef struct { - u8 walletType; - u8 heartPieces; - u8 health; - u8 maxHealth; - u8 bombCount; - u8 arrowCount; - u8 bombBagType; - u8 quiverType; - u8 filler[4]; - u8 itemOnA; - u8 itemonB; - u8 filler2[10]; - u16 rupees; - u8 filler3[12]; -} Stats; - -#endif \ No newline at end of file diff --git a/include/textbox.h b/include/textbox.h index 94293be9..dbc11020 100644 --- a/include/textbox.h +++ b/include/textbox.h @@ -16,4 +16,6 @@ typedef struct { u16 unk2; //HI? } TextBox; +extern TextBox gTextBox; + #endif \ No newline at end of file diff --git a/linker.ld b/linker.ld index ff6f35f2..d3d04cff 100644 --- a/linker.ld +++ b/linker.ld @@ -39,7 +39,7 @@ SECTIONS { . = 0x00002C01; gUnk_02002C01 = .; . = 0x00002C81; gUnk_02002C81 = .; . = 0x00002C8E; gUnk_02002C8E = .; - . = 0x00002C9C; gUnk_02002C9C = .; + . = 0x00002C9C; gGlobalFlags = .; . = 0x00002E9C; gUnk_02002E9C = .; . = 0x00002ECC; gUnk_02002ECC = .; . = 0x00002F00; gUnk_02002F00 = .; @@ -109,7 +109,7 @@ SECTIONS { . = 0x00032F14; gUnk_02032F14 = .; . = 0x00033280; gUnk_02033280 = .; . = 0x00033290; gUnk_02033290 = .; - . = 0x00033A90; gUnk_02033A90 = .; + . = 0x00033A90; gArea = .; . = 0x00033AB8; gUnk_02033AB8 = .; . = 0x00033ACC; gUnk_02033ACC = .; . = 0x000342CC; gUnk_020342CC = .; diff --git a/src/bitGetters.c b/src/bitGetters.c index 305c0822..9eb5063c 100644 --- a/src/bitGetters.c +++ b/src/bitGetters.c @@ -1,29 +1,29 @@ #include "global.h" -extern u8 gUnk_02033A90; +extern u8 gArea; u32 sub_08052654() { - return (gUnk_02033A90 >> 7) & 1; + return (gArea >> 7) & 1; } -u32 sub_08052660() +u32 CheckIsDungeon() { - return (gUnk_02033A90 >> 2) & 1; + return (gArea >> 2) & 1; } u32 sub_08052670() { - return (gUnk_02033A90 >> 4) & 1; + return (gArea >> 4) & 1; } u32 sub_08052680() { - return (gUnk_02033A90 >> 6) & 1; + return (gArea >> 6) & 1; } u32 sub_08052690() { - return (gUnk_02033A90 >> 3) & 1; + return (gArea >> 3) & 1; } diff --git a/src/mainLoop.c b/src/mainLoop.c index 858f5249..9230a2af 100644 --- a/src/mainLoop.c +++ b/src/mainLoop.c @@ -1,5 +1,5 @@ #include "global.h" -#include "mainLoop.h" +#include "main.h" #ifdef NON_MATCHING diff --git a/src/modHealth.c b/src/modHealth.c index 73d40f42..be51881c 100644 --- a/src/modHealth.c +++ b/src/modHealth.c @@ -1,9 +1,7 @@ #include "global.h" #include "entity.h" -#include "stats.h" +#include "link.h" -extern Stats gStats; -extern Entity gLinkEntity; s32 ModHealth(s32 deltaHealth) { diff --git a/src/modRupees.c b/src/modRupees.c index e6691444..47f59412 100644 --- a/src/modRupees.c +++ b/src/modRupees.c @@ -1,7 +1,6 @@ #include "global.h" -#include "stats.h" +#include "link.h" -extern Stats gStats; extern u16 gWalletSizes[4]; void ModRupees(s32 rupeeDelta) diff --git a/src/sub_0804AA84.c b/src/sub_0804AA84.c index 2667b5cd..8f45ee69 100644 --- a/src/sub_0804AA84.c +++ b/src/sub_0804AA84.c @@ -4,13 +4,13 @@ /* extern void sub_0805E5A8(); -extern u8 gUnk_02033A90; +extern u8 gArea; extern u8 gUnk_03001000; u32 sub_0804AA84(void) { - u8 * r3 = &gUnk_02033A90; + u8 * r3 = &gArea; u8 * r2; u8 r0 = *(u8 *)(r3 + 0x19); u8 r1; diff --git a/src/sub_08052620.c b/src/sub_08052620.c index 7c3e1c04..c91c9267 100644 --- a/src/sub_08052620.c +++ b/src/sub_08052620.c @@ -1,8 +1,8 @@ #include "global.h" -extern u8 gUnk_02033A90; +extern u8 gArea; bool32 sub_08052620(u32 r0) { - return gUnk_02033A90 == 0x81; + return gArea == 0x81; }