diff options
-rw-r--r-- | asm/cereader_tool.s | 8 | ||||
-rw-r--r-- | asm/field_specials.s | 4 | ||||
-rw-r--r-- | asm/fieldmap.s | 4 | ||||
-rw-r--r-- | asm/link_rfu_2.s | 18 | ||||
-rw-r--r-- | asm/link_rfu_3.s | 28 | ||||
-rw-r--r-- | asm/map_obj_80688E4.s | 4 | ||||
-rw-r--r-- | asm/menews_jisan.s | 4 | ||||
-rw-r--r-- | asm/mevent.s | 16 | ||||
-rw-r--r-- | asm/mevent_server.s | 108 | ||||
-rw-r--r-- | asm/scrcmd.s | 8 | ||||
-rw-r--r-- | data/data.s | 120 |
11 files changed, 190 insertions, 132 deletions
diff --git a/asm/cereader_tool.s b/asm/cereader_tool.s index 8d2beb17d..749cb5303 100644 --- a/asm/cereader_tool.s +++ b/asm/cereader_tool.s @@ -111,8 +111,8 @@ sub_815D700: @ 815D700 ldrh r0, [r5, 0x2] cmp r0, 0 beq _0815D718 - ldr r0, _0815D77C @ =gUnknown_8479CD8 - ldr r2, _0815D780 @ =gUnknown_8479D10 + ldr r0, _0815D77C @ =gUnknown_8479CD8 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c" + ldr r2, _0815D780 @ =gUnknown_8479D10 "ttdata->dummy == 0" movs r1, 0xC6 movs r3, 0x1 bl AGBAssert @@ -120,8 +120,8 @@ _0815D718: ldrb r0, [r5, 0x1] cmp r0, 0 beq _0815D72A - ldr r0, _0815D77C @ =gUnknown_8479CD8 - ldr r2, _0815D784 @ =gUnknown_8479D24 + ldr r0, _0815D77C @ =gUnknown_8479CD8 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c" + ldr r2, _0815D784 @ =gUnknown_8479D24 "ttdata->id == 0" movs r1, 0xC7 movs r3, 0x1 bl AGBAssert diff --git a/asm/field_specials.s b/asm/field_specials.s index 37d522660..760bd5bc5 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -4370,9 +4370,9 @@ _080CC772: lsrs r0, 16 b _080CC78A _080CC77C: - ldr r0, _080CC790 @ =gUnknown_83F5EF0 + ldr r0, _080CC790 @ =gUnknown_83F5EF0 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c" ldr r1, _080CC794 @ =0x00000f21 - ldr r2, _080CC798 @ =gUnknown_83F5F24 + ldr r2, _080CC798 @ =gUnknown_83F5F24 "0" movs r3, 0x1 bl AGBAssert movs r0, 0 diff --git a/asm/fieldmap.s b/asm/fieldmap.s index b1aa05f04..12d509904 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -67,8 +67,8 @@ sub_8058A00: @ 8058A00 lsls r0, 6 cmp r1, r0 ble _08058A3E - ldr r0, _08058A68 @ =gUnknown_8352F18 - ldr r2, _08058A6C @ =gUnknown_8352F4C + ldr r0, _08058A68 @ =gUnknown_8352F18 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c" + ldr r2, _08058A6C @ =gUnknown_8352F4C "VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE" movs r1, 0x9E movs r3, 0x1 bl AGBAssert diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index d2b9db6e4..037b31fe4 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -2307,9 +2307,9 @@ sub_80F9828: @ 80F9828 ldr r0, [r4] cmp r0, 0 beq _080F983E - ldr r0, _080F984C @ =gUnknown_843ED94 + ldr r0, _080F984C @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c" ldr r1, _080F9850 @ =0x000005c1 - ldr r2, _080F9854 @ =gUnknown_843EDC4 + ldr r2, _080F9854 @ =gUnknown_843EDC4 "Rfu.RfuFunc == NULL" movs r3, 0x1 bl AGBAssert _080F983E: @@ -3136,9 +3136,9 @@ sub_80F9E60: @ 80F9E60 adds r6, r1, 0 cmp r6, 0xFC bls _080F9E7C - ldr r0, _080F9EA8 @ =gUnknown_843ED94 + ldr r0, _080F9EA8 @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c" ldr r1, _080F9EAC @ =0x00000701 - ldr r2, _080F9EB0 @ =gUnknown_843EDD8 + ldr r2, _080F9EB0 @ =gUnknown_843EDD8 "size<=252" movs r3, 0x1 bl AGBAssert _080F9E7C: @@ -4739,7 +4739,7 @@ sub_80FAA58: @ 80FAA58 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _080FAA8C @ =gUnknown_843EDE4 + ldr r0, _080FAA8C @ =gUnknown_843EDE4 "PokemonSioInfo" adds r1, r4, 0 bl strcmp adds r5, r0, 0 @@ -4895,7 +4895,7 @@ _080FABA0: .4byte gUnknown_202273C _080FABA4: ldr r5, _080FAC40 @ =gUnknown_2022618 adds r1, r5, 0 - ldr r0, _080FAC44 @ =gUnknown_843EDE4 + ldr r0, _080FAC44 @ =gUnknown_843EDE4 "PokemonSioInfo" ldm r0!, {r2-r4} stm r1!, {r2-r4} ldrh r2, [r0] @@ -6097,7 +6097,7 @@ _080FB4AA: adds r1, r4, 0 bl sub_80FB9E4 _080FB4BC: - ldr r0, _080FB4E0 @ =gUnknown_843EDF8 + ldr r0, _080FB4E0 @ =gUnknown_843EDF8 "LINK LOSS DISCONNECT!" movs r1, 0x5 movs r2, 0x5 bl nullsub_87 @@ -6118,7 +6118,7 @@ _080FB4E8: adds r0, 0xF0 movs r1, 0x1 strb r1, [r0] - ldr r0, _080FB500 @ =gUnknown_843EE10 + ldr r0, _080FB500 @ =gUnknown_843EE10 "LINK LOSS RECOVERY NOW" movs r1, 0x5 movs r2, 0x5 bl nullsub_87 @@ -7928,7 +7928,7 @@ _080FC2CE: adds r6, r7, 0 cmp r6, 0x3 ble _080FC2B8 - ldr r0, _080FC300 @ =gUnknown_843EE64 + ldr r0, _080FC300 @ =gUnknown_843EE64 "NOWSLOT" movs r1, 0x1 movs r2, 0xF bl nullsub_87 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 76de5c696..39c7e1a0b 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -11398,9 +11398,9 @@ _0811B6B8: .4byte gUnknown_8457120 _0811B6BC: .4byte gSaveBlock1Ptr _0811B6C0: .4byte gUnknown_2036E38 _0811B6C4: - ldr r0, _0811B6DC @ =gUnknown_8457138 + ldr r0, _0811B6DC @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811B6E0 @ =0x00000183 - ldr r2, _0811B6E4 @ =gUnknown_8457174 + ldr r2, _0811B6E4 @ =gUnknown_8457174 "0" movs r3, 0x1 bl AGBAssert _0811B6D0: @@ -11481,10 +11481,10 @@ sub_811B754: @ 811B754 str r4, [r0] cmp r4, 0 bne _0811B774 - ldr r0, _0811B7A0 @ =gUnknown_8457138 + ldr r0, _0811B7A0 @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" movs r1, 0xDD lsls r1, 1 - ldr r2, _0811B7A4 @ =gUnknown_8457178 + ldr r2, _0811B7A4 @ =gUnknown_8457178 "UnionObjWork != NULL" movs r3, 0x1 bl AGBAssert _0811B774: @@ -11663,9 +11663,9 @@ sub_811B8BC: @ 811B8BC adds r4, r1, r0 cmp r1, 0 bne _0811B8DA - ldr r0, _0811B8F8 @ =gUnknown_8457138 + ldr r0, _0811B8F8 @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811B8FC @ =0x00000231 - ldr r2, _0811B900 @ =gUnknown_8457178 + ldr r2, _0811B900 @ =gUnknown_8457178 "UnionObjWork != NULL" movs r3, 0x1 bl AGBAssert _0811B8DA: @@ -11702,9 +11702,9 @@ sub_811B90C: @ 811B90C adds r4, r1, r0 cmp r1, 0 bne _0811B926 - ldr r0, _0811B938 @ =gUnknown_8457138 + ldr r0, _0811B938 @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811B93C @ =0x00000241 - ldr r2, _0811B940 @ =gUnknown_8457178 + ldr r2, _0811B940 @ =gUnknown_8457178 "UnionObjWork != NULL" movs r3, 0x1 bl AGBAssert _0811B926: @@ -11812,9 +11812,9 @@ sub_811B9D8: @ 811B9D8 ldr r0, [r5] cmp r0, 0 bne _0811B9EE - ldr r0, _0811BA0C @ =gUnknown_8457138 + ldr r0, _0811BA0C @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811BA10 @ =0x00000283 - ldr r2, _0811BA14 @ =gUnknown_8457178 + ldr r2, _0811BA14 @ =gUnknown_8457178 "UnionObjWork != NULL" movs r3, 0x1 bl AGBAssert _0811B9EE: @@ -11857,9 +11857,9 @@ sub_811BA18: @ 811BA18 .align 2, 0 _0811BA38: .4byte sub_811B9D8 _0811BA3C: - ldr r0, _0811BA50 @ =gUnknown_8457138 + ldr r0, _0811BA50 @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811BA54 @ =0x0000028f - ldr r2, _0811BA58 @ =gUnknown_8457174 + ldr r2, _0811BA58 @ =gUnknown_8457174 "0" movs r3, 0x1 bl AGBAssert movs r0, 0x10 @@ -12378,9 +12378,9 @@ _0811BE3C: bl sub_811BCA0 b _0811BE58 _0811BE4C: - ldr r0, _0811BE60 @ =gUnknown_8457138 + ldr r0, _0811BE60 @ =gUnknown_8457138 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" ldr r1, _0811BE64 @ =0x000003d3 - ldr r2, _0811BE68 @ =gUnknown_8457174 + ldr r2, _0811BE68 @ =gUnknown_8457174 "0" movs r3, 0x1 bl AGBAssert _0811BE58: diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index d1d529279..5ba346f0b 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -1385,9 +1385,9 @@ _0806926C: _08069274: movs r0, 0 strh r0, [r1, 0x34] - ldr r0, _08069288 @ =gUnknown_83A720C + ldr r0, _08069288 @ =gUnknown_83A720C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/evobjmv.c" ldr r1, _0806928C @ =0x00003413 - ldr r2, _08069290 @ =gUnknown_83A7240 + ldr r2, _08069290 @ =gUnknown_83A7240 "0" movs r3, 0x1 bl AGBAssert _08069284: diff --git a/asm/menews_jisan.s b/asm/menews_jisan.s index 515143493..abd5e44f4 100644 --- a/asm/menews_jisan.s +++ b/asm/menews_jisan.s @@ -308,9 +308,9 @@ _08146E54: movs r0, 0x5 b _08146E66 _08146E58: - ldr r0, _08146E6C @ =gUnknown_8468C5C + ldr r0, _08146E6C @ =gUnknown_8468C5C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c" ldr r1, _08146E70 @ =0x0000017f - ldr r2, _08146E74 @ =gUnknown_8468C94 + ldr r2, _08146E74 @ =gUnknown_8468C94 "0" movs r3, 0x1 bl AGBAssert movs r0, 0 diff --git a/asm/mevent.s b/asm/mevent.s index b1d7166fd..9110a1d0a 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -2006,9 +2006,9 @@ _081444F4: ldrb r0, [r0] b _0814450A _081444FC: - ldr r0, _08144510 @ =gUnknown_8466F28 + ldr r0, _08144510 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" ldr r1, _08144514 @ =0x00000339 - ldr r2, _08144518 @ =gUnknown_8466F5C + ldr r2, _08144518 @ =gUnknown_8466F5C "0" movs r3, 0x1 bl AGBAssert movs r0, 0 @@ -2074,10 +2074,10 @@ _08144580: _08144582: cmp r2, 0 bne _081445A4 - ldr r0, _0814459C @ =gUnknown_8466F28 + ldr r0, _0814459C @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" movs r1, 0xD9 lsls r1, 2 - ldr r2, _081445A0 @ =gUnknown_8466F5C + ldr r2, _081445A0 @ =gUnknown_8466F5C "0" movs r3, 0x1 bl AGBAssert b _081445B6 @@ -2209,9 +2209,9 @@ _08144684: _0814469C: .4byte gSaveBlock1Ptr _081446A0: .4byte 0x000032e4 _081446A4: - ldr r0, _081446B8 @ =gUnknown_8466F28 + ldr r0, _081446B8 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" ldr r1, _081446BC @ =0x00000391 - ldr r2, _081446C0 @ =gUnknown_8466F5C + ldr r2, _081446C0 @ =gUnknown_8466F5C "0" movs r3, 0x1 bl AGBAssert movs r0, 0 @@ -2318,10 +2318,10 @@ _08144762: _0814476C: .4byte gSaveBlock1Ptr _08144770: .4byte 0x00003464 _08144774: - ldr r0, _08144788 @ =gUnknown_8466F28 + ldr r0, _08144788 @ =gUnknown_8466F28 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" movs r1, 0xF7 lsls r1, 2 - ldr r2, _0814478C @ =gUnknown_8466F5C + ldr r2, _0814478C @ =gUnknown_8466F5C "0" movs r3, 0x1 bl AGBAssert _08144782: diff --git a/asm/mevent_server.s b/asm/mevent_server.s index f0438ff5e..1def33127 100644 --- a/asm/mevent_server.s +++ b/asm/mevent_server.s @@ -1085,9 +1085,9 @@ sub_814501C: @ 814501C lsls r0, 3 cmp r4, r0 bls _0814503A - ldr r0, _08145050 @ =gUnknown_8466F80 + ldr r0, _08145050 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _08145054 @ =0x00000101 - ldr r2, _08145058 @ =gUnknown_8466FB8 + ldr r2, _08145058 @ =gUnknown_8466FB8 "size <= ME_SEND_BUF_SIZE" movs r3, 0x1 bl AGBAssert _0814503A: @@ -1244,10 +1244,10 @@ _08145168: ldr r0, [r4, 0x8] cmp r0, 0 beq _0814517C - ldr r0, _08145188 @ =gUnknown_8466F80 + ldr r0, _08145188 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xB1 lsls r1, 1 - ldr r2, _0814518C @ =gUnknown_8466FD4 + ldr r2, _0814518C @ =gUnknown_8466FD4 "cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _0814517C: @@ -1267,10 +1267,10 @@ _08145196: ldr r0, [r4, 0x8] cmp r0, 0 beq _081451AA - ldr r0, _081451BC @ =gUnknown_8466F80 + ldr r0, _081451BC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xB6 lsls r1, 1 - ldr r2, _081451C0 @ =gUnknown_8466FD4 + ldr r2, _081451C0 @ =gUnknown_8466FD4 "cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _081451AA: @@ -1289,10 +1289,10 @@ _081451C4: ldr r0, [r4, 0x4] cmp r0, 0 beq _08145272 - ldr r0, _081451DC @ =gUnknown_8466F80 + ldr r0, _081451DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xB9 lsls r1, 1 - ldr r2, _081451E0 @ =gUnknown_8466FEC + ldr r2, _081451E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert b _08145272 @@ -1303,19 +1303,19 @@ _081451E4: ldr r0, [r4, 0x4] cmp r0, 0 beq _081451F8 - ldr r0, _08145218 @ =gUnknown_8466F80 + ldr r0, _08145218 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xBC lsls r1, 1 - ldr r2, _0814521C @ =gUnknown_8466FEC + ldr r2, _0814521C @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _081451F8: ldr r0, [r4, 0x8] cmp r0, 0 beq _0814520A - ldr r0, _08145218 @ =gUnknown_8466F80 + ldr r0, _08145218 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _08145220 @ =0x00000179 - ldr r2, _08145224 @ =gUnknown_8466FD4 + ldr r2, _08145224 @ =gUnknown_8466FD4 "cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _0814520A: @@ -1333,19 +1333,19 @@ _08145228: ldr r0, [r4, 0x4] cmp r0, 0 beq _0814523C - ldr r0, _08145258 @ =gUnknown_8466F80 + ldr r0, _08145258 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xBF lsls r1, 1 - ldr r2, _0814525C @ =gUnknown_8466FEC + ldr r2, _0814525C @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _0814523C: ldr r0, [r4, 0x8] cmp r0, 0 beq _0814524E - ldr r0, _08145258 @ =gUnknown_8466F80 + ldr r0, _08145258 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _08145260 @ =0x0000017f - ldr r2, _08145264 @ =gUnknown_8466FD4 + ldr r2, _08145264 @ =gUnknown_8466FD4 "cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _0814524E: @@ -1374,10 +1374,10 @@ _0814527C: ldr r0, [r4, 0x4] cmp r0, 0 beq _08145290 - ldr r0, _081452A4 @ =gUnknown_8466F80 + ldr r0, _081452A4 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xC6 lsls r1, 1 - ldr r2, _081452A8 @ =gUnknown_8466FEC + ldr r2, _081452A8 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _08145290: @@ -1396,19 +1396,19 @@ _081452AC: ldr r0, [r4, 0x4] cmp r0, 0 beq _081452C0 - ldr r0, _081452DC @ =gUnknown_8466F80 + ldr r0, _081452DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xC9 lsls r1, 1 - ldr r2, _081452E0 @ =gUnknown_8466FEC + ldr r2, _081452E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _081452C0: ldr r0, [r4, 0x8] cmp r0, 0 beq _081452D2 - ldr r0, _081452DC @ =gUnknown_8466F80 + ldr r0, _081452DC @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _081452E4 @ =0x00000193 - ldr r2, _081452E8 @ =gUnknown_8466FD4 + ldr r2, _081452E8 @ =gUnknown_8466FD4 "cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _081452D2: @@ -1425,10 +1425,10 @@ _081452EC: ldr r0, [r4, 0x4] cmp r0, 0 beq _08145300 - ldr r0, _08145318 @ =gUnknown_8466F80 + ldr r0, _08145318 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xCC lsls r1, 1 - ldr r2, _0814531C @ =gUnknown_8466FEC + ldr r2, _0814531C @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _08145300: @@ -1448,9 +1448,9 @@ _08145320: ldr r0, [r4, 0x8] cmp r0, 0 beq _08145332 - ldr r0, _08145344 @ =gUnknown_8466F80 + ldr r0, _08145344 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _08145348 @ =0x0000019f - ldr r2, _0814534C @ =gUnknown_8466FD4 + ldr r2, _0814534C @ =gUnknown_8466FD4 "cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _08145332: @@ -1469,10 +1469,10 @@ _08145350: ldr r0, [r4, 0x4] cmp r0, 0 beq _08145364 - ldr r0, _08145370 @ =gUnknown_8466F80 + ldr r0, _08145370 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xD2 lsls r1, 1 - ldr r2, _08145374 @ =gUnknown_8466FEC + ldr r2, _08145374 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _08145364: @@ -1488,10 +1488,10 @@ _08145378: ldr r0, [r4, 0x4] cmp r0, 0 beq _0814538C - ldr r0, _0814539C @ =gUnknown_8466F80 + ldr r0, _0814539C @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xD5 lsls r1, 1 - ldr r2, _081453A0 @ =gUnknown_8466FEC + ldr r2, _081453A0 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _0814538C: @@ -1508,10 +1508,10 @@ _081453A4: ldr r0, [r4, 0x4] cmp r0, 0 beq _081453B8 - ldr r0, _081453D0 @ =gUnknown_8466F80 + ldr r0, _081453D0 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xD8 lsls r1, 1 - ldr r2, _081453D4 @ =gUnknown_8466FEC + ldr r2, _081453D4 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _081453B8: @@ -1532,10 +1532,10 @@ _081453D8: ldr r0, [r4, 0x4] cmp r0, 0 beq _081453EC - ldr r0, _08145404 @ =gUnknown_8466F80 + ldr r0, _08145404 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xDB lsls r1, 1 - ldr r2, _08145408 @ =gUnknown_8466FEC + ldr r2, _08145408 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _081453EC: @@ -1556,10 +1556,10 @@ _0814540C: ldr r0, [r4, 0x4] cmp r0, 0 beq _08145420 - ldr r0, _08145438 @ =gUnknown_8466F80 + ldr r0, _08145438 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xDE lsls r1, 1 - ldr r2, _0814543C @ =gUnknown_8466FEC + ldr r2, _0814543C @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _08145420: @@ -1608,10 +1608,10 @@ _08145470: ldr r0, [r4, 0x4] cmp r0, 0 beq _08145484 - ldr r0, _08145494 @ =gUnknown_8466F80 + ldr r0, _08145494 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xE9 lsls r1, 1 - ldr r2, _08145498 @ =gUnknown_8466FEC + ldr r2, _08145498 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _08145484: @@ -1642,9 +1642,9 @@ _081454B8: ldr r0, [r4, 0x4] cmp r0, 0 beq _081454CA - ldr r0, _081454D8 @ =gUnknown_8466F80 + ldr r0, _081454D8 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _081454DC @ =0x000001e1 - ldr r2, _081454E0 @ =gUnknown_8466FEC + ldr r2, _081454E0 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _081454CA: @@ -1662,10 +1662,10 @@ _081454E4: ldr r0, [r4, 0x4] cmp r0, 0 beq _081454F8 - ldr r0, _08145508 @ =gUnknown_8466F80 + ldr r0, _08145508 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xF3 lsls r1, 1 - ldr r2, _0814550C @ =gUnknown_8466FEC + ldr r2, _0814550C @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _081454F8: @@ -1682,9 +1682,9 @@ _08145510: ldr r0, [r4, 0x4] cmp r0, 0 beq _08145522 - ldr r0, _0814552C @ =gUnknown_8466F80 + ldr r0, _0814552C @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _08145530 @ =0x000001eb - ldr r2, _08145534 @ =gUnknown_8466FEC + ldr r2, _08145534 @ =gUnknown_8466FEC "cmd->flag == FALSE" movs r3, 0x1 bl AGBAssert _08145522: @@ -1716,10 +1716,10 @@ _0814554C: cmp r0, 0 beq _08145566 _08145558: - ldr r0, _08145580 @ =gUnknown_8466F80 + ldr r0, _08145580 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0xFD lsls r1, 1 - ldr r2, _08145584 @ =gUnknown_8467000 + ldr r2, _08145584 @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _08145566: @@ -1744,10 +1744,10 @@ _08145588: cmp r0, 0 beq _081455A2 _08145594: - ldr r0, _081455B8 @ =gUnknown_8466F80 + ldr r0, _081455B8 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0x80 lsls r1, 2 - ldr r2, _081455BC @ =gUnknown_8467000 + ldr r2, _081455BC @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _081455A2: @@ -1770,9 +1770,9 @@ _081455C0: cmp r0, 0 beq _081455D8 _081455CC: - ldr r0, _081455E0 @ =gUnknown_8466F80 + ldr r0, _081455E0 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _081455E4 @ =0x00000205 - ldr r2, _081455E8 @ =gUnknown_8467000 + ldr r2, _081455E8 @ =gUnknown_8467000 "cmd->flag == FALSE && cmd->parameter == NULL" movs r3, 0x1 bl AGBAssert _081455D8: @@ -1803,9 +1803,9 @@ sub_8145600: @ 8145600 ldr r0, [r4, 0x8] cmp r0, 0x4 bls _08145616 - ldr r0, _08145644 @ =gUnknown_8466F80 + ldr r0, _08145644 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" ldr r1, _08145648 @ =0x00000222 - ldr r2, _0814564C @ =gUnknown_8467044 + ldr r2, _0814564C @ =gUnknown_8467044 "svr->mainseqno < NELEMS(func_tbl)" movs r3, 0x1 bl AGBAssert _08145616: @@ -1820,10 +1820,10 @@ _08145616: ldr r0, [r4, 0x8] cmp r0, 0x4 bls _0814563C - ldr r0, _08145644 @ =gUnknown_8466F80 + ldr r0, _08145644 @ =gUnknown_8466F80 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" movs r1, 0x89 lsls r1, 2 - ldr r2, _0814564C @ =gUnknown_8467044 + ldr r2, _0814564C @ =gUnknown_8467044 "svr->mainseqno < NELEMS(func_tbl)" movs r3, 0x1 bl AGBAssert _0814563C: diff --git a/asm/scrcmd.s b/asm/scrcmd.s index c58a4485c..04fe63501 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -58,8 +58,8 @@ sub_8069EFC: @ 8069EFC _08069F18: .4byte gUnknown_815FD60 _08069F1C: .4byte gUnknown_8160450 _08069F20: - ldr r0, _08069F34 @ =gUnknown_83A725C - ldr r2, _08069F38 @ =gUnknown_83A7290 + ldr r0, _08069F34 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" + ldr r2, _08069F38 @ =gUnknown_83A7290 "0" movs r1, 0xF1 movs r3, 0x1 bl AGBAssert @@ -98,9 +98,9 @@ sub_8069F3C: @ 8069F3C _08069F6C: .4byte gUnknown_815FD60 _08069F70: .4byte gUnknown_8160450 _08069F74: - ldr r0, _08069F88 @ =gUnknown_83A725C + ldr r0, _08069F88 @ =gUnknown_83A725C "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" ldr r1, _08069F8C @ =0x00000107 - ldr r2, _08069F90 @ =gUnknown_83A7290 + ldr r2, _08069F90 @ =gUnknown_83A7290 "0" movs r3, 0x1 bl AGBAssert _08069F80: diff --git a/data/data.s b/data/data.s index b0a6f0183..e36981474 100644 --- a/data/data.s +++ b/data/data.s @@ -799,11 +799,13 @@ gUnknown_8352EF0:: @ 8352EF0 gUnknown_8352F10:: @ 8352F10 .incbin "baserom.gba", 0x352F10, 0x8 + .align 2 gUnknown_8352F18:: @ 8352F18 - .incbin "baserom.gba", 0x352F18, 0x34 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c" + .align 2 gUnknown_8352F4C:: @ 8352F4C - .incbin "baserom.gba", 0x352F4C, 0x2C + .asciz "VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE" gUnknown_8352F78:: @ 8352F78 .incbin "baserom.gba", 0x352F78, 0xF0 @@ -1459,12 +1461,15 @@ gUnknown_83A7202:: @ 83A7202 gUnknown_83A7208:: @ 83A7208 .incbin "baserom.gba", 0x3A7208, 0x4 + .align 2 gUnknown_83A720C:: @ 83A720C - .incbin "baserom.gba", 0x3A720C, 0x34 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/evobjmv.c" + .align 2 gUnknown_83A7240:: @ 83A7240 - .incbin "baserom.gba", 0x3A7240, 0x4 + .asciz "0" + .align 2 gUnknown_83A7244:: @ 83A7244 .incbin "baserom.gba", 0x3A7244, 0x4 @@ -1472,11 +1477,13 @@ gUnknown_83A7248:: @ 83A7248 .incbin "baserom.gba", 0x3A7248, 0x14 gUnknown_83A725C:: @ 83A725C - .incbin "baserom.gba", 0x3A725C, 0x34 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c" + .align 2 gUnknown_83A7290:: @ 83A7290 - .incbin "baserom.gba", 0x3A7290, 0x4 + .asciz "0" + .align 2 gUnknown_83A7294:: @ 83A7294 .incbin "baserom.gba", 0x3A7294, 0xC @@ -3088,11 +3095,13 @@ gUnknown_83F5D32:: @ 83F5D32 gUnknown_83F5D58:: @ 83F5D58 .incbin "baserom.gba", 0x3F5D58, 0x198 + .align 2 gUnknown_83F5EF0:: @ 83F5EF0 - .incbin "baserom.gba", 0x3F5EF0, 0x34 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c" + .align 2 gUnknown_83F5F24:: @ 83F5F24 - .incbin "baserom.gba", 0x3F5F24, 0x2 + .asciz "0" gUnknown_83F5F26:: @ 83F5F26 .incbin "baserom.gba", 0x3F5F26, 0x2A @@ -5956,24 +5965,33 @@ gUnknown_843EC8C:: @ 843EC8C gUnknown_843ED88:: @ 843ED88 .incbin "baserom.gba", 0x43ED88, 0xC + .align 2 gUnknown_843ED94:: @ 843ED94 - .incbin "baserom.gba", 0x43ED94, 0x30 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c" + .align 2 gUnknown_843EDC4:: @ 843EDC4 - .incbin "baserom.gba", 0x43EDC4, 0x14 + .asciz "Rfu.RfuFunc == NULL" + .align 2 gUnknown_843EDD8:: @ 843EDD8 - .incbin "baserom.gba", 0x43EDD8, 0xC + .asciz "size<=252" + .align 2 gUnknown_843EDE4:: @ 843EDE4 - .incbin "baserom.gba", 0x43EDE4, 0x14 + .asciz "PokemonSioInfo" + + .byte 0, 1, 7, 0x14, 0xFF + .align 2 gUnknown_843EDF8:: @ 843EDF8 - .incbin "baserom.gba", 0x43EDF8, 0x18 + .asciz "LINK LOSS DISCONNECT!" + .align 2 gUnknown_843EE10:: @ 843EE10 - .incbin "baserom.gba", 0x43EE10, 0x18 + .asciz "LINK LOSS RECOVERY NOW" + .align 2 gUnknown_843EE28:: @ 843EE28 .incbin "baserom.gba", 0x43EE28, 0x1F @@ -5983,8 +6001,28 @@ gUnknown_843EE47:: @ 843EE47 gUnknown_843EE57:: @ 843EE57 .incbin "baserom.gba", 0x43EE57, 0xD + .align 2 gUnknown_843EE64:: @ 843EE64 - .incbin "baserom.gba", 0x43EE64, 0x1A0 + .asciz "NOWSLOT" + .align 2 + .asciz " " + .align 2 + .asciz "CLOCK DRIFT" + .align 2 + .asciz "BUSY SEND " + .align 2 + .asciz "CMD REJECT " + .align 2 + .asciz "CLOCK SLAVE" + .align 2 + .asciz "CHILD " + .align 2 + .asciz "PARENT" + .align 2 + .asciz "SEARCH" + + .align 2 + .incbin "baserom.gba", 0x43EEC0, 0x43F004-0x43EEC0 gUnknown_843F004:: @ 843F004 .incbin "baserom.gba", 0x43F004, 0x100 @@ -6532,14 +6570,17 @@ gUnknown_845711B:: @ 845711B gUnknown_8457120:: @ 8457120 .incbin "baserom.gba", 0x457120, 0x18 + .align 2 gUnknown_8457138:: @ 8457138 - .incbin "baserom.gba", 0x457138, 0x3C + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c" + .align 2 gUnknown_8457174:: @ 8457174 - .incbin "baserom.gba", 0x457174, 0x4 + .asciz "0" + .align 2 gUnknown_8457178:: @ 8457178 - .incbin "baserom.gba", 0x457178, 0x15 + .asciz "UnionObjWork != NULL" gUnknown_845718D:: @ 845718D .incbin "baserom.gba", 0x45718D, 0x2 @@ -7921,36 +7962,47 @@ gUnknown_8466EF0:: @ 8466EF0 gUnknown_8466F00:: @ 8466F00 .incbin "baserom.gba", 0x466F00, 0x28 + .align 2 gUnknown_8466F28:: @ 8466F28 - .incbin "baserom.gba", 0x466F28, 0x34 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c" + .align 2 gUnknown_8466F5C:: @ 8466F5C - .incbin "baserom.gba", 0x466F5C, 0x4 + .asciz "0" + .align 2 gUnknown_8466F60:: @ 8466F60 .incbin "baserom.gba", 0x466F60, 0x20 + .align 2 gUnknown_8466F80:: @ 8466F80 - .incbin "baserom.gba", 0x466F80, 0x38 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c" + .align 2 gUnknown_8466FB8:: @ 8466FB8 - .incbin "baserom.gba", 0x466FB8, 0x1C + .asciz "size <= ME_SEND_BUF_SIZE" + .align 2 gUnknown_8466FD4:: @ 8466FD4 - .incbin "baserom.gba", 0x466FD4, 0x18 + .asciz "cmd->parameter == NULL" + .align 2 gUnknown_8466FEC:: @ 8466FEC - .incbin "baserom.gba", 0x466FEC, 0x14 + .asciz "cmd->flag == FALSE" + .align 2 gUnknown_8467000:: @ 8467000 - .incbin "baserom.gba", 0x467000, 0x30 + .asciz "cmd->flag == FALSE && cmd->parameter == NULL" + .align 2 gUnknown_8467030:: @ 8467030 .incbin "baserom.gba", 0x467030, 0x14 + .align 2 gUnknown_8467044:: @ 8467044 - .incbin "baserom.gba", 0x467044, 0x24 + .asciz "svr->mainseqno < NELEMS(func_tbl)" + .align 2 gUnknown_8467068:: @ 8467068 .incbin "baserom.gba", 0x467068, 0x8 @@ -7993,12 +8045,15 @@ gUnknown_8468B6C:: @ 8468B6C gUnknown_8468BCC:: @ 8468BCC .incbin "baserom.gba", 0x468BCC, 0x90 + .align 2 gUnknown_8468C5C:: @ 8468C5C - .incbin "baserom.gba", 0x468C5C, 0x38 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c" + .align 2 gUnknown_8468C94:: @ 8468C94 - .incbin "baserom.gba", 0x468C94, 0x4 + .asciz "0" + .align 2 gUnknown_8468C98:: @ 8468C98 .incbin "baserom.gba", 0x468C98, 0x520 @@ -8572,14 +8627,17 @@ gUnknown_8479C88:: @ 8479C88 gUnknown_8479CC0:: @ 8479CC0 .incbin "baserom.gba", 0x479CC0, 0x18 + .align 2 gUnknown_8479CD8:: @ 8479CD8 - .incbin "baserom.gba", 0x479CD8, 0x38 + .asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c" + .align 2 gUnknown_8479D10:: @ 8479D10 - .incbin "baserom.gba", 0x479D10, 0x14 + .asciz "ttdata->dummy == 0" + .align 2 gUnknown_8479D24:: @ 8479D24 - .incbin "baserom.gba", 0x479D24, 0x10 + .asciz "ttdata->id == 0" gUnknown_8479D34:: @ 8479D34 .incbin "baserom.gba", 0x479D34, 0x4 |