summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_2.s2
-rw-r--r--asm/code_800D090.s107
-rw-r--r--asm/code_80118A4.s2
-rw-r--r--asm/code_8012A18.s116
-rw-r--r--asm/code_801D760.s193
-rw-r--r--asm/code_803D110.s8
-rw-r--r--asm/code_80428A0.s191
-rw-r--r--asm/code_8048480.s12
-rw-r--r--asm/code_80521D0.s88
-rw-r--r--asm/code_808DAB4.s4
-rw-r--r--asm/code_809017C.s2
-rw-r--r--asm/code_8092334.s2
-rw-r--r--asm/code_8098BDC.s4
-rw-r--r--asm/code_80A26CC.s26
-rw-r--r--asm/code_80A7714.s4
-rw-r--r--asm/fatal_system_1.s42
-rw-r--r--asm/text.s4
-rw-r--r--asm/wonder_mail.s104
18 files changed, 295 insertions, 616 deletions
diff --git a/asm/code_2.s b/asm/code_2.s
index 59f97cf..4fb8c50 100644
--- a/asm/code_2.s
+++ b/asm/code_2.s
@@ -109,7 +109,7 @@ _080006B8:
_08000708: .4byte gUnknown_80B69F8
_0800070C: .4byte gUnknown_80B6A28
_08000710: .4byte 0x00005b20
-_08000714: .4byte gUnknown_8380000
+_08000714: .4byte gTitleMenuFileArchive
_08000718: .4byte gTitlePaletteFile
_0800071C: .4byte gUnknown_202B038
_08000720: .4byte 0x06008000
diff --git a/asm/code_800D090.s b/asm/code_800D090.s
index 3fd539a..043af00 100644
--- a/asm/code_800D090.s
+++ b/asm/code_800D090.s
@@ -5,19 +5,6 @@
.text
-
- thumb_func_start sub_800D158
-sub_800D158:
- push {r1-r3}
- push {lr}
- ldr r1, [sp, 0x4]
- add r2, sp, 0x8
- bl vsprintf
- pop {r3}
- add sp, 0xC
- bx r3
- thumb_func_end sub_800D158
-
thumb_func_start sub_800D16C
sub_800D16C:
push {r0-r3}
@@ -1381,8 +1368,8 @@ _0800DAF0:
_0800DB38: .4byte gUnknown_203B0CC
_0800DB3C: .4byte 0x00001a18
_0800DB40: .4byte 0x00001a04
-_0800DB44: .4byte gUnknown_80B9C6C
-_0800DB48: .4byte gUnknown_9740000
+_0800DB44: .4byte gefob001_string
+_0800DB48: .4byte gEffectFileArchive
_0800DB4C:
ldr r0, _0800DB74
ldr r1, _0800DB78
@@ -1402,8 +1389,8 @@ _0800DB6C:
pop {r0}
bx r0
.align 2, 0
-_0800DB74: .4byte gUnknown_80B9C74
-_0800DB78: .4byte gUnknown_9740000
+_0800DB74: .4byte gefob000_string
+_0800DB78: .4byte gEffectFileArchive
thumb_func_end sub_800DAC0
thumb_func_start sub_800DB7C
@@ -4534,7 +4521,7 @@ _0800F1EC:
bx r1
.align 2, 0
_0800F1FC: .4byte gUnknown_80CE788
-_0800F200: .4byte gUnknown_9740000
+_0800F200: .4byte gEffectFileArchive
thumb_func_end sub_800F1C0
thumb_func_start sub_800F204
@@ -7205,9 +7192,9 @@ _080106A2:
bx r0
.align 2, 0
_080106E4: .4byte gUnknown_80D4014
-_080106E8: .4byte gUnknown_8380000
+_080106E8: .4byte gTitleMenuFileArchive
_080106EC: .4byte gUnknown_80D405C
-_080106F0: .4byte gUnknown_8510000
+_080106F0: .4byte gMonsterFileArchive
_080106F4: .4byte gUnknown_203B0E8
_080106F8: .4byte 0x0000110c
_080106FC: .4byte gUnknown_80D4064
@@ -8155,9 +8142,9 @@ _08010E84:
bx r0
.align 2, 0
_08010EBC: .4byte gUnknown_80D408C
-_08010EC0: .4byte gUnknown_8380000
+_08010EC0: .4byte gTitleMenuFileArchive
_08010EC4: .4byte gUnknown_80D40E4
-_08010EC8: .4byte gUnknown_8510000
+_08010EC8: .4byte gMonsterFileArchive
_08010ECC: .4byte gUnknown_203B0E4
_08010ED0: .4byte gUnknown_80D40EC
_08010ED4: .4byte gUnknown_80D40F4
@@ -9125,80 +9112,4 @@ _08011694: .4byte 0x00004a2c
_08011698: .4byte gUnknown_80D4124
thumb_func_end sub_8011494
- thumb_func_start sub_801169C
-sub_801169C:
- push {r4-r6,lr}
- sub sp, 0x8
- ldr r5, _08011744
- ldr r1, [r5]
- ldr r4, _08011748
- adds r0, r1, r4
- movs r2, 0
- ldrsh r0, [r0, r2]
- ldr r6, _0801174C
- adds r1, r6
- movs r3, 0
- ldrsh r1, [r1, r3]
- bl SetBG2RegOffsets
- ldr r1, [r5]
- adds r4, r1, r4
- movs r2, 0
- ldrsh r0, [r4, r2]
- adds r1, r6
- movs r3, 0
- ldrsh r1, [r1, r3]
- bl SetBG3RegOffsets
- bl sub_8010F28
- bl sub_80111C4
- lsls r0, 24
- lsrs r0, 24
- ldr r2, [r5]
- ldr r3, _08011750
- adds r1, r2, r3
- ldr r3, _08011754
- adds r2, r3
- ldr r2, [r2]
- str r2, [sp]
- movs r2, 0
- str r2, [sp, 0x4]
- movs r2, 0xB0
- movs r3, 0x10
- bl sub_8004AF0
- movs r0, 0
- movs r1, 0
- bl sub_8005838
- ldr r0, _08011758
- ldr r0, [r0]
- ldrb r0, [r0, 0xA]
- bl nullsub_8
- bl sub_8005180
- bl sub_80060EC
- ldr r0, _0801175C
- ldr r0, [r0]
- bl IncrementPlayTime
- bl sub_800CB20
- bl LoadBufferedInputs
- bl CopySpritesToOam
- bl sub_8005304
- bl TransferBGPaletteBuffer
- bl xxx_call_update_bg_vram
- bl sub_8009908
- bl xxx_call_update_bg_sound_input
- bl sub_8011860
- movs r0, 0
- bl ResetSprites
- add sp, 0x8
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08011744: .4byte gUnknown_203B0E4
-_08011748: .4byte 0x00004dd4
-_0801174C: .4byte 0x00004dd6
-_08011750: .4byte 0x00004c4c
-_08011754: .4byte 0x00004dcc
-_08011758: .4byte gUnknown_203B46C
-_0801175C: .4byte gUnknown_203B47C
- thumb_func_end sub_801169C
-
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/code_80118A4.s b/asm/code_80118A4.s
index 5a097ed..06b2d1f 100644
--- a/asm/code_80118A4.s
+++ b/asm/code_80118A4.s
@@ -32,7 +32,7 @@ PrintMessageWithFuncFileLine:
add sp, 0x8
bx r3
.align 2, 0
-_08011AFC: .4byte gUnknown_80D41EC
+_08011AFC: .4byte gFuncFileLineString2
thumb_func_end PrintMessageWithFuncFileLine
.align 2,0 @ Don't pad with nop
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index c430037..da4763e 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -7524,7 +7524,7 @@ _08016594:
ldr r2, [r2]
b _08016844
.align 2, 0
-_080165B0: .4byte gUnknown_80D49E0
+_080165B0: .4byte gFelicityDialogue
_080165B4:
bl sub_8016900
ldr r0, _080165FC
@@ -7563,7 +7563,7 @@ _080165B4:
.align 2, 0
_080165FC: .4byte gUnknown_203B204
_08016600: .4byte gUnknown_203B460
-_08016604: .4byte gUnknown_80D49E0
+_08016604: .4byte gFelicityDialogue
_08016608:
ldr r0, _08016648
str r4, [r0]
@@ -7598,7 +7598,7 @@ _08016632:
b _080168EC
.align 2, 0
_08016648: .4byte gUnknown_202DE30
-_0801664C: .4byte gUnknown_80D49E0
+_0801664C: .4byte gFelicityDialogue
_08016650:
ldr r3, [r2]
movs r0, 0x1
@@ -7611,7 +7611,7 @@ _08016650:
adds r2, 0x38
b _0801683C
.align 2, 0
-_08016664: .4byte gUnknown_80D49E0
+_08016664: .4byte gFelicityDialogue
_08016668:
ldr r3, [r2]
movs r0, 0x6
@@ -7638,7 +7638,7 @@ _08016668:
b _08016844
.align 2, 0
_08016698: .4byte gUnknown_203B460
-_0801669C: .4byte gUnknown_80D49E0
+_0801669C: .4byte gFelicityDialogue
_080166A0:
ldr r0, _080166BC
str r1, [r0]
@@ -7656,7 +7656,7 @@ _080166A0:
b _08016844
.align 2, 0
_080166BC: .4byte gUnknown_202DE30
-_080166C0: .4byte gUnknown_80D49E0
+_080166C0: .4byte gFelicityDialogue
_080166C4:
ldr r3, [r2]
movs r0, 0x1
@@ -7669,7 +7669,7 @@ _080166C4:
adds r2, 0xC
b _0801683C
.align 2, 0
-_080166D8: .4byte gUnknown_80D49E0
+_080166D8: .4byte gFelicityDialogue
_080166DC:
ldr r0, _08016700
ldr r1, [r0]
@@ -7691,7 +7691,7 @@ _080166DC:
b _0801683C
.align 2, 0
_08016700: .4byte gUnknown_203B460
-_08016704: .4byte gUnknown_80D49E0
+_08016704: .4byte gFelicityDialogue
_08016708:
movs r5, 0x99
lsls r5, 2
@@ -7712,7 +7712,7 @@ _08016708:
b _0801683C
.align 2, 0
_0801672C: .4byte 0x0098967e
-_08016730: .4byte gUnknown_80D49E0
+_08016730: .4byte gFelicityDialogue
_08016734:
ldr r3, [r2]
movs r0, 0x8
@@ -7725,7 +7725,7 @@ _08016734:
adds r2, 0x18
b _0801683C
.align 2, 0
-_08016748: .4byte gUnknown_80D49E0
+_08016748: .4byte gFelicityDialogue
_0801674C:
ldr r4, [r2]
ldr r0, _080167A0
@@ -7788,7 +7788,7 @@ _080167A8:
b _0801683C
.align 2, 0
_080167C4: .4byte gUnknown_202DE30
-_080167C8: .4byte gUnknown_80D49E0
+_080167C8: .4byte gFelicityDialogue
_080167CC:
ldr r0, _080167F4
ldr r3, [r0]
@@ -7812,7 +7812,7 @@ _080167CC:
.align 2, 0
_080167F4: .4byte gUnknown_203B460
_080167F8: .4byte 0x0001869e
-_080167FC: .4byte gUnknown_80D49E0
+_080167FC: .4byte gFelicityDialogue
_08016800:
movs r5, 0x99
lsls r5, 2
@@ -7831,7 +7831,7 @@ _08016800:
adds r2, 0x2C
b _0801683C
.align 2, 0
-_08016820: .4byte gUnknown_80D49E0
+_08016820: .4byte gFelicityDialogue
_08016824:
ldr r3, [r2]
movs r0, 0xB
@@ -7857,7 +7857,7 @@ _08016844:
b _080168EC
.align 2, 0
_08016850: .4byte gUnknown_202DE30
-_08016854: .4byte gUnknown_80D49E0
+_08016854: .4byte gFelicityDialogue
_08016858: .4byte 0x0000010d
_0801685C:
ldr r4, [r2]
@@ -7905,7 +7905,7 @@ _080168AE:
bl sub_8016B48
_080168B2:
movs r0, 0x3
- bl sub_8016BB8
+ bl CreateFelicityBankShopMenu
b _080168EC
.align 2, 0
_080168BC: .4byte gUnknown_203B460
@@ -7937,7 +7937,7 @@ _080168EC:
bx r0
.align 2, 0
_080168F4: .4byte gUnknown_202DE30
-_080168F8: .4byte gUnknown_80D49E0
+_080168F8: .4byte gFelicityDialogue
_080168FC: .4byte 0x0000010d
thumb_func_end sub_801653C
@@ -8271,7 +8271,7 @@ sub_8016B48:
b _08016B96
.align 2, 0
_08016B7C: .4byte gUnknown_203B204
-_08016B80: .4byte gUnknown_80D49CC
+_08016B80: .4byte gFelicityDeposit
_08016B84:
ldr r0, _08016BB0
ldr r2, [r0]
@@ -8294,12 +8294,12 @@ _08016B96:
pop {r0}
bx r0
.align 2, 0
-_08016BB0: .4byte gUnknown_80D49DC
+_08016BB0: .4byte gFelicityWithdraw
_08016BB4: .4byte gUnknown_203B204
thumb_func_end sub_8016B48
- thumb_func_start sub_8016BB8
-sub_8016BB8:
+ thumb_func_start CreateFelicityBankShopMenu
+CreateFelicityBankShopMenu:
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -8356,10 +8356,10 @@ sub_8016BB8:
pop {r0}
bx r0
.align 2, 0
-_08016C34: .4byte gUnknown_80DB724
+_08016C34: .4byte gFelicityMoney
_08016C38: .4byte gUnknown_203B460
-_08016C3C: .4byte gUnknown_80DB72C
- thumb_func_end sub_8016BB8
+_08016C3C: .4byte gFelicitySavings
+ thumb_func_end CreateFelicityBankShopMenu
thumb_func_start sub_8016C40
sub_8016C40:
@@ -12672,7 +12672,7 @@ _08018F30:
adds r0, r2
b _08018F76
.align 2, 0
-_08018F50: .4byte gUnknown_80D5EC8
+_08018F50: .4byte gKecleonShopDialogue
_08018F54: .4byte gUnknown_203B210
_08018F58:
bl sub_8019DAC
@@ -12709,7 +12709,7 @@ _08018F76:
bl sub_8014248
b _080194E8
.align 2, 0
-_08018FA0: .4byte gUnknown_80D5EC8
+_08018FA0: .4byte gKecleonShopDialogue
_08018FA4: .4byte gUnknown_203B210
_08018FA8:
ldr r1, [r4]
@@ -12729,7 +12729,7 @@ _08018FA8:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08018FCC: .4byte gUnknown_80D5EC8
+_08018FCC: .4byte gKecleonShopDialogue
_08018FD0:
ldr r1, [r4]
movs r0, 0x4
@@ -12749,7 +12749,7 @@ _08018FD0:
ldr r3, _08018FF8
b _08019456
.align 2, 0
-_08018FF4: .4byte gUnknown_80D5EC8
+_08018FF4: .4byte gKecleonShopDialogue
_08018FF8: .4byte 0x0000030d
_08018FFC:
ldr r1, [r4]
@@ -12769,7 +12769,7 @@ _08018FFC:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019020: .4byte gUnknown_80D5EC8
+_08019020: .4byte gKecleonShopDialogue
_08019024:
ldr r1, [r4]
movs r0, 0x10
@@ -12788,7 +12788,7 @@ _08019024:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019048: .4byte gUnknown_80D5EC8
+_08019048: .4byte gKecleonShopDialogue
_0801904C:
ldr r1, [r4]
movs r0, 0x1
@@ -12806,7 +12806,7 @@ _0801904C:
ldr r2, [r2]
b _08019454
.align 2, 0
-_0801906C: .4byte gUnknown_80D5EC8
+_0801906C: .4byte gKecleonShopDialogue
_08019070:
ldr r1, [r4]
movs r0, 0x1
@@ -12824,7 +12824,7 @@ _08019070:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019090: .4byte gUnknown_80D5EC8
+_08019090: .4byte gKecleonShopDialogue
_08019094:
ldr r1, [r4]
movs r0, 0x1
@@ -12842,7 +12842,7 @@ _08019094:
ldr r2, [r2]
b _08019454
.align 2, 0
-_080190B4: .4byte gUnknown_80D5EC8
+_080190B4: .4byte gKecleonShopDialogue
_080190B8:
ldr r1, [r4]
movs r0, 0x1
@@ -12860,7 +12860,7 @@ _080190B8:
ldr r2, [r2]
b _08019454
.align 2, 0
-_080190D8: .4byte gUnknown_80D5EC8
+_080190D8: .4byte gKecleonShopDialogue
_080190DC:
ldr r1, [r4]
movs r0, 0x1
@@ -12879,7 +12879,7 @@ _080190DC:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019100: .4byte gUnknown_80D5EC8
+_08019100: .4byte gKecleonShopDialogue
_08019104:
ldr r1, [r4]
movs r0, 0x10
@@ -12898,7 +12898,7 @@ _08019104:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019128: .4byte gUnknown_80D5EC8
+_08019128: .4byte gKecleonShopDialogue
_0801912C:
ldr r0, _0801915C
ldr r1, [r4]
@@ -12923,7 +12923,7 @@ _0801912C:
b _08019454
.align 2, 0
_0801915C: .4byte gUnknown_202DE58
-_08019160: .4byte gUnknown_80D5EC8
+_08019160: .4byte gKecleonShopDialogue
_08019164:
ldr r1, [r4]
movs r0, 0x18
@@ -12942,7 +12942,7 @@ _08019164:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019188: .4byte gUnknown_80D5EC8
+_08019188: .4byte gKecleonShopDialogue
_0801918C:
ldr r1, [r4]
movs r0, 0x12
@@ -12961,7 +12961,7 @@ _0801918C:
ldr r2, [r2]
b _08019454
.align 2, 0
-_080191B0: .4byte gUnknown_80D5EC8
+_080191B0: .4byte gKecleonShopDialogue
_080191B4:
ldr r1, [r4]
movs r0, 0x13
@@ -12980,7 +12980,7 @@ _080191B4:
ldr r2, [r2]
b _08019454
.align 2, 0
-_080191D8: .4byte gUnknown_80D5EC8
+_080191D8: .4byte gKecleonShopDialogue
_080191DC:
ldr r0, [r4]
ldrb r0, [r0, 0x4]
@@ -13063,7 +13063,7 @@ _08019254:
_08019284: .4byte gUnknown_202DE58
_08019288: .4byte gUnknown_203B210
_0801928C: .4byte gUnknown_202DE30
-_08019290: .4byte gUnknown_80D5EC8
+_08019290: .4byte gKecleonShopDialogue
_08019294:
bl sub_8019D8C
cmp r0, 0
@@ -13126,7 +13126,7 @@ _080192F2:
b _0801944C
.align 2, 0
_0801930C: .4byte gUnknown_203B210
-_08019310: .4byte gUnknown_80D5EC8
+_08019310: .4byte gKecleonShopDialogue
_08019314:
ldr r1, [r4]
movs r0, 0x1A
@@ -13145,7 +13145,7 @@ _08019314:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019338: .4byte gUnknown_80D5EC8
+_08019338: .4byte gKecleonShopDialogue
_0801933C:
ldr r1, [r4]
movs r0, 0x1B
@@ -13164,7 +13164,7 @@ _0801933C:
ldr r2, [r2]
b _08019454
.align 2, 0
-_08019360: .4byte gUnknown_80D5EC8
+_08019360: .4byte gKecleonShopDialogue
_08019364:
movs r0, 0x4
movs r1, 0x3
@@ -13227,7 +13227,7 @@ _080193B4:
_080193E4: .4byte gUnknown_202DE58
_080193E8: .4byte gUnknown_203B210
_080193EC: .4byte gUnknown_202DE30
-_080193F0: .4byte gUnknown_80D5EC8
+_080193F0: .4byte gKecleonShopDialogue
_080193F4:
ldr r0, [r4]
adds r0, 0x1C
@@ -13284,7 +13284,7 @@ _08019456:
b _080194E8
.align 2, 0
_08019460: .4byte gUnknown_203B210
-_08019464: .4byte gUnknown_80D5EC8
+_08019464: .4byte gKecleonShopDialogue
_08019468: .4byte 0x0000010d
_0801946C:
bl sub_8019700
@@ -13323,7 +13323,7 @@ _0801948C:
.align 2, 0
_080194B4: .4byte gUnknown_202DE30
_080194B8: .4byte gUnknown_203B210
-_080194BC: .4byte gUnknown_80D5EC8
+_080194BC: .4byte gKecleonShopDialogue
_080194C0:
ldr r1, [r4]
movs r0, 0x1
@@ -13349,7 +13349,7 @@ _080194E8:
pop {r0}
bx r0
.align 2, 0
-_080194F0: .4byte gUnknown_80D5EC8
+_080194F0: .4byte gKecleonShopDialogue
_080194F4: .4byte 0x0000010d
thumb_func_end sub_8018E88
@@ -16008,7 +16008,7 @@ sub_801A9E0:
b _0801AA48
.align 2, 0
_0801AA2C: .4byte gUnknown_203B224
-_0801AA30: .4byte gUnknown_80DB974
+_0801AA30: .4byte gTeamToolboxA
_0801AA34:
ldr r2, _0801AA58
adds r0, r4, 0
@@ -16028,7 +16028,7 @@ _0801AA48:
ldrsh r0, [r0, r4]
b _0801AD0A
.align 2, 0
-_0801AA58: .4byte gUnknown_80DB984
+_0801AA58: .4byte gTeamToolboxB
_0801AA5C: .4byte gUnknown_203B224
_0801AA60:
ldr r2, [r1]
@@ -18188,8 +18188,8 @@ sub_801BB20:
bx lr
.align 2, 0
_0801BB50: .4byte gUnknown_203B234
-_0801BB54: .4byte gUnknown_80DBD58
-_0801BB58: .4byte gUnknown_80DBD6C
+_0801BB54: .4byte gKangaskhanTrashToolboxItem
+_0801BB58: .4byte gKangaskhanTrashReceivedItem
thumb_func_end sub_801BB20
thumb_func_start sub_801BB5C
@@ -18269,8 +18269,8 @@ _0801BBD2:
b _0801BC0E
.align 2, 0
_0801BBEC: .4byte gUnknown_203B234
-_0801BBF0: .4byte gUnknown_80DBD80
-_0801BBF4: .4byte gUnknown_80DBD88
+_0801BBF0: .4byte gKangaskhanStorage
+_0801BBF4: .4byte gKangaskhanTrash
_0801BBF8: .4byte gUnknown_80D4970
_0801BBFC:
adds r3, 0x1
@@ -21504,10 +21504,10 @@ _0801D534:
b _0801D5E6
.align 2, 0
_0801D554: .4byte gUnknown_203B250
-_0801D558: .4byte gUnknown_80DBF10
-_0801D55C: .4byte gUnknown_80DBF18
-_0801D560: .4byte gUnknown_80DBF20
-_0801D564: .4byte gUnknown_80DBF2C
+_0801D558: .4byte gMenuItems
+_0801D55C: .4byte gMenuTeam
+_0801D560: .4byte gMenuJobList
+_0801D564: .4byte gMenuOthers
_0801D568:
ldr r0, _0801D63C
ldr r1, _0801D640
@@ -21621,7 +21621,7 @@ _0801D622:
_0801D63C: .4byte gUnknown_202DF98
_0801D640: .4byte gUnknown_80DBF34
_0801D644: .4byte gUnknown_80D49A8
-_0801D648: .4byte gUnknown_80DBF10
+_0801D648: .4byte gMenuItems
_0801D64C: .4byte gUnknown_203B250
_0801D650: .4byte gUnknown_80D4970
_0801D654: .4byte gUnknown_80D49B4
diff --git a/asm/code_801D760.s b/asm/code_801D760.s
index 563f19a..2beb2e8 100644
--- a/asm/code_801D760.s
+++ b/asm/code_801D760.s
@@ -153,7 +153,7 @@ _0801D994:
bx r0
.align 2, 0
_0801D9DC: .4byte gUnknown_80DBF60
-_0801D9E0: .4byte gUnknown_8380000
+_0801D9E0: .4byte gTitleMenuFileArchive
thumb_func_end sub_801D970
thumb_func_start sub_801D9E4
@@ -645,7 +645,7 @@ sub_801DD84:
_0801DDAC: .4byte gUnknown_203B25C
_0801DDB0: .4byte gUnknown_80DBFB0
_0801DDB4:
- bl sub_801DFA4
+ bl CreateOthersMenu
movs r3, 0
ldr r1, [r4]
adds r0, r1, 0
@@ -712,7 +712,7 @@ _0801DE2C: .4byte gUnknown_203B25C
_0801DE30: .4byte gUnknown_80DBFCC
_0801DE34: .4byte gUnknown_80DBFB0
_0801DE38:
- bl sub_801DFA4
+ bl CreateOthersMenu
mov r8, r4
ldr r6, _0801DE88
mov r12, r6
@@ -832,7 +832,7 @@ _0801DF14:
bl sub_8012D60
b _0801DF94
.align 2, 0
-_0801DF34: .4byte gUnknown_80DBFE4
+_0801DF34: .4byte gOthers_MenuOption
_0801DF38:
movs r0, 0
bl sub_801E3F0
@@ -888,8 +888,8 @@ _0801DF9C: .4byte gUnknown_80DBFEC
_0801DFA0: .4byte gUnknown_203B25C
thumb_func_end sub_801DED0
- thumb_func_start sub_801DFA4
-sub_801DFA4:
+ thumb_func_start CreateOthersMenu
+CreateOthersMenu:
push {r4,lr}
ldr r4, _0801DFD8
ldr r0, [r4]
@@ -916,9 +916,9 @@ sub_801DFA4:
bx r0
.align 2, 0
_0801DFD8: .4byte gUnknown_203B25C
-_0801DFDC: .4byte gUnknown_80DC000
-_0801DFE0: .4byte gUnknown_80DC010
- thumb_func_end sub_801DFA4
+_0801DFDC: .4byte gOthers_GameOptions
+_0801DFE0: .4byte gOthers_Hints
+ thumb_func_end CreateOthersMenu
thumb_func_start sub_801DFE4
sub_801DFE4:
@@ -1189,7 +1189,7 @@ sub_801E198:
movs r2, 0x1
bl sub_8013818
bl nullsub_38
- bl sub_801E310
+ bl CreateOptionsMenu
movs r0, 0x1
pop {r4,r5}
pop {r1}
@@ -1281,7 +1281,7 @@ _0801E294:
bne _0801E2BC
_0801E2AA:
bl nullsub_38
- bl sub_801E310
+ bl CreateOptionsMenu
movs r0, 0x1
b _0801E2BE
.align 2, 0
@@ -1336,8 +1336,8 @@ nullsub_38:
bx lr
thumb_func_end nullsub_38
- thumb_func_start sub_801E310
-sub_801E310:
+ thumb_func_start CreateOptionsMenu
+CreateOptionsMenu:
push {r4-r6,lr}
sub sp, 0x4
ldr r5, _0801E368
@@ -1379,7 +1379,7 @@ sub_801E310:
b _0801E3D6
.align 2, 0
_0801E368: .4byte gUnknown_203B260
-_0801E36C: .4byte gUnknown_80DC054
+_0801E36C: .4byte gWindowBGTitle
_0801E370: .4byte gUnknown_80DC064
_0801E374:
cmp r0, 0x2
@@ -1389,7 +1389,7 @@ _0801E37A:
ldr r0, _0801E380
b _0801E386
.align 2, 0
-_0801E380: .4byte gUnknown_80DC084
+_0801E380: .4byte gWindowBGBlueString
_0801E384:
ldr r0, _0801E3AC
_0801E386:
@@ -1411,7 +1411,7 @@ _0801E386:
bl sub_80078A4
b _0801E3D6
.align 2, 0
-_0801E3AC: .4byte gUnknown_80DC08C
+_0801E3AC: .4byte gWindowBGRedString
_0801E3B0:
ldr r0, _0801E3E8
bl sub_8008ED0
@@ -1440,9 +1440,9 @@ _0801E3D6:
pop {r0}
bx r0
.align 2, 0
-_0801E3E8: .4byte gUnknown_80DC090
+_0801E3E8: .4byte gWindowBGGreenString
_0801E3EC: .4byte gUnknown_203B260
- thumb_func_end sub_801E310
+ thumb_func_end CreateOptionsMenu
thumb_func_start sub_801E3F0
sub_801E3F0:
@@ -2371,7 +2371,7 @@ _0801EB00:
movs r1, 0xC
b _0801EB86
.align 2, 0
-_0801EB34: .4byte gUnknown_80D8888
+_0801EB34: .4byte gGulpinDialogue
_0801EB38:
ldr r1, _0801EB64
movs r0, 0x64
@@ -2395,7 +2395,7 @@ _0801EB38:
movs r1, 0xC
b _0801EB86
.align 2, 0
-_0801EB64: .4byte gUnknown_80D8888
+_0801EB64: .4byte gGulpinDialogue
_0801EB68:
ldrb r4, [r2, 0xE]
cmp r4, 0
@@ -4812,7 +4812,7 @@ _0801FE6C:
.align 2, 0
_0801FE84: .4byte gUnknown_80DC334
_0801FE88:
- bl sub_802074C
+ bl CreateGulpinLinkMenu
ldr r1, [r4]
movs r7, 0xCC
lsls r7, 1
@@ -4952,7 +4952,7 @@ _0801FFDC:
ldr r0, [r5]
movs r4, 0x2
str r4, [r0, 0x6C]
- bl sub_8020574
+ bl CreateGulpinShopMenu
ldr r5, [r5]
str r4, [r5, 0x8]
ldr r2, _08020014
@@ -4976,9 +4976,9 @@ _0801FFDC:
adds r1, r5, r4
b _0802004C
.align 2, 0
-_08020014: .4byte gUnknown_80D8888
+_08020014: .4byte gGulpinDialogue
_08020018:
- bl sub_8020574
+ bl CreateGulpinShopMenu
ldr r0, _0802005C
ldr r4, [r0]
movs r0, 0x2
@@ -5013,7 +5013,7 @@ _0802004C:
b _08020562
.align 2, 0
_0802005C: .4byte gUnknown_203B27C
-_08020060: .4byte gUnknown_80D8888
+_08020060: .4byte gGulpinDialogue
_08020064:
movs r0, 0x3
bl sub_8016C40
@@ -5035,7 +5035,7 @@ _0802006C:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_0802008C: .4byte gUnknown_80D8888
+_0802008C: .4byte gGulpinDialogue
_08020090:
ldr r2, [r5]
movs r0, 0x1F
@@ -5053,7 +5053,7 @@ _08020090:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080200B0: .4byte gUnknown_80D8888
+_080200B0: .4byte gGulpinDialogue
_080200B4:
ldr r2, [r5]
movs r0, 0x1F
@@ -5071,7 +5071,7 @@ _080200B4:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080200D4: .4byte gUnknown_80D8888
+_080200D4: .4byte gGulpinDialogue
_080200D8:
ldr r2, [r5]
movs r0, 0x1F
@@ -5089,7 +5089,7 @@ _080200D8:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080200F8: .4byte gUnknown_80D8888
+_080200F8: .4byte gGulpinDialogue
_080200FC:
bl sub_8020900
ldr r1, _0802013C
@@ -5122,7 +5122,7 @@ _080200FC:
bl sub_8014248
b _08020562
.align 2, 0
-_0802013C: .4byte gUnknown_80D8888
+_0802013C: .4byte gGulpinDialogue
_08020140: .4byte gUnknown_203B27C
_08020144:
bl sub_8020950
@@ -5156,7 +5156,7 @@ _08020144:
bl sub_8014248
b _08020562
.align 2, 0
-_08020184: .4byte gUnknown_80D8888
+_08020184: .4byte gGulpinDialogue
_08020188: .4byte gUnknown_203B27C
_0802018C:
ldr r2, [r5]
@@ -5175,7 +5175,7 @@ _0802018C:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080201AC: .4byte gUnknown_80D8888
+_080201AC: .4byte gGulpinDialogue
_080201B0:
ldr r2, [r5]
movs r0, 0x1
@@ -5193,7 +5193,7 @@ _080201B0:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080201D0: .4byte gUnknown_80D8888
+_080201D0: .4byte gGulpinDialogue
_080201D4:
ldr r2, [r5]
movs r0, 0x1
@@ -5211,7 +5211,7 @@ _080201D4:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080201F4: .4byte gUnknown_80D8888
+_080201F4: .4byte gGulpinDialogue
_080201F8:
ldr r2, [r5]
movs r0, 0xD
@@ -5229,7 +5229,7 @@ _080201F8:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_08020218: .4byte gUnknown_80D8888
+_08020218: .4byte gGulpinDialogue
_0802021C:
ldr r2, [r5]
movs r0, 0xF
@@ -5247,7 +5247,7 @@ _0802021C:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_0802023C: .4byte gUnknown_80D8888
+_0802023C: .4byte gGulpinDialogue
_08020240:
movs r0, 0x2
movs r1, 0
@@ -5303,7 +5303,7 @@ _0802028E:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080202AC: .4byte gUnknown_80D8888
+_080202AC: .4byte gGulpinDialogue
_080202B0:
ldr r0, [r5]
movs r5, 0xC
@@ -5375,7 +5375,7 @@ _08020304:
b _0802052C
.align 2, 0
_0802033C: .4byte gUnknown_202DF98
-_08020340: .4byte gUnknown_80D8888
+_08020340: .4byte gGulpinDialogue
_08020344:
ldr r1, [r5]
adds r0, r1, 0
@@ -5396,7 +5396,7 @@ _08020344:
adds r1, 0x38
b _08020520
.align 2, 0
-_0802036C: .4byte gUnknown_80D8888
+_0802036C: .4byte gGulpinDialogue
_08020370:
ldr r1, _08020388
ldr r2, [r3]
@@ -5410,7 +5410,7 @@ _08020370:
adds r1, r3, r4
b _0802052A
.align 2, 0
-_08020388: .4byte gUnknown_80D8888
+_08020388: .4byte gGulpinDialogue
_0802038C:
ldr r2, [r5]
ldr r0, [r2]
@@ -5446,7 +5446,7 @@ _080203B0:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080203D0: .4byte gUnknown_80D8888
+_080203D0: .4byte gGulpinDialogue
_080203D4:
ldr r2, [r5]
movs r0, 0x10
@@ -5464,7 +5464,7 @@ _080203D4:
ldr r2, [r2]
b _0802052C
.align 2, 0
-_080203F4: .4byte gUnknown_80D8888
+_080203F4: .4byte gGulpinDialogue
_080203F8:
ldr r1, [r5]
adds r0, r1, 0
@@ -5560,7 +5560,7 @@ _08020478:
.align 2, 0
_080204B8: .4byte gUnknown_202DFE8
_080204BC: .4byte gUnknown_203B27C
-_080204C0: .4byte gUnknown_80D8888
+_080204C0: .4byte gGulpinDialogue
_080204C4:
ldr r1, _080204FC
ldr r2, [r4]
@@ -5590,7 +5590,7 @@ _080204E8:
bl sub_8014248
b _08020562
.align 2, 0
-_080204FC: .4byte gUnknown_80D8888
+_080204FC: .4byte gGulpinDialogue
_08020500:
ldr r1, [r5]
movs r0, 0x1F
@@ -5622,7 +5622,7 @@ _0802052C:
b _08020562
.align 2, 0
_08020538: .4byte gUnknown_202DFE8
-_0802053C: .4byte gUnknown_80D8888
+_0802053C: .4byte gGulpinDialogue
_08020540: .4byte 0x0000010d
_08020544:
ldr r1, _0802056C
@@ -5645,12 +5645,12 @@ _08020562:
pop {r0}
bx r0
.align 2, 0
-_0802056C: .4byte gUnknown_80D8888
+_0802056C: .4byte gGulpinDialogue
_08020570: .4byte 0x0000010d
thumb_func_end sub_801FF28
- thumb_func_start sub_8020574
-sub_8020574:
+ thumb_func_start CreateGulpinShopMenu
+CreateGulpinShopMenu:
push {r4,lr}
ldr r4, _080205C0
ldr r0, [r4]
@@ -5689,10 +5689,10 @@ sub_8020574:
bx r0
.align 2, 0
_080205C0: .4byte gUnknown_203B27C
-_080205C4: .4byte gUnknown_80DC3C4
-_080205C8: .4byte gUnknown_80DC3CC
+_080205C4: .4byte gGulpinProceed
+_080205C8: .4byte gGulpinInfo
_080205CC: .4byte gUnknown_80D4934
- thumb_func_end sub_8020574
+ thumb_func_end CreateGulpinShopMenu
thumb_func_start sub_80205D0
sub_80205D0:
@@ -5891,8 +5891,8 @@ _08020746:
bx r0
thumb_func_end sub_802069C
- thumb_func_start sub_802074C
-sub_802074C:
+ thumb_func_start CreateGulpinLinkMenu
+CreateGulpinLinkMenu:
push {r4-r7,lr}
movs r7, 0
ldr r4, _08020780
@@ -5919,7 +5919,7 @@ sub_802074C:
b _08020792
.align 2, 0
_08020780: .4byte gUnknown_203B27C
-_08020784: .4byte gUnknown_80DC400
+_08020784: .4byte gGulpinDeselect
_08020788:
ldr r0, [r4]
ldr r1, _08020798
@@ -5931,7 +5931,7 @@ _08020792:
mov r12, r4
b _080207CA
.align 2, 0
-_08020798: .4byte gUnknown_80DC40C
+_08020798: .4byte gGulpinSet
_0802079C:
ldr r0, [r1, 0x18]
adds r1, 0x24
@@ -5943,7 +5943,7 @@ _0802079C:
ldr r0, _080207B0
b _080207B8
.align 2, 0
-_080207B0: .4byte gUnknown_80DC400
+_080207B0: .4byte gGulpinDeselect
_080207B4:
ldr r1, [r4]
ldr r0, _0802086C
@@ -6042,11 +6042,11 @@ _0802084C:
str r0, [r1, 0x78]
b _080208A8
.align 2, 0
-_0802086C: .4byte gUnknown_80DC40C
+_0802086C: .4byte gGulpinSet
_08020870: .4byte gUnknown_203B27C
-_08020874: .4byte gUnknown_80DC410
-_08020878: .4byte gUnknown_80DC418
-_0802087C: .4byte gUnknown_80DC420
+_08020874: .4byte gGulpinLink
+_08020878: .4byte gGulpinDelink
+_0802087C: .4byte gGulpinForget
_08020880: .4byte gUnknown_80D4970
_08020884:
adds r3, 0x1
@@ -6071,7 +6071,7 @@ _080208A8:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802074C
+ thumb_func_end CreateGulpinLinkMenu
thumb_func_start sub_80208B0
sub_80208B0:
@@ -8820,7 +8820,7 @@ _08021EA4:
lsls r0, 4
b _08021ED4
.align 2, 0
-_08021EB8: .4byte gUnknown_80D79A4
+_08021EB8: .4byte gWigglytuffDialogue
_08021EBC: .4byte gUnknown_203B290
_08021EC0:
bl sub_80222C8
@@ -8855,7 +8855,7 @@ _08021ED4:
bl sub_8014248
b _080222B6
.align 2, 0
-_08021F00: .4byte gUnknown_80D79A4
+_08021F00: .4byte gWigglytuffDialogue
_08021F04: .4byte gUnknown_203B290
_08021F08:
ldr r3, [r4]
@@ -8869,7 +8869,7 @@ _08021F08:
adds r2, 0xC
b _0802227A
.align 2, 0
-_08021F1C: .4byte gUnknown_80D79A4
+_08021F1C: .4byte gWigglytuffDialogue
_08021F20:
ldr r3, [r4]
movs r0, 0xA
@@ -8882,7 +8882,7 @@ _08021F20:
adds r2, 0x10
b _0802227A
.align 2, 0
-_08021F34: .4byte gUnknown_80D79A4
+_08021F34: .4byte gWigglytuffDialogue
_08021F38:
ldr r3, [r4]
movs r0, 0x1
@@ -8895,7 +8895,7 @@ _08021F38:
adds r2, 0x4C
b _0802227A
.align 2, 0
-_08021F4C: .4byte gUnknown_80D79A4
+_08021F4C: .4byte gWigglytuffDialogue
_08021F50:
ldr r3, [r4]
movs r0, 0x4
@@ -8913,7 +8913,7 @@ _08021F50:
ldr r3, _08021F74
b _08022284
.align 2, 0
-_08021F70: .4byte gUnknown_80D79A4
+_08021F70: .4byte gWigglytuffDialogue
_08021F74: .4byte 0x0000030d
_08021F78:
ldr r3, [r4]
@@ -8927,7 +8927,7 @@ _08021F78:
adds r2, 0x20
b _0802227A
.align 2, 0
-_08021F8C: .4byte gUnknown_80D79A4
+_08021F8C: .4byte gWigglytuffDialogue
_08021F90:
ldr r3, [r4]
movs r0, 0xA
@@ -8940,7 +8940,7 @@ _08021F90:
adds r2, 0x24
b _0802227A
.align 2, 0
-_08021FA4: .4byte gUnknown_80D79A4
+_08021FA4: .4byte gWigglytuffDialogue
_08021FA8:
ldr r3, [r4]
movs r0, 0x3
@@ -8953,7 +8953,7 @@ _08021FA8:
adds r2, 0x28
b _0802227A
.align 2, 0
-_08021FBC: .4byte gUnknown_80D79A4
+_08021FBC: .4byte gWigglytuffDialogue
_08021FC0:
ldr r3, [r4]
movs r0, 0xA
@@ -8966,7 +8966,7 @@ _08021FC0:
adds r2, 0x2C
b _0802227A
.align 2, 0
-_08021FD4: .4byte gUnknown_80D79A4
+_08021FD4: .4byte gWigglytuffDialogue
_08021FD8:
movs r0, 0x2
movs r1, 0x3
@@ -9041,7 +9041,7 @@ _08022024:
_08022070: .4byte gUnknown_202E628
_08022074: .4byte gUnknown_203B290
_08022078: .4byte gUnknown_202DE30
-_0802207C: .4byte gUnknown_80D79A4
+_0802207C: .4byte gWigglytuffDialogue
_08022080:
ldr r0, [r4]
ldrb r0, [r0, 0x10]
@@ -9067,7 +9067,7 @@ _0802208E:
b _0802227A
.align 2, 0
_080220B0: .4byte gUnknown_202E628
-_080220B4: .4byte gUnknown_80D79A4
+_080220B4: .4byte gWigglytuffDialogue
_080220B8:
ldr r1, [r4]
movs r0, 0xE
@@ -9129,7 +9129,7 @@ _0802210E:
b _08022282
.align 2, 0
_08022130: .4byte gUnknown_203B290
-_08022134: .4byte gUnknown_80D79A4
+_08022134: .4byte gWigglytuffDialogue
_08022138:
ldr r3, [r4]
movs r0, 0x16
@@ -9142,7 +9142,7 @@ _08022138:
adds r2, 0x30
b _0802227A
.align 2, 0
-_0802214C: .4byte gUnknown_80D79A4
+_0802214C: .4byte gWigglytuffDialogue
_08022150:
ldr r3, [r4]
movs r0, 0x17
@@ -9155,7 +9155,7 @@ _08022150:
adds r2, 0x34
b _0802227A
.align 2, 0
-_08022164: .4byte gUnknown_80D79A4
+_08022164: .4byte gWigglytuffDialogue
_08022168:
movs r0, 0
movs r1, 0x3
@@ -9258,7 +9258,7 @@ _080221FA:
_08022228: .4byte gUnknown_203B290
_0802222C: .4byte gUnknown_202DF98
_08022230: .4byte gUnknown_202E628
-_08022234: .4byte gUnknown_80D79A4
+_08022234: .4byte gWigglytuffDialogue
_08022238:
ldr r3, [r4]
movs r0, 0x15
@@ -9271,7 +9271,7 @@ _08022238:
adds r2, 0x3C
b _0802227A
.align 2, 0
-_0802224C: .4byte gUnknown_80D79A4
+_0802224C: .4byte gWigglytuffDialogue
_08022250:
ldr r3, [r4]
movs r0, 0x15
@@ -9284,7 +9284,7 @@ _08022250:
adds r2, 0x40
b _0802227A
.align 2, 0
-_08022264: .4byte gUnknown_80D79A4
+_08022264: .4byte gWigglytuffDialogue
_08022268:
ldr r3, [r4]
movs r0, 0x15
@@ -9307,7 +9307,7 @@ _08022284:
bl sub_80141B4
b _080222B6
.align 2, 0
-_0802228C: .4byte gUnknown_80D79A4
+_0802228C: .4byte gWigglytuffDialogue
_08022290: .4byte 0x0000010d
_08022294:
ldr r3, [r4]
@@ -9332,7 +9332,7 @@ _080222B6:
pop {r0}
bx r0
.align 2, 0
-_080222C0: .4byte gUnknown_80D79A4
+_080222C0: .4byte gWigglytuffDialogue
_080222C4: .4byte 0x0000010d
thumb_func_end sub_8021E0C
@@ -9404,7 +9404,7 @@ _08022322:
.align 2, 0
_08022344: .4byte gUnknown_203B290
_08022348: .4byte gUnknown_80D4978
-_0802234C: .4byte gUnknown_80D499C
+_0802234C: .4byte gWigglytuffCheck
_08022350: .4byte gUnknown_80D4970
_08022354: .4byte gUnknown_80D4934
_08022358:
@@ -19290,7 +19290,7 @@ _080271C8:
stm r1!, {r3,r5,r6}
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
- bl sub_802745C
+ bl CreateFriendActionMenu
ldr r2, [r4]
movs r0, 0xD8
lsls r0, 1
@@ -19587,8 +19587,9 @@ _08027454: .4byte gUnknown_80DD8D0
_08027458: .4byte 0x00000101
thumb_func_end sub_8027274
- thumb_func_start sub_802745C
-sub_802745C:
+ @ Menu that gets created when you talk to friend
+ thumb_func_start CreateFriendActionMenu
+CreateFriendActionMenu:
push {r4-r7,lr}
ldr r3, _080274E4
ldr r4, _080274E8
@@ -19657,8 +19658,8 @@ _080274B6:
.align 2, 0
_080274E4: .4byte gUnknown_203B45C
_080274E8: .4byte gUnknown_203B2BC
-_080274EC: .4byte gUnknown_80DD8F8
-_080274F0: .4byte gUnknown_80DD904
+_080274EC: .4byte gFriendActionStandby
+_080274F0: .4byte gFriendActionMakeLeader
_080274F4:
ldr r2, [r4]
movs r3, 0x8E
@@ -19844,14 +19845,14 @@ _08027636:
str r0, [r1, 0x70]
b _080276A0
.align 2, 0
-_08027658: .4byte gUnknown_80DD910
-_0802765C: .4byte gUnknown_80DD91C
+_08027658: .4byte gFriendActionJoinTeam
+_0802765C: .4byte gFriendActionSayFarewell
_08027660: .4byte gUnknown_203B2BC
-_08027664: .4byte gUnknown_80DD92C
-_08027668: .4byte gUnknown_80DD934
-_0802766C: .4byte gUnknown_80DD93C
-_08027670: .4byte gUnknown_80DD944
-_08027674: .4byte gUnknown_80DD94C
+_08027664: .4byte gFriendActionGive
+_08027668: .4byte gFriendActionTake
+_0802766C: .4byte gFriendActionSummary
+_08027670: .4byte gFriendActionMoves
+_08027674: .4byte gFriendActionCheckIQ
_08027678:
adds r3, 0x1
cmp r3, r7
@@ -19877,7 +19878,7 @@ _080276A0:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802745C
+ thumb_func_end CreateFriendActionMenu
thumb_func_start sub_80276A8
sub_80276A8:
@@ -19973,7 +19974,7 @@ _08027730:
b _0802778E
.align 2, 0
_0802775C: .4byte gUnknown_203B2BC
-_08027760: .4byte gUnknown_80DD92C
+_08027760: .4byte gFriendActionGive
_08027764: .4byte gUnknown_80D4970
_08027768:
adds r3, 0x1
diff --git a/asm/code_803D110.s b/asm/code_803D110.s
index f5f9425..9f67a48 100644
--- a/asm/code_803D110.s
+++ b/asm/code_803D110.s
@@ -713,7 +713,7 @@ _0803D654: .4byte gUnknown_203B418
_0803D658: .4byte 0x00000644
_0803D65C: .4byte 0x0001c570
_0803D660: .4byte gUnknown_80F4D8C
-_0803D664: .4byte gUnknown_83B0000
+_0803D664: .4byte gDungeonFileArchive
_0803D668: .4byte 0x0001c571
_0803D66C: .4byte 0x0001cec8
_0803D670: .4byte 0x0001c574
@@ -1392,7 +1392,7 @@ _0803DB54:
b _0803DBCA
.align 2, 0
_0803DB84: .4byte gUnknown_80F60F8
-_0803DB88: .4byte gUnknown_83B0000
+_0803DB88: .4byte gDungeonFileArchive
_0803DB8C: .4byte gDungeonNameBannerPalette
_0803DB90: .4byte gUnknown_80F6100
_0803DB94: .4byte gDungeonNameBannerFontFile
@@ -1982,7 +1982,7 @@ _0803DFBA:
bx r0
.align 2, 0
_0803DFF8: .4byte gUnknown_80F61A8
-_0803DFFC: .4byte gUnknown_83B0000
+_0803DFFC: .4byte gDungeonFileArchive
_0803E000: .4byte 0x06013400
_0803E004: .4byte gUnknown_80F61B0
_0803E008: .4byte 0x06014000
@@ -2118,7 +2118,7 @@ _0803E0E8:
bx r0
.align 2, 0
_0803E118: .4byte gUnknown_80F61DC
-_0803E11C: .4byte gUnknown_83B0000
+_0803E11C: .4byte gDungeonFileArchive
_0803E120: .4byte 0x0600c000
_0803E124: .4byte gUnknown_202ECA4
_0803E128: .4byte gUnknown_203B418
diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
index 829650b..3314b15 100644
--- a/asm/code_80428A0.s
+++ b/asm/code_80428A0.s
@@ -11116,195 +11116,4 @@ sub_80482FC:
_0804833C: .4byte 0x00000195
thumb_func_end sub_80482FC
- thumb_func_start sub_8048340
-sub_8048340:
- push {r4,lr}
- sub sp, 0x18
- movs r4, 0
- str r4, [sp]
- str r4, [sp, 0x4]
- movs r3, 0x84
- lsls r3, 2
- str r3, [sp, 0x8]
- str r4, [sp, 0xC]
- str r4, [sp, 0x10]
- str r4, [sp, 0x14]
- movs r3, 0x1
- bl sub_806F370
- add sp, 0x18
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_8048340
-
- thumb_func_start sub_8048364
-sub_8048364:
- push {lr}
- lsls r3, r2, 24
- lsrs r3, 24
- movs r2, 0x1
- bl sub_8079F20
- pop {r0}
- bx r0
- thumb_func_end sub_8048364
-
- thumb_func_start sub_8048374
-sub_8048374:
- push {r4,lr}
- sub sp, 0x4
- ldr r2, _08048394
- movs r3, 0
- ldrsh r2, [r2, r3]
- ldr r3, _08048398
- movs r4, 0
- ldrsh r3, [r3, r4]
- movs r4, 0x1
- str r4, [sp]
- bl sub_8077C44
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08048394: .4byte gUnknown_80F4FB6
-_08048398: .4byte gUnknown_80F4FB8
- thumb_func_end sub_8048374
-
- thumb_func_start sub_804839C
-sub_804839C:
- push {r4,lr}
- sub sp, 0x4
- ldr r2, _080483BC
- movs r3, 0
- ldrsh r2, [r2, r3]
- ldr r3, _080483C0
- movs r4, 0
- ldrsh r3, [r3, r4]
- movs r4, 0x1
- str r4, [sp]
- bl sub_8077C44
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080483BC: .4byte gUnknown_80F4FBA
-_080483C0: .4byte gUnknown_80F4FBC
- thumb_func_end sub_804839C
-
- thumb_func_start sub_80483C4
-sub_80483C4:
- push {lr}
- ldr r2, _080483D0
- bl sub_80792F8
- pop {r0}
- bx r0
- .align 2, 0
-_080483D0: .4byte 0x000003e7
- thumb_func_end sub_80483C4
-
- thumb_func_start sub_80483D4
-sub_80483D4:
- push {r4,lr}
- sub sp, 0x4
- ldr r2, _080483F0
- movs r4, 0
- ldrsh r3, [r2, r4]
- movs r2, 0x1
- str r2, [sp]
- movs r2, 0
- bl sub_8077C44
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080483F0: .4byte gUnknown_80F4FBE
- thumb_func_end sub_80483D4
-
- thumb_func_start sub_80483F4
-sub_80483F4:
- push {lr}
- bl sub_8079140
- pop {r0}
- bx r0
- thumb_func_end sub_80483F4
-
- thumb_func_start sub_8048400
-sub_8048400:
- push {lr}
- bl sub_80791D8
- pop {r0}
- bx r0
- thumb_func_end sub_8048400
-
- thumb_func_start sub_804840C
-sub_804840C:
- push {lr}
- movs r2, 0
- movs r3, 0x1
- bl sub_8077910
- pop {r0}
- bx r0
- thumb_func_end sub_804840C
-
- thumb_func_start sub_804841C
-sub_804841C:
- push {lr}
- bl sub_8079270
- pop {r0}
- bx r0
- thumb_func_end sub_804841C
-
- thumb_func_start sub_8048428
-sub_8048428:
- push {lr}
- adds r3, r0, 0
- ldr r0, [r1, 0x70]
- adds r0, 0xAC
- ldrb r0, [r0]
- cmp r0, 0x4
- bne _0804843E
- adds r0, r3, 0
- bl sub_807A290
- b _08048448
-_0804843E:
- ldr r0, _0804844C
- ldr r2, [r0]
- adds r0, r3, 0
- bl sub_80522F4
-_08048448:
- pop {r0}
- bx r0
- .align 2, 0
-_0804844C: .4byte gUnknown_80F89F4
- thumb_func_end sub_8048428
-
- thumb_func_start sub_8048450
-sub_8048450:
- push {lr}
- adds r3, r0, 0
- ldr r0, [r1, 0x70]
- adds r0, 0xAC
- ldrb r0, [r0]
- subs r0, 0x2
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bhi _0804846C
- adds r0, r3, 0
- bl sub_807A290
- b _08048476
-_0804846C:
- ldr r0, _0804847C
- ldr r2, [r0]
- adds r0, r3, 0
- bl sub_80522F4
-_08048476:
- pop {r0}
- bx r0
- .align 2, 0
-_0804847C: .4byte gUnknown_80F89F4
- thumb_func_end sub_8048450
-
.align 2,0
diff --git a/asm/code_8048480.s b/asm/code_8048480.s
index 3e85d20..9ba81c8 100644
--- a/asm/code_8048480.s
+++ b/asm/code_8048480.s
@@ -658,7 +658,7 @@ _08048A12:
ble _080489A2
movs r0, 0
movs r1, 0x1
- bl sub_8062978
+ bl DrawFieldGiveItemMenu
adds r4, r0, 0
bl sub_80450E0
lsls r0, 24
@@ -818,7 +818,7 @@ _08048B4A:
ble _08048AB2
movs r0, 0
movs r1, 0x1
- bl sub_8062978
+ bl DrawFieldGiveItemMenu
adds r4, r0, 0
bl sub_80450E0
lsls r0, 24
@@ -944,7 +944,7 @@ _08048C3E:
ble _08048BD6
movs r0, 0
movs r1, 0x1
- bl sub_8062978
+ bl DrawFieldGiveItemMenu
adds r4, r0, 0
bl sub_80450E0
lsls r0, 24
@@ -2192,7 +2192,7 @@ _08049734: .4byte gUnknown_80F6A04
_08049738: .4byte gUnknown_8108EC0
_0804973C: .4byte gUnknown_203B418
_08049740: .4byte 0x00003a0e
-_08049744: .4byte gUnknown_83B0000
+_08049744: .4byte gDungeonFileArchive
_08049748: .4byte 0x06008000
_0804974C: .4byte gUnknown_80F6A10
_08049750: .4byte gUnknown_202EE88
@@ -2266,7 +2266,7 @@ _080497EC: .4byte 0x00012c24
_080497F0: .4byte gUnknown_80F6A40
_080497F4: .4byte gUnknown_203B418
_080497F8: .4byte 0x00003a0e
-_080497FC: .4byte gUnknown_83B0000
+_080497FC: .4byte gDungeonFileArchive
_08049800: .4byte gUnknown_202F18C
_08049804: .4byte gUnknown_202EE8C
_08049808: .4byte gUnknown_202F314
@@ -5592,7 +5592,7 @@ _0804B0E4:
_0804B0E8: .4byte gUnknown_203B418
_0804B0EC: .4byte 0x0001c574
_0804B0F0: .4byte gUnknown_80F6DCC
-_0804B0F4: .4byte gUnknown_83B0000
+_0804B0F4: .4byte gDungeonFileArchive
_0804B0F8: .4byte 0x00013568
_0804B0FC: .4byte gUnknown_202F1AA
_0804B100: .4byte gUnknown_202F1AB
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index 5cad05c..8ac596f 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -26750,11 +26750,11 @@ _0805FB92:
.align 2, 0
_0805FBA0: .4byte gUnknown_202749A
_0805FBA4: .4byte gUnknown_202EE10
-_0805FBA8: .4byte gUnknown_80FE988
-_0805FBAC: .4byte gUnknown_80FE998
-_0805FBB0: .4byte gUnknown_80FE9A8
-_0805FBB4: .4byte gUnknown_80FE9B8
-_0805FBB8: .4byte gUnknown_80FE9C8
+_0805FBA8: .4byte gFieldMenuMovesPtr
+_0805FBAC: .4byte gFieldMenuItemsPtr
+_0805FBB0: .4byte gFieldMenuTeamPtr
+_0805FBB4: .4byte gFieldMenuOthersPtr
+_0805FBB8: .4byte gFieldMenuGroundPtr
_0805FBBC: .4byte gUnknown_203B47C
_0805FBC0: .4byte gUnknown_202DE30
_0805FBC4: .4byte gUnknown_80F9174
@@ -27224,7 +27224,7 @@ _0805FF66:
mov r1, r10
ldr r2, [sp, 0xD8]
ldr r3, [sp, 0xD4]
- bl sub_80603D8
+ bl CreateFieldItemMenu
ldr r1, _0805FFBC
ldr r0, _0805FFC0
movs r2, 0x1E
@@ -27706,7 +27706,7 @@ _0806036C:
bne _08060390
add r0, sp, 0xCC
movs r1, 0x2
- bl sub_8062978
+ bl DrawFieldGiveItemMenu
add r1, sp, 0xCC
cmp r0, 0
beq _08060380
@@ -27753,8 +27753,8 @@ _080603D0: .4byte gUnknown_203B418
_080603D4: .4byte 0x00018212
thumb_func_end sub_805FD74
- thumb_func_start sub_80603D8
-sub_80603D8:
+ thumb_func_start CreateFieldItemMenu
+CreateFieldItemMenu:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -27991,7 +27991,7 @@ _08060592:
ble _0806057E
b _08060794
.align 2, 0
-_080605C0: .4byte gUnknown_80FE90C
+_080605C0: .4byte gTeamToolboxAPtr
_080605C4: .4byte gUnknown_203B460
_080605C8: .4byte gUnknown_8106B60
_080605CC:
@@ -28043,7 +28043,7 @@ _080605FC:
ble _080605E6
b _08060794
.align 2, 0
-_08060630: .4byte gUnknown_80FE920
+_08060630: .4byte gTeamToolboxBPtr
_08060634: .4byte gUnknown_203B460
_08060638: .4byte gUnknown_8106B60
_0806063C:
@@ -28096,7 +28096,7 @@ _08060698:
strh r2, [r5, 0x8]
b _08060794
.align 2, 0
-_080606A8: .4byte gUnknown_80FE92C
+_080606A8: .4byte gFieldItemMenuGroundTextPtr
_080606AC: .4byte gUnknown_8106B60
_080606B0:
mov r3, r9
@@ -28245,8 +28245,8 @@ _080607EC: .4byte gUnknown_202DF98
_080607F0: .4byte gUnknown_80FE940
_080607F4: .4byte gUnknown_202EE10
_080607F8: .4byte gUnknown_8106B60
-_080607FC: .4byte gUnknown_80FE94C
- thumb_func_end sub_80603D8
+_080607FC: .4byte gWhichTextPtr1
+ thumb_func_end CreateFieldItemMenu
thumb_func_start sub_8060800
sub_8060800:
@@ -29104,7 +29104,7 @@ _08060EBE:
mov r0, sp
mov r1, r9
movs r2, 0x1
- bl sub_8061130
+ bl DrawFieldTeamMenu
movs r0, 0
mov r10, r0
_08060ECE:
@@ -29391,8 +29391,8 @@ _08061116:
bx r1
thumb_func_end sub_8060E38
- thumb_func_start sub_8061130
-sub_8061130:
+ thumb_func_start DrawFieldTeamMenu
+DrawFieldTeamMenu:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -29783,7 +29783,7 @@ _08061440:
bx r0
.align 2, 0
_08061458: .4byte gUnknown_8106BE0
- thumb_func_end sub_8061130
+ thumb_func_end DrawFieldTeamMenu
thumb_func_start sub_806145C
sub_806145C:
@@ -32412,8 +32412,8 @@ _0806295C:
_08062974: .4byte gRealInputs
thumb_func_end sub_806285C
- thumb_func_start sub_8062978
-sub_8062978:
+ thumb_func_start DrawFieldGiveItemMenu
+DrawFieldGiveItemMenu:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -32460,7 +32460,7 @@ _080629CA:
add r0, sp, 0x4
adds r1, r4, 0
movs r2, 0
- bl sub_8061130
+ bl DrawFieldTeamMenu
movs r0, 0x1
bl sub_80073B8
ldr r0, _08062A3C
@@ -32508,7 +32508,7 @@ _080629FC:
b _08062A5A
.align 2, 0
_08062A38: .4byte gUnknown_8106C18
-_08062A3C: .4byte gUnknown_80FE950
+_08062A3C: .4byte gWhichTextPtr2
_08062A40: .4byte 0xfffffc27
_08062A44: .4byte gUnknown_202EE10
_08062A48: .4byte gUnknown_203B418
@@ -32651,7 +32651,7 @@ _08062B5A:
.align 2, 0
_08062B6C: .4byte gUnknown_203B418
_08062B70: .4byte 0x0001357c
- thumb_func_end sub_8062978
+ thumb_func_end DrawFieldGiveItemMenu
thumb_func_start sub_8062B74
sub_8062B74:
@@ -36955,7 +36955,7 @@ sub_8064D74:
mov r8, r0
_08064D84:
movs r5, 0
- bl sub_8065574
+ bl CreateFieldGameOptionsMenu
_08064D8A:
adds r0, r6, 0
bl AddMenuCursorSprite
@@ -37078,7 +37078,7 @@ sub_8064E68:
_08064E7E:
movs r7, 0
movs r5, 0
- bl sub_80656C0
+ bl CreateFieldDungeonMenu
_08064E86:
adds r0, r4, 0
bl AddMenuCursorSprite
@@ -37192,7 +37192,7 @@ sub_8064F50:
_08064F66:
movs r7, 0
movs r5, 0
- bl sub_8065948
+ bl CreateFieldOthersMenu
_08064F6E:
adds r0, r4, 0
bl AddMenuCursorSprite
@@ -37920,8 +37920,8 @@ _0806556C: .4byte gUnknown_80FE8F4
_08065570: .4byte gUnknown_80F7C50
thumb_func_end sub_806544C
- thumb_func_start sub_8065574
-sub_8065574:
+ thumb_func_start CreateFieldGameOptionsMenu
+CreateFieldGameOptionsMenu:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -38064,14 +38064,14 @@ sub_8065574:
bx r0
.align 2, 0
_080656AC: .4byte gUnknown_202EE10
-_080656B0: .4byte gUnknown_80FE8F0
-_080656B4: .4byte gUnknown_80FE730
-_080656B8: .4byte gUnknown_80FE73C
+_080656B0: .4byte gGameOptionsTextPtr
+_080656B4: .4byte gOptionsDungeonTextPtr
+_080656B8: .4byte gOptionsOthersTextPtr
_080656BC: .4byte gUnknown_80FE748
- thumb_func_end sub_8065574
+ thumb_func_end CreateFieldGameOptionsMenu
- thumb_func_start sub_80656C0
-sub_80656C0:
+ thumb_func_start CreateFieldDungeonMenu
+CreateFieldDungeonMenu:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -38245,7 +38245,7 @@ sub_80656C0:
.align 2, 0
_0806583C: .4byte gUnknown_8106CE8
_08065840: .4byte gUnknown_202EE10
-_08065844: .4byte gUnknown_80FE730
+_08065844: .4byte gOptionsDungeonTextPtr
_08065848: .4byte gUnknown_80FE764
_0806584C: .4byte gUnknown_80FE788
_08065850: .4byte gUnknown_80FE7A8
@@ -38363,10 +38363,10 @@ _0806590E:
bx r0
.align 2, 0
_08065944: .4byte gUnknown_202F2E8
- thumb_func_end sub_80656C0
+ thumb_func_end CreateFieldDungeonMenu
- thumb_func_start sub_8065948
-sub_8065948:
+ thumb_func_start CreateFieldOthersMenu
+CreateFieldOthersMenu:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -38511,10 +38511,10 @@ _08065A0A:
.align 2, 0
_08065A78: .4byte gUnknown_8106CF4
_08065A7C: .4byte gUnknown_202EE10
-_08065A80: .4byte gUnknown_80FE73C
-_08065A84: .4byte gUnknown_80FE808
+_08065A80: .4byte gOptionsOthersTextPtr
+_08065A84: .4byte gOptionsWindowColorPtr
_08065A88: .4byte gUnknown_202F2E8
- thumb_func_end sub_8065948
+ thumb_func_end CreateFieldOthersMenu
thumb_func_start sub_8065A8C
sub_8065A8C:
@@ -43933,7 +43933,7 @@ sub_8068614:
bx r0
.align 2, 0
_0806862C: .4byte gUnknown_8106E98
-_08068630: .4byte gUnknown_8510000
+_08068630: .4byte gMonsterFileArchive
_08068634: .4byte gUnknown_203B418
_08068638: .4byte 0x000181e4
thumb_func_end sub_8068614
@@ -44194,7 +44194,7 @@ _08068820:
_08068828: .4byte gUnknown_203B418
_0806882C: .4byte 0x00017b44
_08068830: .4byte gUnknown_8106EA0
-_08068834: .4byte gUnknown_8510000
+_08068834: .4byte gMonsterFileArchive
thumb_func_end sub_80687EC
thumb_func_start sub_8068838
@@ -47842,7 +47842,7 @@ _0806A41C:
bx r0
.align 2, 0
_0806A450: .4byte gUnknown_8106EB0
-_0806A454: .4byte gUnknown_83B0000
+_0806A454: .4byte gDungeonFileArchive
thumb_func_end sub_806A3D4
thumb_func_start sub_806A458
diff --git a/asm/code_808DAB4.s b/asm/code_808DAB4.s
index 7ea9fd6..fb2a3b9 100644
--- a/asm/code_808DAB4.s
+++ b/asm/code_808DAB4.s
@@ -291,7 +291,7 @@ _0808E052:
.align 2, 0
_0808E06C: .4byte gLevelCurrentPokeId
_0808E070: .4byte gUnknown_810768C
-_0808E074: .4byte gUnknown_8300500
+_0808E074: .4byte gSystemFileArchive
_0808E078: .4byte gLevelCurrentData
thumb_func_end GetPokemonLevelData
@@ -1079,7 +1079,7 @@ _0808E598:
bx r0
.align 2, 0
_0808E628: .4byte gUnknown_81076BC
-_0808E62C: .4byte gUnknown_83B0000
+_0808E62C: .4byte gDungeonFileArchive
_0808E630: .4byte 0x06010000
_0808E634: .4byte 0x0000f3ff
_0808E638: .4byte 0x00003fff
diff --git a/asm/code_809017C.s b/asm/code_809017C.s
index 6c2d1ef..b59bf01 100644
--- a/asm/code_809017C.s
+++ b/asm/code_809017C.s
@@ -1097,7 +1097,7 @@ sub_8090998:
_080909B8: .4byte gUnknown_203B460
_080909BC: .4byte gUnknown_20389A8
_080909C0: .4byte gUnknown_8109764
-_080909C4: .4byte gUnknown_8300500
+_080909C4: .4byte gSystemFileArchive
_080909C8: .4byte gItemParametersFile
_080909CC: .4byte gItemParametersFile + 4
thumb_func_end sub_8090998
diff --git a/asm/code_8092334.s b/asm/code_8092334.s
index 7030d9b..bb28f8b 100644
--- a/asm/code_8092334.s
+++ b/asm/code_8092334.s
@@ -24,7 +24,7 @@ LoadWazaParameters:
bx r0
.align 2, 0
_08092868: .4byte gUnknown_81098D0
-_0809286C: .4byte gUnknown_8300500
+_0809286C: .4byte gSystemFileArchive
_08092870: .4byte gWazaParametersFile
_08092874: .4byte gMovesData
_08092878: .4byte gMovesRelated_2038C6C
diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
index 11db9fb..c78c7be 100644
--- a/asm/code_8098BDC.s
+++ b/asm/code_8098BDC.s
@@ -841,7 +841,7 @@ sub_809965C:
bx r0
.align 2, 0
_08099688: .4byte gUnknown_811601C
-_0809968C: .4byte gUnknown_8300500
+_0809968C: .4byte gSystemFileArchive
thumb_func_end sub_809965C
thumb_func_start sub_8099690
@@ -868,7 +868,7 @@ sub_8099690:
b _080996D6
.align 2, 0
_080996BC: .4byte gUnknown_8116028
-_080996C0: .4byte gUnknown_8300500
+_080996C0: .4byte gSystemFileArchive
_080996C4: .4byte gUnknown_203B46C
_080996C8: .4byte gUnknown_202D078
_080996CC:
diff --git a/asm/code_80A26CC.s b/asm/code_80A26CC.s
index 20676d2..422d194 100644
--- a/asm/code_80A26CC.s
+++ b/asm/code_80A26CC.s
@@ -1226,7 +1226,7 @@ _080A326C:
.align 2, 0
_080A3284: .4byte 0x00000444
_080A3288: .4byte gUnknown_81188F0
-_080A328C: .4byte gUnknown_9890000
+_080A328C: .4byte gGroundFileArchive
_080A3290: .4byte 0x00000434
_080A3294: .4byte 0x00000464
_080A3298: .4byte 0x00000454
@@ -1347,7 +1347,7 @@ _080A3338:
_080A3384: .4byte 0x0000046c
_080A3388: .4byte 0x00000471
_080A338C: .4byte 0x06008000
-_080A3390: .4byte gUnknown_9890000
+_080A3390: .4byte gGroundFileArchive
_080A3394:
strb r0, [r4]
strb r0, [r4, 0x1]
@@ -1435,7 +1435,7 @@ _080A3428:
pop {r0}
bx r0
.align 2, 0
-_080A3438: .4byte gUnknown_9890000
+_080A3438: .4byte gGroundFileArchive
_080A343C: .4byte 0x0000052a
thumb_func_end sub_80A2FBC
@@ -1854,7 +1854,7 @@ _080A376C:
.align 2, 0
_080A377C: .4byte 0x00000444
_080A3780: .4byte gUnknown_81188F0
-_080A3784: .4byte gUnknown_9890000
+_080A3784: .4byte gGroundFileArchive
_080A3788: .4byte 0x00000434
_080A378C: .4byte 0x00000464
_080A3790: .4byte 0x00000454
@@ -7798,7 +7798,7 @@ _080A6350:
.align 2, 0
_080A6378: .4byte gUnknown_3001B7C
_080A637C: .4byte gUnknown_81177CC
-_080A6380: .4byte gUnknown_83B0000
+_080A6380: .4byte gDungeonFileArchive
_080A6384: .4byte gUnknown_203B4B4
_080A6388: .4byte gUnknown_2039DD4
_080A638C: .4byte gUnknown_2039DD0
@@ -7931,7 +7931,7 @@ _080A6474:
bx r0
.align 2, 0
_080A649C: .4byte gUnknown_81177EC
-_080A64A0: .4byte gUnknown_8510000
+_080A64A0: .4byte gMonsterFileArchive
thumb_func_end sub_80A6460
thumb_func_start sub_80A64A4
@@ -7987,7 +7987,7 @@ _080A64C0:
.align 2, 0
_080A6508: .4byte gUnknown_3001B7C
_080A650C: .4byte gUnknown_81177EC
-_080A6510: .4byte gUnknown_8510000
+_080A6510: .4byte gMonsterFileArchive
_080A6514:
movs r0, 0xFF
ands r0, r5
@@ -8045,7 +8045,7 @@ _080A6568:
bx r0
.align 2, 0
_080A6584: .4byte gUnknown_81178F4
-_080A6588: .4byte gUnknown_9E60000
+_080A6588: .4byte gOrnamentFileArchive
thumb_func_end sub_80A64A4
thumb_func_start sub_80A658C
@@ -8932,7 +8932,7 @@ _080A6BA8:
b _080A6BFE
.align 2, 0
_080A6BE0: .4byte gUnknown_81177EC
-_080A6BE4: .4byte gUnknown_8510000
+_080A6BE4: .4byte gMonsterFileArchive
_080A6BE8:
movs r0, 0xFF
ands r0, r5
@@ -8994,7 +8994,7 @@ _080A6C42:
b _080A6C78
.align 2, 0
_080A6C60: .4byte gUnknown_81178F4
-_080A6C64: .4byte gUnknown_9E60000
+_080A6C64: .4byte gOrnamentFileArchive
_080A6C68: .4byte gUnknown_8117894
_080A6C6C:
mov r1, r10
@@ -10088,7 +10088,7 @@ sub_80A7428:
b _080A74AC
.align 2, 0
_080A7480: .4byte gUnknown_8117EDC
-_080A7484: .4byte gUnknown_8510000
+_080A7484: .4byte gMonsterFileArchive
_080A7488: .4byte 0xffff0000
_080A748C: .4byte 0x0000ffff
_080A7490:
@@ -10301,7 +10301,7 @@ sub_80A75CC:
_080A7618: .4byte gUnknown_8117AE4
_080A761C: .4byte 0xffff0000
_080A7620: .4byte 0x0000ffff
-_080A7624: .4byte gUnknown_9E60000
+_080A7624: .4byte gOrnamentFileArchive
_080A7628:
str r5, [sp, 0x4]
_080A762A:
@@ -10397,7 +10397,7 @@ sub_80A7688:
_080A76D4: .4byte gUnknown_8117E8C
_080A76D8: .4byte 0xffff0000
_080A76DC: .4byte 0x0000ffff
-_080A76E0: .4byte gUnknown_9E60000
+_080A76E0: .4byte gOrnamentFileArchive
_080A76E4:
str r5, [sp, 0x4]
_080A76E6:
diff --git a/asm/code_80A7714.s b/asm/code_80A7714.s
index 015f8ab..64ef659 100644
--- a/asm/code_80A7714.s
+++ b/asm/code_80A7714.s
@@ -13543,7 +13543,7 @@ _080ADDFA:
b _080ADEFC
.align 2, 0
_080ADEB4: .4byte gMapparamText
-_080ADEB8: .4byte gUnknown_83B0000
+_080ADEB8: .4byte gDungeonFileArchive
_080ADEBC: .4byte gUnknown_811889C
_080ADEC0: .4byte gUnknown_8108EC0
_080ADEC4: .4byte gUnknown_81188A8
@@ -13636,7 +13636,7 @@ _080ADF52:
.align 2, 0
_080ADF80: .4byte gUnknown_81188CC
_080ADF84: .4byte gUnknown_81188DC
-_080ADF88: .4byte gUnknown_83B0000
+_080ADF88: .4byte gDungeonFileArchive
thumb_func_end sub_80ADD9C
thumb_func_start sub_80ADF8C
diff --git a/asm/fatal_system_1.s b/asm/fatal_system_1.s
index a68366e..e0f194d 100644
--- a/asm/fatal_system_1.s
+++ b/asm/fatal_system_1.s
@@ -5,48 +5,6 @@
.text
- thumb_func_start Log
-Log:
- push {r1-r3}
- add sp, 0xC
- bx lr
- thumb_func_end Log
-
- thumb_func_start sub_8011BC8
-sub_8011BC8:
- push {r2,r3}
- add sp, 0x8
- bx lr
- thumb_func_end sub_8011BC8
-
- thumb_func_start nullsub_29
-nullsub_29:
- bx lr
- thumb_func_end nullsub_29
-
- thumb_func_start nullsub_30
-nullsub_30:
- bx lr
- thumb_func_end nullsub_30
-
- thumb_func_start nullsub_31
-nullsub_31:
- bx lr
- thumb_func_end nullsub_31
-
- thumb_func_start nullsub_32
-nullsub_32:
- bx lr
- thumb_func_end nullsub_32
-
- thumb_func_start FatalErrorHang
-FatalErrorHang:
- push {lr}
- bl Hang
- pop {r0}
- bx r0
- thumb_func_end FatalErrorHang
-
thumb_func_start FatalError
FatalError:
push {r1-r3}
diff --git a/asm/text.s b/asm/text.s
index 4c7aa61..aa7be82 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -7014,7 +7014,7 @@ _0800978C: .4byte gUnknown_203B090
_08009790: .4byte 0x00005fff
_08009794: .4byte gUnknown_80B88B0
_08009798: .4byte 0x00a000a0
-_0800979C: .4byte gUnknown_8300500
+_0800979C: .4byte gSystemFileArchive
_080097A0: .4byte 0x06004f00
_080097A4: .4byte gUnknown_80B88B8
_080097A8: .4byte 0x06017e00
@@ -7058,7 +7058,7 @@ _080097DA:
bx r0
.align 2, 0
_080097F8: .4byte gUnknown_80B88CC
-_080097FC: .4byte gUnknown_8300500
+_080097FC: .4byte gSystemFileArchive
_08009800: .4byte gUnknown_202D038
thumb_func_end sub_80097B0
diff --git a/asm/wonder_mail.s b/asm/wonder_mail.s
index 569f81d..1541bd0 100644
--- a/asm/wonder_mail.s
+++ b/asm/wonder_mail.s
@@ -3716,7 +3716,7 @@ _0802B930:
bl sub_803B6B0
bl sub_802BC7C
adds r0, r4, 0
- bl sub_803C190
+ bl GetPokemonMailHeadline
adds r2, r0, 0
ldr r0, [r7]
ldr r3, [r0, 0x6C]
@@ -3975,7 +3975,7 @@ sub_802BB28:
bl sub_80073B8
ldr r0, [r5]
ldrb r0, [r0, 0x4]
- bl sub_803C190
+ bl GetPokemonMailHeadline
adds r2, r0, 0
ldr r0, [r5]
ldr r3, [r0, 0x24]
@@ -4171,7 +4171,7 @@ sub_802BCC4:
ldr r4, _0802BCDC
ldr r0, [r4]
ldrb r0, [r0, 0x4]
- bl sub_803C1A0
+ bl GetPokemonMailText
adds r3, r0, 0
ldr r1, [r4]
movs r0, 0
@@ -4301,7 +4301,7 @@ _0802BD8E:
adds r0, 0x4
bl sub_8013984
bl sub_802BF30
- bl sub_802BFA0
+ bl CreateMailMenu
movs r0, 0x1
_0802BDD4:
pop {r3}
@@ -4377,7 +4377,7 @@ _0802BE48:
_0802BE60: .4byte gUnknown_203B2D8
_0802BE64:
bl sub_802BF30
- bl sub_802BFA0
+ bl CreateMailMenu
movs r0, 0x1
_0802BE6E:
pop {r1}
@@ -4423,7 +4423,7 @@ sub_802BE94:
adds r0, 0x4
bl sub_8013984
bl sub_802BF30
- bl sub_802BFA0
+ bl CreateMailMenu
cmp r4, 0
beq _0802BED2
ldr r0, [r5]
@@ -4535,8 +4535,8 @@ sub_802BF30:
_0802BF9C: .4byte gUnknown_203B2D8
thumb_func_end sub_802BF30
- thumb_func_start sub_802BFA0
-sub_802BFA0:
+ thumb_func_start CreateMailMenu
+CreateMailMenu:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -4608,7 +4608,7 @@ _0802BFE8:
mov r0, r9
bl sub_808DA34
ldrb r0, [r5, 0x5]
- bl sub_803C190
+ bl GetPokemonMailHeadline
adds r1, r0, 0
mov r0, r8
mov r2, r9
@@ -4624,7 +4624,7 @@ _0802BFE8:
b _0802C08E
.align 2, 0
_0802C060: .4byte gUnknown_203B2D8
-_0802C064: .4byte gUnknown_80DFC8C
+_0802C064: .4byte gMailboxText
_0802C068: .4byte gUnknown_202DF98
_0802C06C:
adds r0, r5, 0
@@ -4663,7 +4663,7 @@ _0802C09A:
bx r0
.align 2, 0
_0802C0B4: .4byte gUnknown_203B2D8
- thumb_func_end sub_802BFA0
+ thumb_func_end CreateMailMenu
thumb_func_start sub_802C0B8
sub_802C0B8:
@@ -5087,7 +5087,7 @@ sub_802C39C:
b _0802C452
.align 2, 0
_0802C3F8: .4byte gUnknown_203B2E0
-_0802C3FC: .4byte gUnknown_80DFCCC
+_0802C3FC: .4byte gBulletinBoardText
_0802C400:
ldr r1, [r7]
movs r3, 0x26
@@ -8788,7 +8788,7 @@ _0802E0DA:
subs r3, 0x1
cmp r3, 0
bge _0802E0DA
- bl sub_802E2B4
+ bl CreateMailboxMenu
ldr r3, _0802E11C
ldr r2, [r3]
movs r0, 0x9E
@@ -8809,7 +8809,7 @@ _0802E118: .4byte gUnknown_80E0284
_0802E11C: .4byte gUnknown_203B304
_0802E120: .4byte gUnknown_80E029C
_0802E124:
- bl sub_802E3B8
+ bl CreateMailActionMenu
ldr r2, [r4]
movs r0, 0x9E
lsls r0, 1
@@ -8934,9 +8934,9 @@ _0802E22A:
bl sub_802BE94
b _0802E2AA
_0802E232:
- bl sub_802BFA0
+ bl CreateMailMenu
movs r0, 0x3
- bl sub_802E7F8
+ bl CreateMailAcceptedStatusBox
ldr r0, _0802E25C
ldr r2, [r0]
adds r0, r2, 0
@@ -8995,8 +8995,8 @@ _0802E2AA:
bx r0
thumb_func_end sub_802E1AC
- thumb_func_start sub_802E2B4
-sub_802E2B4:
+ thumb_func_start CreateMailboxMenu
+CreateMailboxMenu:
push {r4-r7,lr}
ldr r4, _0802E380
ldr r0, [r4]
@@ -9102,9 +9102,9 @@ _0802E35A:
b _0802E3B2
.align 2, 0
_0802E380: .4byte gUnknown_203B304
-_0802E384: .4byte gUnknown_80E02E4
-_0802E388: .4byte gUnknown_80E02F0
-_0802E38C: .4byte gUnknown_80E02FC
+_0802E384: .4byte gMailboxCheckMail
+_0802E388: .4byte gMailboxJobList
+_0802E38C: .4byte gMailboxPKMNNews
_0802E390:
adds r3, 0x1
cmp r3, r5
@@ -9127,10 +9127,10 @@ _0802E3B2:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802E2B4
+ thumb_func_end CreateMailboxMenu
- thumb_func_start sub_802E3B8
-sub_802E3B8:
+ thumb_func_start CreateMailActionMenu
+CreateMailActionMenu:
push {r4-r7,lr}
movs r5, 0
ldr r4, _0802E3F0
@@ -9159,8 +9159,8 @@ sub_802E3B8:
b _0802E44A
.align 2, 0
_0802E3F0: .4byte gUnknown_203B304
-_0802E3F4: .4byte gUnknown_80E0308
-_0802E3F8: .4byte gUnknown_80E0310
+_0802E3F4: .4byte gMailActionStore
+_0802E3F8: .4byte gMailActionRead
_0802E3FC:
ldr r1, [r4]
adds r2, r1, 0
@@ -9256,7 +9256,7 @@ _0802E4A8:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802E3B8
+ thumb_func_end CreateMailActionMenu
thumb_func_start sub_802E4B0
sub_802E4B0:
@@ -9647,8 +9647,8 @@ nullsub_133:
bx lr
thumb_func_end nullsub_133
- thumb_func_start sub_802E7F8
-sub_802E7F8:
+ thumb_func_start CreateMailAcceptedStatusBox
+CreateMailAcceptedStatusBox:
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -9691,9 +9691,9 @@ sub_802E7F8:
pop {r0}
bx r0
.align 2, 0
-_0802E85C: .4byte gUnknown_80E0318
+_0802E85C: .4byte gMailAccepted
_0802E860: .4byte gUnknown_80E0324
- thumb_func_end sub_802E7F8
+ thumb_func_end CreateMailAcceptedStatusBox
thumb_func_start sub_802E864
sub_802E864:
@@ -9861,7 +9861,7 @@ _0802E986:
subs r3, 0x1
cmp r3, 0
bge _0802E986
- bl sub_802EB34
+ bl CreatePelliperBoardMenu
ldr r3, _0802E9C8
ldr r2, [r3]
movs r0, 0x9E
@@ -10006,7 +10006,7 @@ _0802EACA:
_0802EAD2:
bl sub_802C39C
movs r0, 0x3
- bl sub_802EEDC
+ bl CreatePelliperAcceptedStatusBox
ldr r0, _0802EAFC
ldr r2, [r0]
adds r0, r2, 0
@@ -10050,8 +10050,8 @@ _0802EB2C:
bx r0
thumb_func_end sub_802EA58
- thumb_func_start sub_802EB34
-sub_802EB34:
+ thumb_func_start CreatePelliperBoardMenu
+CreatePelliperBoardMenu:
push {r4-r7,lr}
ldr r4, _0802EBDC
ldr r0, [r4]
@@ -10139,8 +10139,8 @@ _0802EBB6:
b _0802EC0A
.align 2, 0
_0802EBDC: .4byte gUnknown_203B308
-_0802EBE0: .4byte gUnknown_80E0390
-_0802EBE4: .4byte gUnknown_80E03A0
+_0802EBE0: .4byte gPelliperBoard_BulletinBoard
+_0802EBE4: .4byte gPelliperBoard_JobList
_0802EBE8:
adds r3, 0x1
cmp r3, r5
@@ -10163,7 +10163,7 @@ _0802EC0A:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802EB34
+ thumb_func_end CreatePelliperBoardMenu
thumb_func_start sub_802EC10
sub_802EC10:
@@ -10527,8 +10527,8 @@ nullsub_134:
bx lr
thumb_func_end nullsub_134
- thumb_func_start sub_802EEDC
-sub_802EEDC:
+ thumb_func_start CreatePelliperAccepedStatusBox
+CreatePelliperAcceptedStatusBox:
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -10573,7 +10573,7 @@ sub_802EEDC:
.align 2, 0
_0802EF40: .4byte gUnknown_80E03AC
_0802EF44: .4byte gUnknown_80E03B8
- thumb_func_end sub_802EEDC
+ thumb_func_end CreatePelliperAcceptedStatusBox
thumb_func_start sub_802EF48
sub_802EF48:
@@ -12687,7 +12687,7 @@ _0802FFE4:
lsls r0, 3
b _0803000E
.align 2, 0
-_0802FFF8: .4byte gUnknown_80D9FC8
+_0802FFF8: .4byte gMakuhitaDialogue
_0802FFFC: .4byte gUnknown_203B318
_08030000:
ldr r2, _08030034
@@ -12716,7 +12716,7 @@ _0803000E:
bl sub_8014248
b _080301A0
.align 2, 0
-_08030034: .4byte gUnknown_80D9FC8
+_08030034: .4byte gMakuhitaDialogue
_08030038:
ldr r3, [r5]
movs r0, 0xD
@@ -12729,7 +12729,7 @@ _08030038:
adds r2, 0x8
b _0803015A
.align 2, 0
-_0803004C: .4byte gUnknown_80D9FC8
+_0803004C: .4byte gMakuhitaDialogue
_08030050:
ldr r3, [r5]
movs r0, 0x4
@@ -12742,7 +12742,7 @@ _08030050:
adds r2, 0xC
b _0803015A
.align 2, 0
-_08030064: .4byte gUnknown_80D9FC8
+_08030064: .4byte gMakuhitaDialogue
_08030068:
movs r0, 0x3
movs r1, 0
@@ -12783,7 +12783,7 @@ _08030074:
_080300B4: .4byte 0xffffff00
_080300B8: .4byte 0xffff00ff
_080300BC: .4byte gUnknown_202DF98
-_080300C0: .4byte gUnknown_80D9FC8
+_080300C0: .4byte gMakuhitaDialogue
_080300C4:
ldr r3, [r5]
movs r0, 0xD
@@ -12796,7 +12796,7 @@ _080300C4:
adds r2, 0x18
b _0803015A
.align 2, 0
-_080300D8: .4byte gUnknown_80D9FC8
+_080300D8: .4byte gMakuhitaDialogue
_080300DC:
ldr r3, [r5]
movs r0, 0xD
@@ -12809,7 +12809,7 @@ _080300DC:
adds r2, 0x14
b _0803015A
.align 2, 0
-_080300F0: .4byte gUnknown_80D9FC8
+_080300F0: .4byte gMakuhitaDialogue
_080300F4:
ldr r3, [r5]
movs r0, 0x9
@@ -12822,7 +12822,7 @@ _080300F4:
adds r2, 0x1C
b _0803015A
.align 2, 0
-_08030108: .4byte gUnknown_80D9FC8
+_08030108: .4byte gMakuhitaDialogue
_0803010C:
ldr r4, _08030138
bl sub_808D33C
@@ -12866,7 +12866,7 @@ _0803015A:
bl sub_80141B4
b _080301A0
.align 2, 0
-_0803016C: .4byte gUnknown_80D9FC8
+_0803016C: .4byte gMakuhitaDialogue
_08030170: .4byte 0x0000010d
_08030174:
movs r0, 0x1
@@ -12896,7 +12896,7 @@ _080301A0:
pop {r0}
bx r0
.align 2, 0
-_080301A8: .4byte gUnknown_80D9FC8
+_080301A8: .4byte gMakuhitaDialogue
_080301AC: .4byte 0x0000010d
thumb_func_end sub_802FF88
@@ -31545,7 +31545,7 @@ _0803981C:
bx r0
.align 2, 0
_08039834: .4byte gUnknown_80E785C
-_08039838: .4byte gUnknown_8380000
+_08039838: .4byte gTitleMenuFileArchive
_0803983C: .4byte gUnknown_203B3B8
_08039840: .4byte gUnknown_203B388
thumb_func_end sub_80397B4
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 09:03:28 +0000