diff --git a/asm/fieldmap.s b/asm/fieldmap.s index b2b8ac9f6..b8bb90457 100644 --- a/asm/fieldmap.s +++ b/asm/fieldmap.s @@ -1282,7 +1282,7 @@ sub_0204005C: ; 0x0204005C mov r1, #0x37 add r4, r2, #0 add r6, r3, #0 - bl sub_020401B4 + bl FieldSysGetAttrAddrInternal str r0, [sp] ldr r0, [r7, #0x40] bl sub_0205C654 @@ -1451,8 +1451,8 @@ LoadScriptsAndMessagesForCurrentMap: ; 0x0204018C pop {r3, r4, r5, pc} thumb_func_end LoadScriptsAndMessagesForCurrentMap - thumb_func_start sub_020401B4 -sub_020401B4: ; 0x020401B4 + thumb_func_start FieldSysGetAttrAddrInternal +FieldSysGetAttrAddrInternal: ; 0x020401B4 push {r3, lr} cmp r1, #0x37 bls _020401BC @@ -1654,10 +1654,10 @@ _020402E8: bl GF_AssertFail mov r0, #0 pop {r3, pc} - thumb_func_end sub_020401B4 + thumb_func_end FieldSysGetAttrAddrInternal - thumb_func_start sub_020402F0 -sub_020402F0: ; 0x020402F0 + thumb_func_start FieldSysGetAttrAddr +FieldSysGetAttrAddr: ; 0x020402F0 push {r3, r4, r5, lr} ldr r0, [r0, #0x10] add r5, r1, #0 @@ -1674,11 +1674,11 @@ _02040302: _0204030E: add r0, r4, #0 add r1, r5, #0 - bl sub_020401B4 + bl FieldSysGetAttrAddrInternal pop {r3, r4, r5, pc} .balign 4, 0 _02040318: .word 0x0003643F - thumb_func_end sub_020402F0 + thumb_func_end FieldSysGetAttrAddr thumb_func_start sub_0204031C sub_0204031C: ; 0x0204031C @@ -1759,7 +1759,7 @@ _0204039A: ldr r1, _020403A8 ; =0x00007FD6 add r0, r5, #0 sub r1, r4, r1 - bl sub_020402F0 + bl FieldSysGetAttrAddr pop {r3, r4, r5, pc} nop _020403A8: .word 0x00007FD6 @@ -1779,8 +1779,8 @@ _020403BA: .balign 4, 0 thumb_func_end VarGet - thumb_func_start sub_020403C0 -sub_020403C0: ; 0x020403C0 + thumb_func_start VarSet +VarSet: ; 0x020403C0 push {r4, lr} add r4, r2, #0 bl GetVarPointer @@ -1793,10 +1793,10 @@ _020403D0: mov r0, #1 pop {r4, pc} .balign 4, 0 - thumb_func_end sub_020403C0 + thumb_func_end VarSet - thumb_func_start sub_020403D8 -sub_020403D8: ; 0x020403D8 + thumb_func_start VarGetObjectEventGraphicsId +VarGetObjectEventGraphicsId: ; 0x020403D8 push {r3, r4, r5, lr} add r4, r1, #0 add r5, r0, #0 @@ -1813,10 +1813,10 @@ _020403E6: pop {r3, r4, r5, pc} nop _020403F8: .word 0x00004020 - thumb_func_end sub_020403D8 + thumb_func_end VarGetObjectEventGraphicsId - thumb_func_start sub_020403FC -sub_020403FC: ; 0x020403FC + thumb_func_start FlagGet +FlagGet: ; 0x020403FC push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0 @@ -1825,10 +1825,10 @@ sub_020403FC: ; 0x020403FC bl CheckFlagInArray pop {r4, pc} .balign 4, 0 - thumb_func_end sub_020403FC + thumb_func_end FlagGet - thumb_func_start sub_02040410 -sub_02040410: ; 0x02040410 + thumb_func_start FlagSet +FlagSet: ; 0x02040410 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0 @@ -1837,10 +1837,10 @@ sub_02040410: ; 0x02040410 bl SetFlagInArray pop {r4, pc} .balign 4, 0 - thumb_func_end sub_02040410 + thumb_func_end FlagSet - thumb_func_start sub_02040424 -sub_02040424: ; 0x02040424 + thumb_func_start FlagClear +FlagClear: ; 0x02040424 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0 @@ -1849,10 +1849,10 @@ sub_02040424: ; 0x02040424 bl ClearFlagInArray pop {r4, pc} .balign 4, 0 - thumb_func_end sub_02040424 + thumb_func_end FlagClear - thumb_func_start sub_02040438 -sub_02040438: ; 0x02040438 + thumb_func_start ClearTempFieldEventData +ClearTempFieldEventData: ; 0x02040438 push {r4, lr} ldr r0, [r0, #0xc] bl SavArray_Flags_get @@ -1877,10 +1877,10 @@ sub_02040438: ; 0x02040438 bl memset pop {r4, pc} .balign 4, 0 - thumb_func_end sub_02040438 + thumb_func_end ClearTempFieldEventData - thumb_func_start sub_02040470 -sub_02040470: ; 0x02040470 + thumb_func_start ClearDailyFlags +ClearDailyFlags: ; 0x02040470 push {r3, lr} ldr r0, [r0, #0xc] bl SavArray_Flags_get @@ -1896,7 +1896,7 @@ _02040484: bne _02040484 pop {r3, pc} .balign 4, 0 - thumb_func_end sub_02040470 + thumb_func_end ClearDailyFlags thumb_func_start sub_02040490 sub_02040490: ; 0x02040490 @@ -1906,19 +1906,19 @@ sub_02040490: ; 0x02040490 mov r1, #0x2a add r6, r2, #0 add r7, r3, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr strh r4, [r0] add r0, r5, #0 mov r1, #0x2b - bl sub_020402F0 + bl FieldSysGetAttrAddr strh r6, [r0] add r0, r5, #0 mov r1, #0x2c - bl sub_020402F0 + bl FieldSysGetAttrAddr strh r7, [r0] add r0, r5, #0 mov r1, #0x2d - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, sp, #8 ldrh r1, [r1, #0x10] strh r1, [r0] @@ -2074,15 +2074,15 @@ sub_020405AC: ; 0x020405AC add r5, r1, #0 add r4, r0, #0 mov r1, #0x2a - bl sub_020401B4 + bl FieldSysGetAttrAddrInternal add r7, r0, #0 add r0, r4, #0 mov r1, #0x2b - bl sub_020401B4 + bl FieldSysGetAttrAddrInternal add r6, r0, #0 add r0, r4, #0 mov r1, #0x2c - bl sub_020401B4 + bl FieldSysGetAttrAddrInternal add r4, r0, #0 add r0, r5, #0 bl sub_0204056C @@ -2210,7 +2210,7 @@ _020406B4: bl sub_0204055C add r1, r0, #0 ldr r0, [sp] - bl sub_020403FC + bl FlagGet cmp r0, #0 bne _02040704 ldr r1, [r4, #4] diff --git a/asm/map_events.s b/asm/map_events.s index 7510bdd3f..8d74d6895 100644 --- a/asm/map_events.s +++ b/asm/map_events.s @@ -421,9 +421,9 @@ WildEncounters_ReadFromNarc: ; 0x0203B88C add r2, r0, #0 add r0, r5, #0 #ifdef HEARTGOLD - mov r1, #0x25 NARC_fielddata_encountdata_g_enc_data + mov r1, #0x25 ; NARC_fielddata_encountdata_g_enc_data #else - mov r1, #0x88 NARC_fielddata_encountdata_s_enc_data + mov r1, #0x88 ; NARC_fielddata_encountdata_s_enc_data #endif bl ReadWholeNarcMemberByIdPair _0203B8B4: diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 906b535ba..5213b8c05 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -20163,7 +20163,7 @@ ov01_021EF348: ; 0x021EF348 add r0, #0x80 ldr r0, [r0] mov r1, #3 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrb r0, [r0] bl sub_0205B624 pop {r3, pc} @@ -20322,7 +20322,7 @@ ov01_021EF488: ; 0x021EF488 add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl sub_0205F26C lsl r0, r0, #0x18 @@ -20527,30 +20527,30 @@ ov01_021EF620: ; 0x021EF620 add r4, r1, #0 mov r1, #0x11 add r5, r0, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] mov r1, #0x12 str r0, [r4] add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] mov r1, #0x10 str r0, [r4, #4] add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] mov r1, #1 str r0, [r4, #8] add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [r4, #0xc] add r0, r5, #0 mov r1, #6 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [r4, #0x10] add r0, r5, #0 mov r1, #3 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [r4, #0x14] pop {r3, r4, r5, pc} thumb_func_end ov01_021EF620 @@ -20562,26 +20562,26 @@ ov01_021EF668: ; 0x021EF668 mov r1, #0x11 add r5, r0, #0 add r4, r2, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] mov r1, #0x12 str r0, [r4] add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] mov r1, #1 str r0, [r4, #4] str r6, [r4, #8] add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [r4, #0xc] add r0, r5, #0 mov r1, #6 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [r4, #0x10] add r0, r5, #0 mov r1, #3 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [r4, #0x14] pop {r4, r5, r6, pc} thumb_func_end ov01_021EF668 @@ -26218,7 +26218,7 @@ _021F1F96: lsl r1, r1, #0x10 add r0, r7, #0 lsr r1, r1, #0x10 - bl sub_02040410 + bl FlagSet add r0, r5, #0 bl sub_0205E400 mov r1, #0xa @@ -26228,7 +26228,7 @@ _021F1F96: add r0, r7, #0 add r1, r1, r2 ldrh r1, [r1, #8] - bl sub_02040424 + bl FlagClear mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F1FF4: @@ -57984,7 +57984,7 @@ ov01_02200AF0: ; 0x02200AF0 ldr r6, [r0] mov r1, #0x10 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x2c] ldr r0, [sp, #0x1c] bl ScriptReadHalfword @@ -58027,7 +58027,7 @@ ov01_02200AF0: ; 0x02200AF0 mov r1, #1 add r0, #0x80 ldr r0, [r0] - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 add r0, r6, #0 add r1, r7, #0 @@ -60282,7 +60282,7 @@ ov01_02201D1C: ; 0x02201D1C add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -60306,7 +60306,7 @@ ov01_02201D4C: ; 0x02201D4C add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -60353,7 +60353,7 @@ ov01_02201DA4: ; 0x02201DA4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -61147,7 +61147,7 @@ ov01_02202430: ; 0x02202430 ldrb r4, [r1] ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -61189,7 +61189,7 @@ ov01_02202480: ; 0x02202480 add r6, r0, #0 ldr r0, [r5] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr lsl r2, r6, #0x18 ldr r0, [r0] add r1, r4, #0 @@ -61813,7 +61813,7 @@ ov01_02202980: ; 0x02202980 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -61895,7 +61895,7 @@ ov01_02202A28: ; 0x02202A28 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 add r0, #0x80 @@ -61931,7 +61931,7 @@ ov01_02202A70: ; 0x02202A70 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -62453,7 +62453,7 @@ ov01_02202E68: ; 0x02202E68 str r0, [sp, #0x24] ldr r0, [sp, #0x28] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [sp, #0x14] bl ScriptReadHalfword @@ -62527,7 +62527,7 @@ _02202F10: mov r1, #1 add r0, #0x80 ldr r0, [r0] - bl sub_020402F0 + bl FieldSysGetAttrAddr mov r1, #1 str r1, [sp] str r6, [sp, #4] @@ -62799,7 +62799,7 @@ ov01_02203138: ; 0x02203138 add r7, r0, #0 add r0, r5, #0 mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr lsl r1, r6, #0x18 lsl r2, r7, #0x18 add r4, #0x80 @@ -62819,7 +62819,7 @@ ov01_02203188: ; 0x02203188 add r0, #0x80 ldr r0, [r0] mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021EEB38 mov r0, #0 @@ -62834,7 +62834,7 @@ ov01_022031A0: ; 0x022031A0 add r0, #0x80 ldr r0, [r0] mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r4, #0x80 ldr r0, [r4] @@ -67117,7 +67117,7 @@ ov01_02205164: ; 0x02205164 add r7, r0, #0 add r0, r5, #0 mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr lsl r1, r6, #0x18 lsl r2, r7, #0x18 add r4, #0x80 @@ -67137,7 +67137,7 @@ ov01_022051B4: ; 0x022051B4 add r0, #0x80 ldr r0, [r0] mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021EEE30 mov r0, #0 @@ -67152,7 +67152,7 @@ ov01_022051CC: ; 0x022051CC add r0, #0x80 ldr r0, [r0] mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r4, #0x80 ldr r0, [r4] diff --git a/asm/overlay_02.s b/asm/overlay_02.s index b0eefefbd..358e2fb83 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -20426,7 +20426,7 @@ _0224F5A4: bl sub_0204055C add r1, r0, #0 ldr r0, [sp] - bl sub_020403FC + bl FlagGet cmp r0, #0 bne _0224F5BE add r4, r4, #1 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index c2cb9021a..c0e5f7ede 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -9492,7 +9492,7 @@ ov03_0225894C: ; 0x0225894C add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -9532,7 +9532,7 @@ ov03_02258998: ; 0x02258998 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -9563,7 +9563,7 @@ ov03_022589D4: ; 0x022589D4 ldr r6, [r0] mov r1, #0x10 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r5, #0 bl ScriptReadHalfword add r1, r0, #0 @@ -9596,7 +9596,7 @@ ov03_02258A18: ; 0x02258A18 ldr r5, [r0] mov r1, #0x10 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 bl ScriptReadHalfword add r4, #0x80 diff --git a/asm/overlay_04.s b/asm/overlay_04.s index 572347032..8af97fe57 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -1914,7 +1914,7 @@ ov04_02254D98: ; 0x02254D98 ldr r1, [r6, #4] ldr r5, [r1, #0x24] mov r1, #0x1e - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] bl ov04_02254F20 @@ -1953,7 +1953,7 @@ ov04_02254DE0: ; 0x02254DE0 add r5, r0, #0 ldr r2, [r5, #4] ldr r4, [r2, #0x24] - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 ldr r0, [r6] bl ov04_02254F20 diff --git a/asm/overlay_20.s b/asm/overlay_20.s index 7b18749b7..ea6e93a56 100644 --- a/asm/overlay_20.s +++ b/asm/overlay_20.s @@ -179,7 +179,7 @@ ov20_02259A1C: ; 0x02259A1C mov r1, #0x10 add r7, r2, #0 add r4, r3, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, sp, #0x10 add r5, r0, #0 ldrh r1, [r1, #0x10] diff --git a/asm/overlay_22.s b/asm/overlay_22.s index b9a2eed4a..14950c0b8 100644 --- a/asm/overlay_22.s +++ b/asm/overlay_22.s @@ -30,7 +30,7 @@ ov22_022598C0: ; 0x022598C0 add r0, #0x80 ldr r0, [r0] mov r1, #0x27 - bl sub_020402F0 + bl FieldSysGetAttrAddr lsl r2, r6, #0x18 lsl r3, r7, #0x18 add r5, #0x80 @@ -53,7 +53,7 @@ ov22_0225991C: ; 0x0225991C add r0, #0x80 ldr r0, [r0] mov r1, #0x27 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021EEC68 mov r0, #0 @@ -73,7 +73,7 @@ ov22_02259934: ; 0x02259934 ldrb r4, [r1] ldr r0, [r0] mov r1, #0x27 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r5, #0x80 ldr r0, [r5] diff --git a/asm/overlay_25.s b/asm/overlay_25.s index d64f45995..52e7f3697 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -52,7 +52,7 @@ _0225990E: add r7, r0, #0 add r0, r5, #0 mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp] ldr r0, [r5, #0x10] add r1, r6, #0 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index cd9ce35e9..9a9ae1dc0 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -409,11 +409,11 @@ sub_02040B30: ; 0x02040B30 ldr r5, [r0] mov r1, #7 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 mov r1, #0xe - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r7, #0 bl ScriptReadHalfword @@ -437,16 +437,16 @@ sub_02040B68: ; 0x02040B68 ldr r7, [r0] mov r1, #5 add r0, r7, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 add r0, r7, #0 mov r1, #7 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldrb r1, [r4] add r0, r7, #0 add r1, #0xd - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp] add r0, r6, #0 bl ScriptReadHalfword @@ -484,11 +484,11 @@ sub_02040BCC: ; 0x02040BCC ldr r6, [r0] mov r1, #5 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r6, #0 mov r1, #7 - bl sub_020402F0 + bl FieldSysGetAttrAddr mov r0, #1 ldrb r1, [r5, #3] add r2, r0, #0 @@ -511,11 +511,11 @@ sub_02040BFC: ; 0x02040BFC ldr r6, [r0] mov r1, #5 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r6, #0 mov r1, #7 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrb r0, [r5, #3] ldrb r2, [r4] mov r1, #1 @@ -550,7 +550,7 @@ sub_02040C44: ; 0x02040C44 add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -605,7 +605,7 @@ sub_02040CAC: ; 0x02040CAC add r0, #0x80 ldr r0, [r0] mov r1, #9 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -716,7 +716,7 @@ sub_02040D6C: ; 0x02040D6C bl ScriptReadHalfword add r1, r0, #0 add r0, r4, #0 - bl sub_02040410 + bl FlagSet mov r0, #0 pop {r4, pc} thumb_func_end sub_02040D6C @@ -730,7 +730,7 @@ sub_02040D84: ; 0x02040D84 bl ScriptReadHalfword add r1, r0, #0 add r0, r4, #0 - bl sub_02040424 + bl FlagClear mov r0, #0 pop {r4, pc} thumb_func_end sub_02040D84 @@ -745,7 +745,7 @@ sub_02040D9C: ; 0x02040D9C bl ScriptReadHalfword add r1, r0, #0 add r0, r5, #0 - bl sub_020403FC + bl FlagGet strb r0, [r4, #2] mov r0, #0 pop {r3, r4, r5, pc} @@ -774,7 +774,7 @@ sub_02040DB8: ; 0x02040DB8 add r4, r0, #0 ldrh r1, [r6] add r0, r5, #0 - bl sub_020403FC + bl FlagGet strh r0, [r4] mov r0, #0 pop {r4, r5, r6, pc} @@ -795,7 +795,7 @@ sub_02040DF4: ; 0x02040DF4 add r1, r0, #0 ldrh r1, [r1] add r0, r4, #0 - bl sub_02040410 + bl FlagSet mov r0, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -816,7 +816,7 @@ sub_02040E1C: ; 0x02040E1C add r1, r0, #0 ldrh r1, [r1] add r0, r4, #0 - bl sub_02040424 + bl FlagClear mov r0, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -1222,18 +1222,18 @@ sub_02041110: ; 0x02041110 ldr r4, [r0] mov r1, #6 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #1 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 ldr r0, [r4, #8] mov r2, #3 bl sub_0205B514 add r0, r4, #0 mov r1, #1 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, #0x80 add r7, r0, #0 ldr r0, [r5] @@ -1263,11 +1263,11 @@ sub_02041168: ; 0x02041168 ldr r5, [r0] mov r1, #1 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 mov r1, #6 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #0 @@ -1293,11 +1293,11 @@ sub_020411A4: ; 0x020411A4 ldr r5, [r0] mov r1, #1 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r5, #0 mov r1, #6 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r6, #0 bl RemoveWindow @@ -1322,27 +1322,27 @@ sub_020411D8: ; 0x020411D8 ldr r4, [r0] mov r1, #0x32 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #0x2e - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r4, #0 mov r1, #0x33 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp] add r0, r4, #0 mov r1, #0x34 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #4] add r0, r4, #0 mov r1, #0x2f - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #8] add r0, r4, #0 mov r1, #0x35 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r2, [r5, #8] add r1, r2, #1 str r1, [r5, #8] @@ -1394,27 +1394,27 @@ sub_02041270: ; 0x02041270 ldr r4, [r0] mov r1, #0x32 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r4, #0 mov r1, #0x33 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #8] add r0, r4, #0 mov r1, #0x34 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #4] add r0, r4, #0 mov r1, #0x35 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp] add r0, r4, #0 mov r1, #0x2e - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #0x2f - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 ldrh r0, [r6] cmp r0, #0 @@ -1488,15 +1488,15 @@ sub_02041328: ; 0x02041328 ldr r4, [r0] mov r1, #0x12 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #0x11 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r4, #0 mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x18] ldr r0, [r5, #8] add r1, r0, #1 @@ -1651,19 +1651,19 @@ sub_0204146C: ; 0x0204146C ldr r4, [r0] mov r1, #3 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x14] add r0, r4, #0 mov r1, #0x12 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #0x11 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r4, #0 mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] str r0, [sp, #0x18] add r0, r1, #1 @@ -1727,7 +1727,7 @@ sub_02041520: ; 0x02041520 ldr r4, [r0] mov r1, #3 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #0x64] add r7, r0, #0 lsl r1, r1, #0x10 @@ -1919,7 +1919,7 @@ sub_02041684: ; 0x02041684 ldr r4, [r0] mov r1, #2 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -1962,7 +1962,7 @@ sub_020416E4: ; 0x020416E4 ldr r6, [r0] mov r1, #2 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #0x64] add r4, r0, #0 lsl r1, r1, #0x10 @@ -1999,12 +1999,12 @@ sub_02041728: ; 0x02041728 add r0, #0x80 ldr r0, [r0] mov r1, #1 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, #0x80 add r4, r0, #0 ldr r0, [r5] mov r1, #0x13 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 ldr r1, _02041754 ; =0x000003E2 add r0, r4, #0 @@ -2022,7 +2022,7 @@ sub_02041758: ; 0x02041758 add r0, #0x80 ldr r0, [r0] mov r1, #0x13 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl sub_0200F450 mov r0, #0 @@ -2041,7 +2041,7 @@ sub_02041770: ; 0x02041770 mov r1, #0x10 add r7, r2, #0 str r0, [sp, #0x20] - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x24] ldr r0, [r5, #8] add r1, r0, #1 @@ -2070,7 +2070,7 @@ sub_02041770: ; 0x02041770 add r0, #0x80 ldr r0, [r0] mov r1, #1 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [sp, #0x2c] str r4, [sp] str r1, [sp, #4] @@ -2098,7 +2098,7 @@ sub_020417EC: ; 0x020417EC add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r0, r4, #0 mov r2, #0 @@ -2114,7 +2114,7 @@ sub_02041808: ; 0x02041808 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 ldr r2, [r4, #0x78] add r0, r4, #0 @@ -2130,7 +2130,7 @@ sub_02041824: ; 0x02041824 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #8] add r3, r1, #1 str r3, [r4, #8] @@ -2152,7 +2152,7 @@ sub_0204184C: ; 0x0204184C add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -2184,7 +2184,7 @@ sub_02041890: ; 0x02041890 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021EDC84 ldr r1, _020418B0 ; =sub_020418B4 @@ -2226,7 +2226,7 @@ sub_020418DC: ; 0x020418DC add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021EDC84 ldr r1, _020418FC ; =sub_02041900 @@ -2252,7 +2252,7 @@ sub_02041900: ; 0x02041900 add r4, r0, #0 add r0, r5, #0 mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 ldrh r1, [r4] ldr r0, _0204194C ; =0x0000EEEE @@ -2286,7 +2286,7 @@ sub_02041950: ; 0x02041950 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r0, r4, #0 mov r2, #0 @@ -2302,7 +2302,7 @@ sub_0204196C: ; 0x0204196C add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 ldr r2, [r4, #0x78] add r0, r4, #0 @@ -2318,7 +2318,7 @@ sub_02041988: ; 0x02041988 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -2362,7 +2362,7 @@ sub_020419E8: ; 0x020419E8 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021EDFA4 ldr r1, _02041A08 ; =sub_020418B4 @@ -2381,7 +2381,7 @@ sub_02041A0C: ; 0x02041A0C add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -2409,7 +2409,7 @@ sub_02041A48: ; 0x02041A48 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -2446,7 +2446,7 @@ sub_02041A98: ; 0x02041A98 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r2, [r4, #8] add r1, r2, #1 str r1, [r4, #8] @@ -2469,7 +2469,7 @@ sub_02041AC4: ; 0x02041AC4 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r2, [r4, #8] add r1, r2, #1 str r1, [r4, #8] @@ -2487,7 +2487,7 @@ sub_02041AE4: ; 0x02041AE4 add r0, #0x80 ldr r0, [r0] mov r1, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r2, [r4, #8] add r1, r2, #1 str r1, [r4, #8] @@ -2539,7 +2539,7 @@ _02041B46: add r0, #0x80 ldr r0, [r0] mov r1, #4 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrb r1, [r0] add r5, #0x80 mov r2, #0 @@ -2659,7 +2659,7 @@ _02041C36: add r0, #0x80 ldr r0, [r0] mov r1, #4 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrb r1, [r0] add r5, #0x80 add r2, r4, #0 @@ -2686,7 +2686,7 @@ _02041C80: cmp r1, #0xf1 bne _02041C8E mov r1, #0xb - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] pop {r3, pc} _02041C8E: @@ -2713,7 +2713,7 @@ sub_02041CA8: ; 0x02041CA8 add r0, #0x80 ldr r0, [r0] mov r1, #4 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrb r0, [r0] cmp r0, #0 bne _02041CBE @@ -2758,7 +2758,7 @@ sub_02041CF8: ; 0x02041CF8 add r5, r1, #0 ldr r0, [r5, #0xc] mov r1, #4 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r5, #4] bl sub_02062260 @@ -2796,7 +2796,7 @@ sub_02041D40: ; 0x02041D40 ldr r5, [r0] mov r1, #0xa add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] cmp r0, #0 bne _02041D8A @@ -2837,7 +2837,7 @@ sub_02041D98: ; 0x02041D98 ldr r4, [r0] mov r1, #0xa add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 ldr r0, [r4, #0x40] bl sub_0205C6DC @@ -2956,7 +2956,7 @@ sub_02041E84: ; 0x02041E84 ldr r4, [r0] mov r1, #0xa add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 ldr r0, [r4, #0x40] bl sub_0205C6DC @@ -3185,7 +3185,7 @@ sub_02042034: ; 0x02042034 add r0, #0x80 ldr r0, [r0] mov r1, #0xb - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -3236,7 +3236,7 @@ sub_020420CC: ; 0x020420CC add r0, #0x80 ldr r0, [r0] mov r1, #0xb - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl sub_0205E3CC add r0, r5, #0 @@ -3285,7 +3285,7 @@ sub_02042110: ; 0x02042110 add r0, #0x80 ldr r0, [r0] mov r1, #0xb - bl sub_020402F0 + bl FieldSysGetAttrAddr mov r1, #2 add r5, #0x80 add r4, r0, #0 @@ -3320,7 +3320,7 @@ sub_02042184: ; 0x02042184 add r0, #0x80 ldr r0, [r0] mov r1, #0xb - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl sub_0205E3CC mov r0, #0 @@ -3340,7 +3340,7 @@ sub_0204219C: ; 0x0204219C add r6, r0, #0 add r0, r5, #0 mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -3790,7 +3790,7 @@ sub_02042574: ; 0x02042574 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r5, #0 add r1, #0x80 add r4, r0, #0 @@ -3814,7 +3814,7 @@ sub_020425A4: ; 0x020425A4 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r5, #0 add r1, #0x80 add r4, r0, #0 @@ -3838,7 +3838,7 @@ sub_020425D4: ; 0x020425D4 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, #0x80 add r4, r0, #0 ldr r0, [r5] @@ -3865,7 +3865,7 @@ sub_020425F8: ; 0x020425F8 add r5, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -3911,7 +3911,7 @@ sub_02042644: ; 0x02042644 add r6, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r7, [r4] cmp r7, #0 @@ -3982,7 +3982,7 @@ sub_020426C4: ; 0x020426C4 add r7, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 ldr r4, [r6] cmp r4, #0 @@ -4061,7 +4061,7 @@ sub_02042768: ; 0x02042768 add r7, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 ldr r4, [r6] cmp r4, #0 @@ -4128,7 +4128,7 @@ sub_0204280C: ; 0x0204280C add r5, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -4159,7 +4159,7 @@ sub_02042860: ; 0x02042860 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r4, r0, #0 add r0, r1, #1 @@ -4288,7 +4288,7 @@ sub_02042974: ; 0x02042974 ldr r5, [r0] mov r1, #0x14 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl sub_020505A0 @@ -4312,7 +4312,7 @@ sub_020429A0: ; 0x020429A0 ldr r5, [r0] mov r1, #0x14 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl sub_020505A0 @@ -4338,7 +4338,7 @@ sub_020429D4: ; 0x020429D4 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] bl sub_020970C0 @@ -4487,7 +4487,7 @@ sub_02042ACC: ; 0x02042ACC add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -4529,7 +4529,7 @@ sub_02042B1C: ; 0x02042B1C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -4597,7 +4597,7 @@ sub_02042BAC: ; 0x02042BAC add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -4655,7 +4655,7 @@ sub_02042C2C: ; 0x02042C2C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] mov r1, #1 strb r1, [r0] @@ -4670,7 +4670,7 @@ sub_02042C44: ; 0x02042C44 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] mov r1, #2 strb r1, [r0] @@ -4701,7 +4701,7 @@ sub_02042C78: ; 0x02042C78 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 ldr r1, [r5, #0x64] @@ -4728,7 +4728,7 @@ sub_02042CA8: ; 0x02042CA8 add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r6, _02042CDC ; =SDK_OVERLAY_OVY_26_ID add r4, r0, #0 add r0, r6, #0 @@ -4814,7 +4814,7 @@ sub_02042D58: ; 0x02042D58 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -4947,7 +4947,7 @@ sub_02042E5C: ; 0x02042E5C add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -4987,7 +4987,7 @@ sub_02042E8C: ; 0x02042E8C add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 mov r0, #0xb mov r1, #8 @@ -5026,7 +5026,7 @@ sub_02042F04: ; 0x02042F04 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 mov r0, #0xb mov r1, #0xc @@ -5108,7 +5108,7 @@ sub_02042F98: ; 0x02042F98 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -5145,7 +5145,7 @@ sub_02042FDC: ; 0x02042FDC add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -5288,7 +5288,7 @@ _020430EA: add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 ldr r0, [r6] cmp r0, #0 @@ -5324,7 +5324,7 @@ sub_02043124: ; 0x02043124 add r5, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -5362,7 +5362,7 @@ _0204317A: add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 ldr r0, [r6] cmp r0, #0 @@ -5508,7 +5508,7 @@ sub_020432A0: ; 0x020432A0 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -5647,7 +5647,7 @@ sub_020433BC: ; 0x020433BC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -6078,7 +6078,7 @@ sub_02043724: ; 0x02043724 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -6124,7 +6124,7 @@ sub_0204378C: ; 0x0204378C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] bl ov02_0224953C @@ -6395,14 +6395,14 @@ sub_02043990: ; 0x02043990 ldr r4, [r0] mov r1, #8 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 mov r1, #0x11 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #3 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -6426,12 +6426,12 @@ sub_02043990: ; 0x02043990 bl GetTrainerMessageByIdPair add r0, r4, #0 mov r1, #1 - bl sub_020402F0 + bl FieldSysGetAttrAddr mov r1, #0xf bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #1 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -6624,7 +6624,7 @@ sub_02043B70: ; 0x02043B70 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r5, #0x80 ldr r4, [r6] @@ -6736,7 +6736,7 @@ sub_02043C54: ; 0x02043C54 ldr r0, [r0] mov r1, #0x10 str r0, [sp, #8] - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 ldr r0, [r5, #8] add r1, r0, #1 @@ -6949,7 +6949,7 @@ sub_02043E08: ; 0x02043E08 add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -6989,7 +6989,7 @@ sub_02043E5C: ; 0x02043E5C add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -7033,7 +7033,7 @@ sub_02043EB8: ; 0x02043EB8 add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -7273,7 +7273,7 @@ sub_0204407C: ; 0x0204407C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -7305,7 +7305,7 @@ sub_020440AC: ; 0x020440AC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r5, #0x80 ldr r0, [r5] @@ -7361,13 +7361,13 @@ sub_02044124: ; 0x02044124 add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -7455,7 +7455,7 @@ sub_020441D8: ; 0x020441D8 add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -7472,7 +7472,7 @@ sub_020441D8: ; 0x020441D8 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 ldr r0, [r4] bl sub_0205F24C @@ -7513,7 +7513,7 @@ sub_02044230: ; 0x02044230 add r5, #0x80 ldr r0, [r5] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl FreeToHeap _0204426C: @@ -7529,7 +7529,7 @@ sub_02044270: ; 0x02044270 ldr r5, [r0] mov r1, #0xa add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 bl ScriptReadHalfword @@ -7558,7 +7558,7 @@ sub_020442AC: ; 0x020442AC ldr r5, [r0] mov r1, #0xa add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 bl ScriptReadHalfword @@ -7820,7 +7820,7 @@ sub_02044490: ; 0x02044490 add r5, r0, #0 ldr r0, [r4] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl PlayerProfile_GetTrainerID @@ -8379,7 +8379,7 @@ sub_02044928: ; 0x02044928 add r0, #0x80 ldr r0, [r0] mov r1, #0xc - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 add r0, r4, #0 bl ScriptReadHalfword @@ -8899,7 +8899,7 @@ sub_02044CCC: ; 0x02044CCC add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -9278,7 +9278,7 @@ sub_02044FE4: ; 0x02044FE4 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -9614,7 +9614,7 @@ sub_0204527C: ; 0x0204527C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r4, r0, #0 add r0, r1, #1 @@ -9640,7 +9640,7 @@ sub_020452B0: ; 0x020452B0 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -9664,7 +9664,7 @@ sub_020452E0: ; 0x020452E0 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -9688,7 +9688,7 @@ sub_02045310: ; 0x02045310 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -9712,7 +9712,7 @@ sub_02045340: ; 0x02045340 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -9737,7 +9737,7 @@ sub_02045374: ; 0x02045374 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov23_02259944 ldr r0, _02045390 ; =SDK_OVERLAY_OVY_23_ID @@ -10361,7 +10361,7 @@ sub_02045868: ; 0x02045868 add r0, #0x80 ldr r0, [r0] mov r1, #0x17 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 mov r0, #0 add r5, #0x80 @@ -10380,7 +10380,7 @@ sub_0204588C: ; 0x0204588C add r0, #0x80 ldr r0, [r0] mov r1, #0x17 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021F2FF0 mov r0, #1 @@ -10922,7 +10922,7 @@ sub_02045CC4: ; 0x02045CC4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -11030,7 +11030,7 @@ sub_02045D7C: ; 0x02045D7C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, #0x80 add r6, r0, #0 ldr r0, [r5] @@ -11278,7 +11278,7 @@ sub_02045F80: ; 0x02045F80 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r5, #0 add r1, #0x80 add r4, r0, #0 @@ -11318,7 +11318,7 @@ sub_02045FC4: ; 0x02045FC4 add r5, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -11671,7 +11671,7 @@ sub_020462A8: ; 0x020462A8 add r5, r0, #0 add r0, r4, #0 mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl sub_0205A6AC strh r0, [r5] @@ -11811,7 +11811,7 @@ sub_020463C4: ; 0x020463C4 ldr r5, [r0] mov r1, #0x29 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r5, #0xc] bl sub_02027500 @@ -11836,7 +11836,7 @@ sub_020463F4: ; 0x020463F4 ldr r5, [r0] mov r1, #0x29 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r5, #0xc] bl sub_02027500 @@ -11874,7 +11874,7 @@ sub_02046438: ; 0x02046438 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -11957,7 +11957,7 @@ sub_020464E0: ; 0x020464E0 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -12010,7 +12010,7 @@ sub_02046554: ; 0x02046554 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -12033,7 +12033,7 @@ sub_02046584: ; 0x02046584 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] bl FreeToHeap @@ -12073,7 +12073,7 @@ sub_020465A0: ; 0x020465A0 add r7, r0, #0 ldr r0, [r5] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r0] lsl r0, r4, #1 add r1, r1, r0 @@ -13446,7 +13446,7 @@ sub_02047060: ; 0x02047060 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r5, #0 add r0, #0x80 ldr r0, [r0] @@ -13488,7 +13488,7 @@ sub_020470F4: ; 0x020470F4 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -13544,7 +13544,7 @@ sub_02047168: ; 0x02047168 add r0, #0x80 ldr r0, [r0] mov r1, #8 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -13810,7 +13810,7 @@ _02047366: add r5, r0, #0 add r0, r4, #0 mov r1, #0x73 - bl sub_020403FC + bl FlagGet cmp r0, #0 beq _0204738E mov r7, #0 @@ -13818,7 +13818,7 @@ _02047366: _0204738E: add r0, r4, #0 mov r1, #0x99 - bl sub_020403FC + bl FlagGet cmp r0, #0 beq _0204739E mov r7, #1 @@ -13906,7 +13906,7 @@ sub_02047424: ; 0x02047424 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r4, r0, #0 add r0, r1, #1 @@ -13969,7 +13969,7 @@ sub_0204749C: ; 0x0204749C add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r4, r0, #0 add r0, r1, #1 @@ -14620,7 +14620,7 @@ sub_02047964: ; 0x02047964 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -14672,7 +14672,7 @@ sub_020479D4: ; 0x020479D4 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp] add r0, r5, #0 ldr r1, [r5, #0x64] @@ -15126,7 +15126,7 @@ sub_02047CFC: ; 0x02047CFC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r5, #0x80 ldr r0, [r5] @@ -15152,7 +15152,7 @@ sub_02047D24: ; 0x02047D24 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r5, #0x80 ldrh r2, [r4] @@ -15189,7 +15189,7 @@ sub_02047D7C: ; 0x02047D7C add r0, #0x80 ldr r0, [r0] mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -15214,7 +15214,7 @@ sub_02047DB0: ; 0x02047DB0 add r0, #0x80 ldr r0, [r0] mov r1, #0x28 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl ov01_021EEF88 mov r0, #0 @@ -15245,7 +15245,7 @@ sub_02047DC8: ; 0x02047DC8 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 add r5, #0x80 ldrh r2, [r4] @@ -15390,7 +15390,7 @@ sub_02047EC4: ; 0x02047EC4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 mov r0, #4 bl PlayerProfile_new diff --git a/asm/scrcmd_10.s b/asm/scrcmd_10.s index 7bef5058c..7e790a179 100644 --- a/asm/scrcmd_10.s +++ b/asm/scrcmd_10.s @@ -13,7 +13,7 @@ sub_0204BC98: ; 0x0204BC98 add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 @@ -39,7 +39,7 @@ sub_0204BCCC: ; 0x0204BCCC add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 diff --git a/asm/scrcmd_11.s b/asm/scrcmd_11.s index 82d4a36b6..f17814119 100644 --- a/asm/scrcmd_11.s +++ b/asm/scrcmd_11.s @@ -199,7 +199,7 @@ _0204BEB6: add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 bl ScriptReadHalfword @@ -246,7 +246,7 @@ _0204BF22: add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 bl ScriptReadHalfword diff --git a/asm/scrcmd_14.s b/asm/scrcmd_14.s index 0fb24f176..6e027fe56 100644 --- a/asm/scrcmd_14.s +++ b/asm/scrcmd_14.s @@ -10,7 +10,7 @@ sub_0204CB5C: ; 0x0204CB5C ldr r0, [r0] mov r1, #0x10 ldr r5, [r0, #0xc] - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl Sav2_DayCare_get @@ -91,7 +91,7 @@ sub_0204CBF8: ; 0x0204CBF8 ldr r5, [r0] mov r1, #0x10 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r4, #0 ldr r6, [r5, #0xc] @@ -135,7 +135,7 @@ sub_0204CC58: ; 0x0204CC58 ldr r5, [r0] mov r1, #0x10 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, r0, #0 add r0, r4, #0 ldr r5, [r5, #0xc] @@ -174,7 +174,7 @@ sub_0204CCAC: ; 0x0204CCAC ldr r0, [r0] mov r1, #0x10 ldr r4, [r0, #0xc] - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -211,7 +211,7 @@ sub_0204CCFC: ; 0x0204CCFC ldr r5, [r0] mov r1, #0x10 add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 bl ScriptReadHalfword @@ -270,7 +270,7 @@ sub_0204CD74: ; 0x0204CD74 ldr r0, [r0] mov r1, #0x10 ldr r5, [r0, #0xc] - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 bl ScriptReadHalfword diff --git a/asm/scrcmd_19.s b/asm/scrcmd_19.s index a1be4db08..8d0752493 100644 --- a/asm/scrcmd_19.s +++ b/asm/scrcmd_19.s @@ -18,7 +18,7 @@ sub_0204EBE8: ; 0x0204EBE8 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r5, #0 add r1, #0x80 lsl r2, r4, #0x18 @@ -52,7 +52,7 @@ sub_0204EC30: ; 0x0204EC30 add r5, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 ldr r0, [r4] cmp r0, #0 @@ -124,7 +124,7 @@ sub_0204ECD0: ; 0x0204ECD0 mov r1, #0x14 str r2, [sp] add r6, r3, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #4] mov r0, #0x20 bl sub_0209174C @@ -251,7 +251,7 @@ sub_0204EDDC: ; 0x0204EDDC add r5, r0, #0 ldr r0, [r4] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r4, [r0] cmp r4, #0 bne _0204EE06 diff --git a/asm/scrcmd_20.s b/asm/scrcmd_20.s index 4641e7002..59199ee6f 100644 --- a/asm/scrcmd_20.s +++ b/asm/scrcmd_20.s @@ -182,7 +182,7 @@ sub_0204EF40: ; 0x0204EF40 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 cmp r7, #4 bhi _0204F05E diff --git a/asm/scrcmd_4.s b/asm/scrcmd_4.s index 69d9c029d..5e4b09577 100644 --- a/asm/scrcmd_4.s +++ b/asm/scrcmd_4.s @@ -10,7 +10,7 @@ sub_020483D8: ; 0x020483D8 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -41,7 +41,7 @@ sub_02048414: ; 0x02048414 ldr r6, [r0] mov r1, #0x10 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r4, r0, #0 add r0, r1, #1 @@ -67,7 +67,7 @@ sub_02048448: ; 0x02048448 ldr r4, [r0] mov r1, #0x10 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r2, [r5, #8] add r1, r2, #1 str r1, [r5, #8] @@ -87,7 +87,7 @@ sub_0204846C: ; 0x0204846C ldr r4, [r0] mov r1, #0x10 add r0, r4, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r2, [r5, #8] add r1, r2, #1 str r1, [r5, #8] @@ -107,7 +107,7 @@ sub_02048490: ; 0x02048490 ldr r6, [r0] mov r1, #0x10 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -140,7 +140,7 @@ sub_020484D8: ; 0x020484D8 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -168,7 +168,7 @@ sub_02048510: ; 0x02048510 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -196,7 +196,7 @@ sub_02048548: ; 0x02048548 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -224,7 +224,7 @@ sub_02048580: ; 0x02048580 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -253,7 +253,7 @@ sub_020485BC: ; 0x020485BC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -282,7 +282,7 @@ sub_020485F4: ; 0x020485F4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -317,7 +317,7 @@ sub_0204863C: ; 0x0204863C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -365,7 +365,7 @@ sub_0204869C: ; 0x0204869C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -408,7 +408,7 @@ sub_020486F0: ; 0x020486F0 ldr r6, [r0] mov r1, #0x10 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -445,7 +445,7 @@ sub_02048738: ; 0x02048738 str r0, [sp] add r0, r4, #0 mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -483,7 +483,7 @@ sub_02048794: ; 0x02048794 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -516,7 +516,7 @@ sub_020487CC: ; 0x020487CC add r4, r0, #0 add r0, r5, #0 mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r7, #8] add r6, r0, #0 add r0, r1, #1 @@ -547,7 +547,7 @@ sub_02048818: ; 0x02048818 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -615,7 +615,7 @@ sub_020488A4: ; 0x020488A4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #8] add r6, r0, #0 add r0, r1, #1 @@ -653,7 +653,7 @@ sub_020488F4: ; 0x020488F4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #8] add r6, r0, #0 add r0, r1, #1 @@ -691,7 +691,7 @@ sub_02048944: ; 0x02048944 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #8] add r6, r0, #0 add r0, r1, #1 @@ -728,7 +728,7 @@ sub_02048994: ; 0x02048994 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -756,7 +756,7 @@ sub_020489CC: ; 0x020489CC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] @@ -777,7 +777,7 @@ sub_020489F4: ; 0x020489F4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] @@ -804,7 +804,7 @@ sub_02048A1C: ; 0x02048A1C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -844,7 +844,7 @@ sub_02048A7C: ; 0x02048A7C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #8] add r7, r0, #0 add r0, r1, #1 @@ -901,7 +901,7 @@ sub_02048AF4: ; 0x02048AF4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -929,7 +929,7 @@ sub_02048B2C: ; 0x02048B2C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -958,7 +958,7 @@ sub_02048B64: ; 0x02048B64 ldr r6, [r0] mov r1, #0x10 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #8] add r7, r0, #0 add r0, r1, #1 @@ -1004,7 +1004,7 @@ sub_02048BCC: ; 0x02048BCC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1037,7 +1037,7 @@ sub_02048C10: ; 0x02048C10 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1065,7 +1065,7 @@ sub_02048C48: ; 0x02048C48 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1093,7 +1093,7 @@ sub_02048C80: ; 0x02048C80 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1123,7 +1123,7 @@ sub_02048CBC: ; 0x02048CBC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1151,7 +1151,7 @@ sub_02048CF4: ; 0x02048CF4 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1180,7 +1180,7 @@ sub_02048D2C: ; 0x02048D2C ldr r6, [r0] mov r1, #0x10 add r0, r6, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r7, r0, #0 add r0, r1, #1 @@ -1213,7 +1213,7 @@ sub_02048D74: ; 0x02048D74 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1248,7 +1248,7 @@ sub_02048DBC: ; 0x02048DBC add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1274,7 +1274,7 @@ sub_02048DF0: ; 0x02048DF0 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1302,7 +1302,7 @@ sub_02048E28: ; 0x02048E28 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1330,7 +1330,7 @@ sub_02048E60: ; 0x02048E60 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r5, #8] add r6, r0, #0 add r0, r1, #1 @@ -1358,7 +1358,7 @@ sub_02048E98: ; 0x02048E98 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r2, [r4, #8] add r1, r2, #1 str r1, [r4, #8] diff --git a/asm/scrcmd_5.s b/asm/scrcmd_5.s index 48d88f34a..263324ceb 100644 --- a/asm/scrcmd_5.s +++ b/asm/scrcmd_5.s @@ -15,7 +15,7 @@ sub_02048EB8: ; 0x02048EB8 add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #8] add r3, r1, #1 str r3, [r4, #8] diff --git a/asm/scrcmd_7.s b/asm/scrcmd_7.s index 49cf518a7..ca27c3bb1 100644 --- a/asm/scrcmd_7.s +++ b/asm/scrcmd_7.s @@ -20,56 +20,56 @@ sub_02049460: ; 0x02049460 bne _020494C0 add r0, r4, #0 mov r1, #0x19 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x18] add r0, r4, #0 mov r1, #0x1a - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x10] add r0, r4, #0 mov r1, #0x1b - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 mov r1, #0x1c - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 mov r1, #0x1d - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x14] add r0, r4, #0 mov r1, #0x1e - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #0x1f - bl sub_020402F0 + bl FieldSysGetAttrAddr b _02049500 _020494C0: add r0, r4, #0 mov r1, #0x20 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x18] add r0, r4, #0 mov r1, #0x21 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x10] add r0, r4, #0 mov r1, #0x22 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 mov r1, #0x23 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 mov r1, #0x24 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x14] add r0, r4, #0 mov r1, #0x25 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 mov r1, #0x26 - bl sub_020402F0 + bl FieldSysGetAttrAddr _02049500: add r7, r0, #0 ldr r0, [sp, #0x18] @@ -120,13 +120,13 @@ sub_0204952C: ; 0x0204952C add r5, #0x80 ldr r0, [r5] mov r1, #0x1f - bl sub_020402F0 + bl FieldSysGetAttrAddr b _02049574 _0204956A: add r5, #0x80 ldr r0, [r5] mov r1, #0x26 - bl sub_020402F0 + bl FieldSysGetAttrAddr _02049574: add r5, r0, #0 ldr r0, [r5] @@ -157,7 +157,7 @@ sub_0204959C: ; 0x0204959C add r0, #0x80 ldr r0, [r0] mov r1, #0x1d - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 add r0, r4, #0 bl ScriptReadHalfword @@ -178,13 +178,13 @@ sub_020495C4: ; 0x020495C4 add r0, #0x80 ldr r0, [r0] mov r1, #0x1c - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 add r0, #0x80 ldr r0, [r0] mov r1, #0x23 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -220,7 +220,7 @@ sub_02049618: ; 0x02049618 add r0, #0x80 ldr r0, [r0] mov r1, #8 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -246,10 +246,10 @@ sub_02049648: ; 0x02049648 ldr r7, [r0] mov r1, #8 add r0, r7, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r7, #0 mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x1c] add r0, r5, #0 bl ScriptReadHalfword @@ -313,7 +313,7 @@ sub_020496DC: ; 0x020496DC add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -366,7 +366,7 @@ sub_02049750: ; 0x02049750 add r0, #0x80 ldr r0, [r0] mov r1, #8 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -431,7 +431,7 @@ sub_020497D8: ; 0x020497D8 add r0, #0x80 ldr r0, [r0] mov r1, #8 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -496,7 +496,7 @@ sub_02049860: ; 0x02049860 add r0, #0x80 ldr r0, [r0] mov r1, #8 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -555,7 +555,7 @@ sub_020498D4: ; 0x020498D4 add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -599,7 +599,7 @@ _02049936: add r5, #0x80 ldr r0, [r5] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl sub_02052564 _02049946: @@ -617,7 +617,7 @@ sub_02049950: ; 0x02049950 add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -664,7 +664,7 @@ sub_020499AC: ; 0x020499AC add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr mov r2, #0 str r2, [sp] str r2, [sp, #4] @@ -687,7 +687,7 @@ sub_020499D8: ; 0x020499D8 add r0, #0x80 ldr r0, [r0] mov r1, #0xa - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r0, [r0] bl sub_0205F24C add r1, r0, #0 @@ -709,7 +709,7 @@ sub_02049A00: ; 0x02049A00 ldr r5, [r0] mov r1, #0xa add r0, r5, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r7, #0 bl ScriptReadWord diff --git a/asm/scrcmd_8.s b/asm/scrcmd_8.s index b0d5e1693..092160df8 100644 --- a/asm/scrcmd_8.s +++ b/asm/scrcmd_8.s @@ -10,7 +10,7 @@ sub_02049A44: ; 0x02049A44 add r0, #0x80 ldr r0, [r0] mov r1, #0x18 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r5, r0, #0 add r0, r4, #0 bl ScriptReadHalfword @@ -32,7 +32,7 @@ sub_02049A6C: ; 0x02049A6C add r0, #0x80 ldr r0, [r0] mov r1, #0x10 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r6, r0, #0 add r0, r4, #0 add r0, #0x80 diff --git a/asm/scrcmd_9.s b/asm/scrcmd_9.s index 20cbd66b4..17a033c9d 100644 --- a/asm/scrcmd_9.s +++ b/asm/scrcmd_9.s @@ -309,7 +309,7 @@ _02049E7E: _02049E90: add r0, r1, #0 mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r2, r0, #0 ldr r1, [r7, #0x74] add r0, r5, #0 @@ -320,7 +320,7 @@ _02049E90: _02049EA8: add r0, r1, #0 mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r7, #0x80 ldr r2, [r7] add r1, r0, #0 diff --git a/asm/unk_0203DB6C.s b/asm/unk_0203DB6C.s index aa7ef01d5..68059c210 100644 --- a/asm/unk_0203DB6C.s +++ b/asm/unk_0203DB6C.s @@ -261,7 +261,7 @@ _0203DD1E: bl sub_0204055C add r1, r0, #0 add r0, r4, #0 - bl sub_020403FC + bl FlagGet cmp r0, #1 beq _0203DD34 mov r0, #1 diff --git a/asm/unk_0204F500.s b/asm/unk_0204F500.s index 0d8eeaf1b..d048111d7 100644 --- a/asm/unk_0204F500.s +++ b/asm/unk_0204F500.s @@ -69,7 +69,7 @@ sub_0204F500: ; 0x0204F500 ldr r7, [r0] mov r1, #0x10 add r0, r7, #0 - bl sub_020402F0 + bl FieldSysGetAttrAddr str r0, [sp, #0x24] ldr r0, [sp, #8] ldr r1, [r0, #8] @@ -587,7 +587,7 @@ sub_0204F8DC: ; 0x0204F8DC add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 cmp r7, #4 bhi _0204F9CC @@ -1301,7 +1301,7 @@ sub_0204FE78: ; 0x0204FE78 add r0, #0x80 ldr r0, [r0] mov r1, #0x14 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r1, r0, #0 cmp r7, #4 bhi _0204FF68 diff --git a/asm/unk_02050660.s b/asm/unk_02050660.s index d6683f445..30fe92760 100644 --- a/asm/unk_02050660.s +++ b/asm/unk_02050660.s @@ -104,7 +104,7 @@ _02050704: ldr r1, _02050720 ; =0x00004013 lsl r2, r2, #0x10 lsr r2, r2, #0x10 - bl sub_020403C0 + bl VarSet ldr r0, [r4, #0x10] ldr r0, [r0, #0x14] bl sub_02052554 diff --git a/asm/unk_02052F30.s b/asm/unk_02052F30.s index 4e5b6215e..7ce0579dc 100644 --- a/asm/unk_02052F30.s +++ b/asm/unk_02052F30.s @@ -176,7 +176,7 @@ sub_02053038: ; 0x02053038 cmp r0, #0 bne _02053062 add r0, r4, #0 - bl sub_02040438 + bl ClearTempFieldEventData _02053062: cmp r6, #0 bne _0205306E diff --git a/asm/unk_02055418.s b/asm/unk_02055418.s index 9cc2716a1..1edae0c99 100644 --- a/asm/unk_02055418.s +++ b/asm/unk_02055418.s @@ -136,7 +136,7 @@ sub_02055508: ; 0x02055508 bl sub_02055670 add r6, r0, #0 add r0, r5, #0 - bl sub_02040470 + bl ClearDailyFlags ldr r0, [r5, #0xc] add r1, r4, #0 bl sub_0206759C diff --git a/asm/unk_0205C268.s b/asm/unk_0205C268.s index d14951535..826c8353f 100644 --- a/asm/unk_0205C268.s +++ b/asm/unk_0205C268.s @@ -4611,7 +4611,7 @@ sub_0205E34C: ; 0x0205E34C bl sub_0205F1E4 lsl r1, r4, #0x10 lsr r1, r1, #0x10 - bl sub_020403FC + bl FlagGet cmp r0, #0 bne _0205E388 ldr r1, [sp] @@ -4691,7 +4691,7 @@ sub_0205E400: ; 0x0205E400 bl sub_0205F52C lsl r1, r5, #0x10 lsr r1, r1, #0x10 - bl sub_02040410 + bl FlagSet add r0, r4, #0 bl sub_0205E3CC pop {r3, r4, r5, pc} @@ -5413,7 +5413,7 @@ _0205EA1A: beq _0205EA30 ldrh r1, [r4, #8] add r0, r7, #0 - bl sub_020403FC + bl FlagGet cmp r0, #0 bne _0205EA42 _0205EA30: @@ -6078,7 +6078,7 @@ sub_0205EF70: ; 0x0205EF70 sub r1, #0x65 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl sub_020403D8 + bl VarGetObjectEventGraphicsId add r1, r0, #0 _0205EF86: add r0, r1, #0 @@ -19442,22 +19442,22 @@ _02064AF6: bl sub_0203FED4 add r0, r5, #0 mov r1, #0x2a - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrh r1, [r4, #4] strh r1, [r0] add r0, r5, #0 mov r1, #0x2b - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrh r1, [r4, #6] strh r1, [r0] add r0, r5, #0 mov r1, #0x2c - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrh r1, [r4, #8] strh r1, [r0] add r0, r5, #0 mov r1, #0x2d - bl sub_020402F0 + bl FieldSysGetAttrAddr ldrh r1, [r4, #0xa] strh r1, [r0] ldr r0, [r6] diff --git a/asm/unk_0206979C.s b/asm/unk_0206979C.s index 54e02799a..f303677d3 100644 --- a/asm/unk_0206979C.s +++ b/asm/unk_0206979C.s @@ -4652,7 +4652,7 @@ sub_0206BB2C: ; 0x0206BB2C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -4676,7 +4676,7 @@ sub_0206BB5C: ; 0x0206BB5C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 bl ScriptReadHalfword add r1, r0, #0 @@ -4701,7 +4701,7 @@ sub_0206BB90: ; 0x0206BB90 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr ldr r1, [r4, #0x64] ldr r0, [r0] lsl r1, r1, #0x18 @@ -4718,7 +4718,7 @@ sub_0206BBAC: ; 0x0206BBAC add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -4775,7 +4775,7 @@ sub_0206BC2C: ; 0x0206BC2C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r4, r0, #0 add r0, r5, #0 bl ScriptReadHalfword @@ -4802,7 +4802,7 @@ sub_0206BC64: ; 0x0206BC64 add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr add r0, r4, #0 bl ScriptReadHalfword add r4, #0x80 @@ -4822,7 +4822,7 @@ sub_0206BC8C: ; 0x0206BC8C add r0, #0x80 ldr r0, [r0] mov r1, #0x15 - bl sub_020402F0 + bl FieldSysGetAttrAddr mov r0, #1 bl sub_02002C60 mov r0, #0 diff --git a/global.inc b/global.inc index e3de6b3f1..de79a60bc 100644 --- a/global.inc +++ b/global.inc @@ -27226,15 +27226,15 @@ .public sub_0203FEA4 .public sub_0203FED4 .public sub_0203FF0C -.public sub_020402F0 +.public FieldSysGetAttrAddr .public sub_0204031C -.public sub_020403C0 -.public sub_020403D8 -.public sub_020403FC -.public sub_02040410 -.public sub_02040424 -.public sub_02040438 -.public sub_02040470 +.public VarSet +.public VarGetObjectEventGraphicsId +.public FlagGet +.public FlagSet +.public FlagClear +.public ClearTempFieldEventData +.public ClearDailyFlags .public sub_02040490 .public sub_020404C8 .public sub_020404EC