diff options
author | YamaArashi <shadow962@live.com> | 2016-09-05 13:09:52 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-09-05 17:33:50 -0700 |
commit | 80b3dc30e6784c40791997dc6284c5069caeb27c (patch) | |
tree | bed2781d3a5f3a8cb7ca97f61578fdc96af2f370 | |
parent | 110fc301e1fcc8ed132323bf10c9464e826af37e (diff) |
rename text window functions
-rw-r--r-- | asm/rom3.s | 14 | ||||
-rw-r--r-- | asm/rom4.s | 8 | ||||
-rw-r--r-- | asm/rom5.s | 234 | ||||
-rw-r--r-- | asm/rom_8040EB4.s | 28 | ||||
-rw-r--r-- | data/data2.s | 38 | ||||
-rw-r--r-- | include/text_window.h | 19 | ||||
-rw-r--r-- | src/menu.c | 33 | ||||
-rw-r--r-- | src/text_window.c | 93 |
8 files changed, 241 insertions, 226 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 9fe90ef87..1a7ddc229 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -4128,16 +4128,16 @@ _0800D748: .4byte 0x0000bf40 sub_800D74C: @ 800D74C push {r4,lr} movs r0, 0x12 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum ldr r4, _0800D79C adds r0, r4, 0 movs r1, 0x1 - bl sub_8064F38 + bl LoadTextWindowGraphics_OverridePalSlot movs r0, 0x22 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum adds r0, r4, 0 movs r1, 0x1 - bl sub_8064F38 + bl LoadTextWindowGraphics_OverridePalSlot ldr r3, _0800D7A0 adds r0, r3, 0 adds r0, 0xB8 @@ -43018,8 +43018,8 @@ _0802157A: bx r0 thumb_func_end sub_80214B4 - thumb_func_start sub_8021580 -sub_8021580: @ 8021580 + thumb_func_start atk47 +atk47: @ 8021580 push {r4,lr} movs r3, 0 ldr r0, _080215A0 @@ -43083,7 +43083,7 @@ _080215EC: .4byte 0x0001601e _080215F0: .4byte 0x000160a4 _080215F4: .4byte 0x000160a5 _080215F8: .4byte 0x02024c10 - thumb_func_end sub_8021580 + thumb_func_end atk47 thumb_func_start atk48_playstatchangeanimation atk48_playstatchangeanimation: @ 80215FC diff --git a/asm/rom4.s b/asm/rom4.s index 2174dc622..ab570d7e6 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -40006,7 +40006,7 @@ sub_8064A74: @ 8064A74 strb r0, [r1] ldr r0, _08064A94 ldrh r0, [r0] - bl sub_80651C8 + bl SetMessageBoxBaseTileNum ldr r0, _08064A98 ldr r1, _08064A9C bl InitWindowFromConfig @@ -40046,13 +40046,13 @@ _08064AC8: b _08064B28 _08064ACE: ldr r0, _08064AD8 - bl sub_8065348 + bl LoadMessageBoxTiles b _08064AE2 .align 2, 0 _08064AD8: .4byte 0x0202e87c _08064ADC: ldr r0, _08064AEC - bl draw_win + bl DrawStandardMessageBox _08064AE2: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -40306,7 +40306,7 @@ unref_sub_8064CA0: @ 8064CA0 push {lr} bl task_del_textbox ldr r0, _08064CB8 - bl draw_win + bl DrawStandardMessageBox ldr r1, _08064CBC movs r0, 0 strb r0, [r1] diff --git a/asm/rom5.s b/asm/rom5.s index 573d4e7ca..555a3a829 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -107091,7 +107091,7 @@ _080AF53E: adds r0, r1 strh r2, [r0] ldrh r0, [r4, 0x6] - bl sub_80B19FC + bl contest_get_move_excitement ldrb r1, [r7, 0x1] lsls r1, 2 adds r1, r5, r1 @@ -111089,7 +111089,7 @@ _080B1348: strh r0, [r4] _080B1362: ldrh r0, [r4, 0x6] - bl sub_80B19FC + bl contest_get_move_excitement mov r2, r8 adds r2, 0xC8 strb r0, [r2] @@ -111926,8 +111926,8 @@ _080B19F4: .4byte gUnknown_083CC2EC _080B19F8: .4byte 0x03004210 thumb_func_end unref_sub_80B19D0 - thumb_func_start sub_80B19FC -sub_80B19FC: @ 80B19FC + thumb_func_start contest_get_move_excitement +contest_get_move_excitement: @ 80B19FC lsls r0, 16 ldr r3, _080B1A20 ldr r1, _080B1A24 @@ -111949,7 +111949,7 @@ sub_80B19FC: @ 80B19FC _080B1A20: .4byte gContestExcitementTable _080B1A24: .4byte gContestMoves _080B1A28: .4byte 0x0203869c - thumb_func_end sub_80B19FC + thumb_func_end contest_get_move_excitement thumb_func_start sub_80B1A2C sub_80B1A2C: @ 80B1A2C @@ -255030,7 +255030,7 @@ sub_80F728C: @ 80F728C ldr r0, _080F72C4 ldrb r0, [r0, 0x14] lsrs r0, 3 - bl sub_8064FD4 + bl GetTextWindowFrameGraphics ldr r3, _080F72C8 ldr r2, [r3] ldr r1, [r0] @@ -311079,15 +311079,15 @@ _08111F88: ldr r4, _08111FC8 ldr r0, [r4] adds r0, 0x4 - bl sub_8064F08 + bl LoadTextWindowGraphics movs r0, 0x2 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum ldr r1, [r4] adds r1, 0x34 strb r0, [r1] ldr r0, [r4] adds r0, 0x4 - bl sub_8064F08 + bl LoadTextWindowGraphics bl sub_8071EF4 bl ResetPaletteFade ldr r1, _08111FCC @@ -313728,7 +313728,7 @@ _0811369C: movs r1, 0x18 movs r2, 0x8 movs r3, 0x1D - bl AddTextPrinterParametrized + bl DrawTextWindow ldr r4, _0811370C strb r6, [r4, 0x1] ldr r2, [r5] @@ -356982,8 +356982,8 @@ _08128ADE: bx r0 thumb_func_end sub_8128AA8 - thumb_func_start sub_8128AF0 -sub_8128AF0: @ 8128AF0 + thumb_func_start contest_ai_get_turn +contest_ai_get_turn: @ 8128AF0 ldr r1, _08128B04 adds r0, r1, 0 subs r0, 0xE0 @@ -356997,12 +356997,12 @@ sub_8128AF0: @ 8128AF0 .align 2, 0 _08128B04: .4byte 0x020192e4 _08128B08: .4byte 0x02039238 - thumb_func_end sub_8128AF0 + thumb_func_end contest_ai_get_turn thumb_func_start sub_8128B0C sub_8128B0C: @ 8128B0C push {lr} - bl sub_8128AF0 + bl contest_ai_get_turn ldr r0, _08128B3C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357037,7 +357037,7 @@ _08128B48: thumb_func_start sub_8128B4C sub_8128B4C: @ 8128B4C push {lr} - bl sub_8128AF0 + bl contest_ai_get_turn ldr r0, _08128B7C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357072,7 +357072,7 @@ _08128B88: thumb_func_start sub_8128B8C sub_8128B8C: @ 8128B8C push {lr} - bl sub_8128AF0 + bl contest_ai_get_turn ldr r0, _08128BBC movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357107,7 +357107,7 @@ _08128BC8: thumb_func_start sub_8128BCC sub_8128BCC: @ 8128BCC push {lr} - bl sub_8128AF0 + bl contest_ai_get_turn ldr r0, _08128BFC movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357139,8 +357139,8 @@ _08128C08: bx r0 thumb_func_end sub_8128BCC - thumb_func_start sub_8128C0C -sub_8128C0C: @ 8128C0C + thumb_func_start contest_ai_get_excitement +contest_ai_get_excitement: @ 8128C0C ldr r1, _08128C24 adds r0, r1, 0 subs r0, 0xE0 @@ -357156,12 +357156,12 @@ sub_8128C0C: @ 8128C0C .align 2, 0 _08128C24: .4byte 0x020192e4 _08128C28: .4byte 0x02039238 - thumb_func_end sub_8128C0C + thumb_func_end contest_ai_get_excitement thumb_func_start sub_8128C2C sub_8128C2C: @ 8128C2C push {lr} - bl sub_8128C0C + bl contest_ai_get_excitement ldr r0, _08128C5C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357196,7 +357196,7 @@ _08128C68: thumb_func_start sub_8128C6C sub_8128C6C: @ 8128C6C push {lr} - bl sub_8128C0C + bl contest_ai_get_excitement ldr r0, _08128C9C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357231,7 +357231,7 @@ _08128CA8: thumb_func_start sub_8128CAC sub_8128CAC: @ 8128CAC push {lr} - bl sub_8128C0C + bl contest_ai_get_excitement ldr r0, _08128CDC movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357266,7 +357266,7 @@ _08128CE8: thumb_func_start sub_8128CEC sub_8128CEC: @ 8128CEC push {lr} - bl sub_8128C0C + bl contest_ai_get_excitement ldr r0, _08128D1C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357298,8 +357298,8 @@ _08128D28: bx r0 thumb_func_end sub_8128CEC - thumb_func_start sub_8128D2C -sub_8128D2C: @ 8128D2C + thumb_func_start contest_ai_get_user_order +contest_ai_get_user_order: @ 8128D2C ldr r1, _08128D48 adds r2, r1, 0 adds r2, 0x41 @@ -357317,12 +357317,12 @@ sub_8128D2C: @ 8128D2C .align 2, 0 _08128D48: .4byte 0x020192e4 _08128D4C: .4byte 0x02039238 - thumb_func_end sub_8128D2C + thumb_func_end contest_ai_get_user_order thumb_func_start sub_8128D50 sub_8128D50: @ 8128D50 push {lr} - bl sub_8128D2C + bl contest_ai_get_user_order ldr r0, _08128D80 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357357,7 +357357,7 @@ _08128D8C: thumb_func_start sub_8128D90 sub_8128D90: @ 8128D90 push {lr} - bl sub_8128D2C + bl contest_ai_get_user_order ldr r0, _08128DC0 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357392,7 +357392,7 @@ _08128DCC: thumb_func_start sub_8128DD0 sub_8128DD0: @ 8128DD0 push {lr} - bl sub_8128D2C + bl contest_ai_get_user_order ldr r0, _08128E00 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357427,7 +357427,7 @@ _08128E0C: thumb_func_start sub_8128E10 sub_8128E10: @ 8128E10 push {lr} - bl sub_8128D2C + bl contest_ai_get_user_order ldr r0, _08128E40 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357459,8 +357459,8 @@ _08128E4C: bx r0 thumb_func_end sub_8128E10 - thumb_func_start sub_8128E50 -sub_8128E50: @ 8128E50 + thumb_func_start contest_ai_get_user_condition_maybe +contest_ai_get_user_condition_maybe: @ 8128E50 push {r4,lr} ldr r4, _08128E88 adds r0, r4, 0 @@ -357490,12 +357490,12 @@ sub_8128E50: @ 8128E50 .align 2, 0 _08128E88: .4byte 0x020192e4 _08128E8C: .4byte 0x02039238 - thumb_func_end sub_8128E50 + thumb_func_end contest_ai_get_user_condition_maybe thumb_func_start sub_8128E90 sub_8128E90: @ 8128E90 push {lr} - bl sub_8128E50 + bl contest_ai_get_user_condition_maybe ldr r0, _08128EC0 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357530,7 +357530,7 @@ _08128ECC: thumb_func_start sub_8128ED0 sub_8128ED0: @ 8128ED0 push {lr} - bl sub_8128E50 + bl contest_ai_get_user_condition_maybe ldr r0, _08128F00 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357565,7 +357565,7 @@ _08128F0C: thumb_func_start sub_8128F10 sub_8128F10: @ 8128F10 push {lr} - bl sub_8128E50 + bl contest_ai_get_user_condition_maybe ldr r0, _08128F40 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -357600,7 +357600,7 @@ _08128F4C: thumb_func_start sub_8128F50 sub_8128F50: @ 8128F50 push {lr} - bl sub_8128E50 + bl contest_ai_get_user_condition_maybe ldr r0, _08128F80 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -358006,8 +358006,8 @@ _0812923C: bx r0 thumb_func_end sub_81291F8 - thumb_func_start sub_8129244 -sub_8129244: @ 8129244 + thumb_func_start contest_ai_get_contest_type +contest_ai_get_contest_type: @ 8129244 ldr r1, _08129258 ldr r0, _0812925C ldrh r0, [r0] @@ -358021,12 +358021,12 @@ sub_8129244: @ 8129244 _08129258: .4byte 0x020192e4 _0812925C: .4byte 0x0203869c _08129260: .4byte 0x02039238 - thumb_func_end sub_8129244 + thumb_func_end contest_ai_get_contest_type thumb_func_start sub_8129264 sub_8129264: @ 8129264 push {lr} - bl sub_8129244 + bl contest_ai_get_contest_type ldr r0, _08129294 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -358061,7 +358061,7 @@ _081292A0: thumb_func_start sub_81292A4 sub_81292A4: @ 81292A4 push {lr} - bl sub_8129244 + bl contest_ai_get_contest_type ldr r0, _081292D4 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -358093,8 +358093,8 @@ _081292E0: bx r0 thumb_func_end sub_81292A4 - thumb_func_start sub_81292E4 -sub_81292E4: @ 81292E4 + thumb_func_start contest_ai_get_move_excitement +contest_ai_get_move_excitement: @ 81292E4 push {r4,lr} ldr r2, _08129318 ldr r4, _0812931C @@ -358108,7 +358108,7 @@ sub_81292E4: @ 81292E4 adds r2, 0x1E adds r1, r2 ldrh r0, [r1] - bl sub_80B19FC + bl contest_get_move_excitement lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x18] @@ -358123,12 +358123,12 @@ sub_81292E4: @ 81292E4 _08129318: .4byte 0x02038570 _0812931C: .4byte 0x020192e4 _08129320: .4byte 0x02039238 - thumb_func_end sub_81292E4 + thumb_func_end contest_ai_get_move_excitement thumb_func_start sub_8129324 sub_8129324: @ 8129324 push {r4,lr} - bl sub_81292E4 + bl contest_ai_get_move_excitement ldr r0, _08129354 ldr r3, _08129358 ldr r2, [r3] @@ -358165,7 +358165,7 @@ _08129360: thumb_func_start sub_8129368 sub_8129368: @ 8129368 push {r4,lr} - bl sub_81292E4 + bl contest_ai_get_move_excitement ldr r0, _08129398 ldr r3, _0812939C ldr r2, [r3] @@ -358202,7 +358202,7 @@ _081293A4: thumb_func_start sub_81293AC sub_81293AC: @ 81293AC push {r4,lr} - bl sub_81292E4 + bl contest_ai_get_move_excitement ldr r0, _081293DC ldr r3, _081293E0 ldr r2, [r3] @@ -358239,7 +358239,7 @@ _081293E8: thumb_func_start sub_81293F0 sub_81293F0: @ 81293F0 push {r4,lr} - bl sub_81292E4 + bl contest_ai_get_move_excitement ldr r0, _08129420 ldr r3, _08129424 ldr r2, [r3] @@ -358273,8 +358273,8 @@ _0812942C: bx r0 thumb_func_end sub_81293F0 - thumb_func_start sub_8129434 -sub_8129434: @ 8129434 + thumb_func_start contest_ai_get_move_effect +contest_ai_get_move_effect: @ 8129434 ldr r2, _08129460 ldr r3, _08129464 ldrb r1, [r3, 0x4] @@ -358302,12 +358302,12 @@ _08129460: .4byte 0x02038570 _08129464: .4byte 0x020192e4 _08129468: .4byte gContestMoves _0812946C: .4byte 0x02039238 - thumb_func_end sub_8129434 + thumb_func_end contest_ai_get_move_effect thumb_func_start sub_8129470 sub_8129470: @ 8129470 push {lr} - bl sub_8129434 + bl contest_ai_get_move_effect ldr r0, _081294A0 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -358342,7 +358342,7 @@ _081294AC: thumb_func_start sub_81294B0 sub_81294B0: @ 81294B0 push {lr} - bl sub_8129434 + bl contest_ai_get_move_effect ldr r0, _081294E0 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -358374,8 +358374,8 @@ _081294EC: bx r0 thumb_func_end sub_81294B0 - thumb_func_start sub_81294F0 -sub_81294F0: @ 81294F0 + thumb_func_start contest_ai_get_move_effect_type +contest_ai_get_move_effect_type: @ 81294F0 ldr r2, _08129524 ldr r3, _08129528 ldrb r1, [r3, 0x4] @@ -358408,12 +358408,12 @@ _08129528: .4byte 0x020192e4 _0812952C: .4byte gContestEffects _08129530: .4byte gContestMoves _08129534: .4byte 0x02039238 - thumb_func_end sub_81294F0 + thumb_func_end contest_ai_get_move_effect_type thumb_func_start sub_8129538 sub_8129538: @ 8129538 push {lr} - bl sub_81294F0 + bl contest_ai_get_move_effect_type ldr r0, _08129568 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -358448,7 +358448,7 @@ _08129574: thumb_func_start sub_8129578 sub_8129578: @ 8129578 push {lr} - bl sub_81294F0 + bl contest_ai_get_move_effect_type ldr r0, _081295A8 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -358480,8 +358480,8 @@ _081295B4: bx r0 thumb_func_end sub_8129578 - thumb_func_start sub_81295B8 -sub_81295B8: @ 81295B8 + thumb_func_start contest_ai_check_move_has_highest_appeal +contest_ai_check_move_has_highest_appeal: @ 81295B8 push {r4-r7,lr} ldr r2, _08129610 ldr r3, _08129614 @@ -358546,12 +358546,12 @@ _08129626: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_81295B8 + thumb_func_end contest_ai_check_move_has_highest_appeal thumb_func_start sub_8129638 sub_8129638: @ 8129638 push {lr} - bl sub_81295B8 + bl contest_ai_check_move_has_highest_appeal ldr r0, _08129664 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359058,8 +359058,8 @@ _081299EC: bx r0 thumb_func_end sub_81299B0 - thumb_func_start sub_81299F0 -sub_81299F0: @ 81299F0 + thumb_func_start contest_ai_get_move_used_count +contest_ai_get_move_used_count: @ 81299F0 push {r4,lr} ldr r3, _08129A20 ldr r4, _08129A24 @@ -359103,12 +359103,12 @@ _08129A30: bx r0 .align 2, 0 _08129A40: .4byte 0x02039238 - thumb_func_end sub_81299F0 + thumb_func_end contest_ai_get_move_used_count thumb_func_start sub_8129A44 sub_8129A44: @ 8129A44 push {lr} - bl sub_81299F0 + bl contest_ai_get_move_used_count ldr r0, _08129A74 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359143,7 +359143,7 @@ _08129A80: thumb_func_start sub_8129A84 sub_8129A84: @ 8129A84 push {lr} - bl sub_81299F0 + bl contest_ai_get_move_used_count ldr r0, _08129AB4 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359178,7 +359178,7 @@ _08129AC0: thumb_func_start sub_8129AC4 sub_8129AC4: @ 8129AC4 push {lr} - bl sub_81299F0 + bl contest_ai_get_move_used_count ldr r0, _08129AF4 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359213,7 +359213,7 @@ _08129B00: thumb_func_start sub_8129B04 sub_8129B04: @ 8129B04 push {lr} - bl sub_81299F0 + bl contest_ai_get_move_used_count ldr r0, _08129B34 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359245,8 +359245,8 @@ _08129B40: bx r0 thumb_func_end sub_8129B04 - thumb_func_start sub_8129B44 -sub_8129B44: @ 8129B44 + thumb_func_start contest_ai_check_combo_starter +contest_ai_check_combo_starter: @ 8129B44 push {r4-r7,lr} mov r7, r8 push {r7} @@ -359306,12 +359306,12 @@ _08129B96: _08129BAC: .4byte 0x02038570 _08129BB0: .4byte 0x020192e4 _08129BB4: .4byte 0x02039238 - thumb_func_end sub_8129B44 + thumb_func_end contest_ai_check_combo_starter thumb_func_start sub_8129BB8 sub_8129BB8: @ 8129BB8 push {lr} - bl sub_8129B44 + bl contest_ai_check_combo_starter ldr r0, _08129BE4 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359349,7 +359349,7 @@ _08129BF8: .4byte 0x02039238 thumb_func_start sub_8129BFC sub_8129BFC: @ 8129BFC push {lr} - bl sub_8129B44 + bl contest_ai_check_combo_starter ldr r0, _08129C28 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359384,8 +359384,8 @@ _08129C38: _08129C3C: .4byte 0x02039238 thumb_func_end sub_8129BFC - thumb_func_start sub_8129C40 -sub_8129C40: @ 8129C40 + thumb_func_start contest_ai_check_combo_finisher +contest_ai_check_combo_finisher: @ 8129C40 push {r4-r7,lr} mov r7, r8 push {r7} @@ -359444,12 +359444,12 @@ _08129C90: _08129CA8: .4byte 0x02038570 _08129CAC: .4byte 0x020192e4 _08129CB0: .4byte 0x02039238 - thumb_func_end sub_8129C40 + thumb_func_end contest_ai_check_combo_finisher thumb_func_start sub_8129CB4 sub_8129CB4: @ 8129CB4 push {lr} - bl sub_8129C40 + bl contest_ai_check_combo_finisher ldr r0, _08129CE0 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359487,7 +359487,7 @@ _08129CF4: .4byte 0x02039238 thumb_func_start sub_8129CF8 sub_8129CF8: @ 8129CF8 push {lr} - bl sub_8129C40 + bl contest_ai_check_combo_finisher ldr r0, _08129D24 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359522,8 +359522,8 @@ _08129D34: _08129D38: .4byte 0x02039238 thumb_func_end sub_8129CF8 - thumb_func_start sub_8129D3C -sub_8129D3C: @ 8129D3C + thumb_func_start contest_ai_check_would_finish_combo +contest_ai_check_would_finish_combo: @ 8129D3C push {r4,r5,lr} movs r5, 0 ldr r3, _08129D8C @@ -359568,12 +359568,12 @@ _08129D7A: _08129D8C: .4byte 0x02038570 _08129D90: .4byte 0x020192e4 _08129D94: .4byte 0x02039238 - thumb_func_end sub_8129D3C + thumb_func_end contest_ai_check_would_finish_combo thumb_func_start sub_8129D98 sub_8129D98: @ 8129D98 push {lr} - bl sub_8129D3C + bl contest_ai_check_would_finish_combo ldr r0, _08129DC4 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359611,7 +359611,7 @@ _08129DD8: .4byte 0x02039238 thumb_func_start sub_8129DDC sub_8129DDC: @ 8129DDC push {lr} - bl sub_8129D3C + bl contest_ai_check_would_finish_combo ldr r0, _08129E08 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359646,8 +359646,8 @@ _08129E18: _08129E1C: .4byte 0x02039238 thumb_func_end sub_8129DDC - thumb_func_start sub_8129E20 -sub_8129E20: @ 8129E20 + thumb_func_start contest_ai_get_condition +contest_ai_get_condition: @ 8129E20 push {r4,r5,lr} ldr r4, _08129E5C ldr r0, [r4] @@ -359678,12 +359678,12 @@ sub_8129E20: @ 8129E20 .align 2, 0 _08129E5C: .4byte 0x02039238 _08129E60: .4byte 0x020192e4 - thumb_func_end sub_8129E20 + thumb_func_end contest_ai_get_condition thumb_func_start sub_8129E64 sub_8129E64: @ 8129E64 push {lr} - bl sub_8129E20 + bl contest_ai_get_condition ldr r0, _08129E94 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359718,7 +359718,7 @@ _08129EA0: thumb_func_start sub_8129EA4 sub_8129EA4: @ 8129EA4 push {lr} - bl sub_8129E20 + bl contest_ai_get_condition ldr r0, _08129ED4 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359753,7 +359753,7 @@ _08129EE0: thumb_func_start sub_8129EE4 sub_8129EE4: @ 8129EE4 push {lr} - bl sub_8129E20 + bl contest_ai_get_condition ldr r0, _08129F14 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359788,7 +359788,7 @@ _08129F20: thumb_func_start sub_8129F24 sub_8129F24: @ 8129F24 push {lr} - bl sub_8129E20 + bl contest_ai_get_condition ldr r0, _08129F54 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359820,8 +359820,8 @@ _08129F60: bx r0 thumb_func_end sub_8129F24 - thumb_func_start sub_8129F64 -sub_8129F64: @ 8129F64 + thumb_func_start contest_ai_get_used_combo_starter +contest_ai_get_used_combo_starter: @ 8129F64 push {r4-r6,lr} movs r6, 0 ldr r5, _08129FAC @@ -359862,12 +359862,12 @@ _08129FAC: .4byte 0x02039238 _08129FB0: .4byte gContestMoves _08129FB4: .4byte 0x02019260 _08129FB8: .4byte 0x020192e4 - thumb_func_end sub_8129F64 + thumb_func_end contest_ai_get_used_combo_starter thumb_func_start sub_8129FBC sub_8129FBC: @ 8129FBC push {lr} - bl sub_8129F64 + bl contest_ai_get_used_combo_starter ldr r0, _08129FEC movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359902,7 +359902,7 @@ _08129FF8: thumb_func_start sub_8129FFC sub_8129FFC: @ 8129FFC push {lr} - bl sub_8129F64 + bl contest_ai_get_used_combo_starter ldr r0, _0812A02C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359937,7 +359937,7 @@ _0812A038: thumb_func_start sub_812A03C sub_812A03C: @ 812A03C push {lr} - bl sub_8129F64 + bl contest_ai_get_used_combo_starter ldr r0, _0812A06C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -359972,7 +359972,7 @@ _0812A078: thumb_func_start sub_812A07C sub_812A07C: @ 812A07C push {lr} - bl sub_8129F64 + bl contest_ai_get_used_combo_starter ldr r0, _0812A0AC movs r1, 0x18 ldrsh r0, [r0, r1] @@ -360004,8 +360004,8 @@ _0812A0B8: bx r0 thumb_func_end sub_812A07C - thumb_func_start sub_812A0BC -sub_812A0BC: @ 812A0BC + thumb_func_start contest_ai_check_can_participate +contest_ai_check_can_participate: @ 812A0BC push {lr} ldr r0, _0812A0DC ldr r0, [r0] @@ -360037,12 +360037,12 @@ _0812A0E8: .align 2, 0 _0812A0F8: .4byte 0x020192e4 _0812A0FC: .4byte 0x02039238 - thumb_func_end sub_812A0BC + thumb_func_end contest_ai_check_can_participate thumb_func_start sub_812A100 sub_812A100: @ 812A100 push {lr} - bl sub_812A0BC + bl contest_ai_check_can_participate ldr r0, _0812A12C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -360080,7 +360080,7 @@ _0812A140: .4byte 0x02039238 thumb_func_start sub_812A144 sub_812A144: @ 812A144 push {lr} - bl sub_812A0BC + bl contest_ai_check_can_participate ldr r0, _0812A170 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -360115,8 +360115,8 @@ _0812A180: _0812A184: .4byte 0x02039238 thumb_func_end sub_812A144 - thumb_func_start sub_812A188 -sub_812A188: @ 812A188 + thumb_func_start contest_ai_get_val_812A188 +contest_ai_get_val_812A188: @ 812A188 push {r4,lr} ldr r4, _0812A1BC ldr r0, [r4] @@ -360144,12 +360144,12 @@ sub_812A188: @ 812A188 .align 2, 0 _0812A1BC: .4byte 0x02039238 _0812A1C0: .4byte 0x020192e4 - thumb_func_end sub_812A188 + thumb_func_end contest_ai_get_val_812A188 thumb_func_start sub_812A1C4 sub_812A1C4: @ 812A1C4 push {lr} - bl sub_812A188 + bl contest_ai_get_val_812A188 ldr r0, _0812A1F0 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -360187,7 +360187,7 @@ _0812A204: .4byte 0x02039238 thumb_func_start sub_812A208 sub_812A208: @ 812A208 push {lr} - bl sub_812A188 + bl contest_ai_get_val_812A188 ldr r0, _0812A234 movs r1, 0x18 ldrsh r0, [r0, r1] @@ -361727,8 +361727,8 @@ _0812ACF4: _0812ACF8: .4byte 0x02039238 thumb_func_end sub_812ACC8 - thumb_func_start sub_812ACFC -sub_812ACFC: @ 812ACFC + thumb_func_start contest_ai_check_for_exciting_move +contest_ai_check_for_exciting_move: @ 812ACFC push {r4-r7,lr} movs r5, 0 movs r4, 0 @@ -361743,7 +361743,7 @@ _0812AD06: ldrh r0, [r1] cmp r0, 0 beq _0812AD30 - bl sub_80B19FC + bl contest_get_move_excitement lsls r0, 24 asrs r0, 24 cmp r0, 0x1 @@ -361770,12 +361770,12 @@ _0812AD36: .align 2, 0 _0812AD48: .4byte 0x020192e4 _0812AD4C: .4byte 0x02039238 - thumb_func_end sub_812ACFC + thumb_func_end contest_ai_check_for_exciting_move thumb_func_start sub_812AD50 sub_812AD50: @ 812AD50 push {lr} - bl sub_812ACFC + bl contest_ai_check_for_exciting_move ldr r0, _0812AD7C movs r1, 0x18 ldrsh r0, [r0, r1] @@ -361813,7 +361813,7 @@ _0812AD90: .4byte 0x02039238 thumb_func_start sub_812AD94 sub_812AD94: @ 812AD94 push {lr} - bl sub_812ACFC + bl contest_ai_check_for_exciting_move ldr r0, _0812ADC0 movs r1, 0x18 ldrsh r0, [r0, r1] diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 3ed3333d8..146010ab7 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -4047,13 +4047,13 @@ _08042D90: adds r1, r5, 0 bl InitWindowFromConfig movs r0, 0x14 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum ldr r1, [r4] adds r1, 0x38 strb r0, [r1] ldr r0, [r4] adds r0, 0x8 - bl sub_8064F08 + bl LoadTextWindowGraphics b _08042F04 .align 2, 0 _08042DBC: .4byte gWindowConfig_81E6F84 @@ -14464,14 +14464,14 @@ _08047F48: adds r1, r4, 0 bl InitWindowFromConfig movs r0, 0x14 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum ldr r1, [r5] adds r1, 0x7A movs r4, 0 strb r0, [r1] ldr r0, [r5] adds r0, 0x4 - bl sub_8064F08 + bl LoadTextWindowGraphics bl sub_8071EF4 bl sub_809D51C ldr r0, [r5] @@ -15159,14 +15159,14 @@ _0804857C: adds r1, r4, 0 bl InitWindowFromConfig movs r0, 0x14 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum ldr r1, [r5] adds r1, 0x7A movs r4, 0 strb r0, [r1] ldr r0, [r5] adds r0, 0x4 - bl sub_8064F08 + bl LoadTextWindowGraphics bl sub_8071EF4 bl sub_809D51C ldr r0, [r5] @@ -17302,7 +17302,7 @@ _080496F4: movs r1, 0x12 movs r2, 0xE movs r3, 0x1C - bl AddTextPrinterParametrized + bl DrawTextWindow ldr r3, _08049758 movs r0, 0x13 movs r1, 0xF @@ -17350,7 +17350,7 @@ _0804977A: movs r1, 0x18 movs r2, 0xE movs r3, 0x1D - bl AddTextPrinterParametrized + bl DrawTextWindow movs r0, 0x18 movs r1, 0xE movs r2, 0x4 @@ -18054,7 +18054,7 @@ DisplayMessageAndContinueTask: @ 8049CF0 movs r1, 0x18 movs r2, 0xE movs r3, 0x1D - bl AddTextPrinterParametrized + bl DrawTextWindow movs r0, 0x18 movs r1, 0xE movs r2, 0x4 @@ -19727,7 +19727,7 @@ sub_804AA0C: @ 804AA0C str r1, [sp] adds r1, r6, 0 adds r2, r5, 0 - bl AddTextPrinterParametrized + bl DrawTextWindow mov r1, r8 ldr r3, [r1] adds r0, r3, 0x4 @@ -21085,13 +21085,13 @@ _0804B47C: adds r1, r4, 0 bl InitWindowFromConfig movs r0, 0x2 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum ldr r1, [r6] adds r1, 0x34 strb r0, [r1] ldr r0, [r6] adds r0, 0x4 - bl sub_8064F08 + bl LoadTextWindowGraphics bl sub_8071EF4 ldr r1, _0804B580 ldr r4, _0804B584 @@ -21487,13 +21487,13 @@ _0804B7F4: adds r1, r4, 0 bl InitWindowFromConfig movs r0, 0x2 - bl sub_8064EF4 + bl SetTextWindowBaseTileNum ldr r1, [r5] adds r1, 0x34 strb r0, [r1] ldr r0, [r5] adds r0, 0x4 - bl sub_8064F08 + bl LoadTextWindowGraphics bl sub_8071EF4 ldr r1, _0804B904 ldr r2, _0804B908 diff --git a/data/data2.s b/data/data2.s index 107d73567..3783dab93 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1156,7 +1156,7 @@ gUnknown_081FA73C:: @ 81FA73C .4byte sub_80213D0 .4byte atk46_cmd46 .4byte sub_80214B4 - .4byte sub_8021580 + .4byte atk47 .4byte atk48_playstatchangeanimation .4byte sub_80217F8 .4byte atk4A_damagecalc2 @@ -26671,22 +26671,22 @@ gUnknown_08401E5A:: @ 8401E5A .align 2 gUnknown_08401E60:: @ 8401E60 .4byte sub_8128AA8 - .4byte sub_8128AF0 + .4byte contest_ai_get_turn .4byte sub_8128B0C .4byte sub_8128B4C .4byte sub_8128B8C .4byte sub_8128BCC - .4byte sub_8128C0C + .4byte contest_ai_get_excitement .4byte sub_8128C2C .4byte sub_8128C6C .4byte sub_8128CAC .4byte sub_8128CEC - .4byte sub_8128D2C + .4byte contest_ai_get_user_order .4byte sub_8128D50 .4byte sub_8128D90 .4byte sub_8128DD0 .4byte sub_8128E10 - .4byte sub_8128E50 + .4byte contest_ai_get_user_condition_maybe .4byte sub_8128E90 .4byte sub_8128ED0 .4byte sub_8128F10 @@ -26701,21 +26701,21 @@ gUnknown_08401E60:: @ 8401E60 .4byte sub_8129160 .4byte sub_81291AC .4byte sub_81291F8 - .4byte sub_8129244 + .4byte contest_ai_get_contest_type .4byte sub_8129264 .4byte sub_81292A4 - .4byte sub_81292E4 + .4byte contest_ai_get_move_excitement .4byte sub_8129324 .4byte sub_8129368 .4byte sub_81293AC .4byte sub_81293F0 - .4byte sub_8129434 + .4byte contest_ai_get_move_effect .4byte sub_8129470 .4byte sub_81294B0 - .4byte sub_81294F0 + .4byte contest_ai_get_move_effect_type .4byte sub_8129538 .4byte sub_8129578 - .4byte sub_81295B8 + .4byte contest_ai_check_move_has_highest_appeal .4byte sub_8129638 .4byte sub_812967C .4byte sub_81296FC @@ -26729,34 +26729,34 @@ gUnknown_08401E60:: @ 8401E60 .4byte sub_8129930 .4byte sub_8129970 .4byte sub_81299B0 - .4byte sub_81299F0 + .4byte contest_ai_get_move_used_count .4byte sub_8129A44 .4byte sub_8129A84 .4byte sub_8129AC4 .4byte sub_8129B04 - .4byte sub_8129B44 + .4byte contest_ai_check_combo_starter .4byte sub_8129BB8 .4byte sub_8129BFC - .4byte sub_8129C40 + .4byte contest_ai_check_combo_finisher .4byte sub_8129CB4 .4byte sub_8129CF8 - .4byte sub_8129D3C + .4byte contest_ai_check_would_finish_combo .4byte sub_8129D98 .4byte sub_8129DDC - .4byte sub_8129E20 + .4byte contest_ai_get_condition .4byte sub_8129E64 .4byte sub_8129EA4 .4byte sub_8129EE4 .4byte sub_8129F24 - .4byte sub_8129F64 + .4byte contest_ai_get_used_combo_starter .4byte sub_8129FBC .4byte sub_8129FFC .4byte sub_812A03C .4byte sub_812A07C - .4byte sub_812A0BC + .4byte contest_ai_check_can_participate .4byte sub_812A100 .4byte sub_812A144 - .4byte sub_812A188 + .4byte contest_ai_get_val_812A188 .4byte sub_812A1C4 .4byte sub_812A208 .4byte sub_812A24C @@ -26800,7 +26800,7 @@ gUnknown_08401E60:: @ 8401E60 .4byte sub_812AC34 .4byte sub_812AC54 .4byte sub_812AC84 - .4byte sub_812ACFC + .4byte contest_ai_check_for_exciting_move .4byte sub_812AD50 .4byte sub_812AD94 .4byte sub_812ADD8 diff --git a/include/text_window.h b/include/text_window.h new file mode 100644 index 000000000..63ca8915e --- /dev/null +++ b/include/text_window.h @@ -0,0 +1,19 @@ +#ifndef GUARD_TEXT_WINDOW_H +#define GUARD_TEXT_WINDOW_H + +#include "global.h" + +u16 SetTextWindowBaseTileNum(u16); +void LoadTextWindowGraphics(struct Window *); +void LoadTextWindowGraphics_OverridePalSlot(struct Window *, u8); +void LoadTextWindowGraphics_OverrideFrameType(struct Window *, u8); +void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); +const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType); +u16 SetMessageBoxBaseTileNum(u16); +void unref_sub_80651DC(struct Window *, u8 *); +void DisplayMessageBox(struct Window *); +void DrawStandardMessageBox(struct Window *win); +void LoadMessageBoxTiles(struct Window *win); +void sub_806536C(struct Window *win); + +#endif // GUARD_TEXT_WINDOW_H diff --git a/src/menu.c b/src/menu.c index aff3655da..0e9c34c69 100644 --- a/src/menu.c +++ b/src/menu.c @@ -2,6 +2,7 @@ #include "main.h" #include "text.h" #include "songs.h" +#include "text_window.h" struct Menu { @@ -83,12 +84,6 @@ void sub_8072DCC(u8); void sub_8072DDC(u8); void sub_8072DEC(void); -extern u16 sub_8064EF4(u16); -extern void sub_8064F08(struct Window *); -extern void sub_8064F6C(struct Window *, u8); -extern u16 sub_80651C8(u16); -extern void AddTextPrinterParametrized(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); -extern void copy_textbox_border_tile_patterns_to_vram(struct Window *); extern void sub_814A5C0(u8, u16, u8, u16, u8); extern void sub_814A880(u8, u8); extern void sub_814A904(void); @@ -140,13 +135,13 @@ bool32 sub_8071C94(void) goto fail; goto next; case 3: - word_202E9D2 = sub_8064EF4(word_202E9D0); + word_202E9D2 = SetTextWindowBaseTileNum(word_202E9D0); next: byte_202E9CC++; return 0; case 4: - sub_8064F08(dword_202E9C8); - word_202E9D4 = sub_80651C8(word_202E9D2); + LoadTextWindowGraphics(dword_202E9C8); + word_202E9D4 = SetMessageBoxBaseTileNum(word_202E9D2); return 1; default: fail: @@ -160,9 +155,9 @@ void sub_8071D48(struct WindowConfig *a1, u16 a2) InitWindowFromConfig(&stru_202E908, a1); word_202E9CE = a2; word_202E9D0 = InitWindowTileData(dword_202E9C8, word_202E9CE); - word_202E9D2 = sub_8064EF4(word_202E9D0); - sub_8064F08(dword_202E9C8); - word_202E9D4 = sub_80651C8(word_202E9D2); + word_202E9D2 = SetTextWindowBaseTileNum(word_202E9D0); + LoadTextWindowGraphics(dword_202E9C8); + word_202E9D4 = SetMessageBoxBaseTileNum(word_202E9D2); } void unref_sub_8071DA4(struct WindowConfig *a1, u16 a2) @@ -170,20 +165,20 @@ void unref_sub_8071DA4(struct WindowConfig *a1, u16 a2) dword_202E9C8 = &stru_202E908; InitWindowFromConfig(&stru_202E908, a1); word_202E9D0 = a2; - word_202E9D2 = sub_8064EF4(word_202E9D0); - sub_8064F08(dword_202E9C8); - word_202E9CE = sub_80651C8(word_202E9D2); + word_202E9D2 = SetTextWindowBaseTileNum(word_202E9D0); + LoadTextWindowGraphics(dword_202E9C8); + word_202E9CE = SetMessageBoxBaseTileNum(word_202E9D2); word_202E9D4 = InitWindowTileData(dword_202E9C8, word_202E9CE); } void sub_8071E00(u8 a1) { - sub_8064F6C(dword_202E9C8, a1); + LoadTextWindowGraphics_OverrideFrameType(dword_202E9C8, a1); } void GetMapNamePopUpWindowId(void) { - sub_8064F08(dword_202E9C8); + LoadTextWindowGraphics(dword_202E9C8); } void sub_8071E2C(struct WindowConfig *a1) @@ -214,7 +209,7 @@ void sub_8071EF4(void) void DrawDefaultWindow(u8 left, u8 top, u8 right, u8 bottom) { - AddTextPrinterParametrized(dword_202E9C8, left, top, right, bottom); + DrawTextWindow(dword_202E9C8, left, top, right, bottom); } void sub_8071F40(u8 *str) @@ -240,7 +235,7 @@ void unref_sub_8071FBC(u16 a1, u8 a2, u8 a3, u8 a4, u8 a5) void sub_8071FFC(void) { - copy_textbox_border_tile_patterns_to_vram(dword_202E9C8); + DisplayMessageBox(dword_202E9C8); } void AddTextPrinterWithCallbackForMessage(u8 *str, u8 a2, u8 a3) diff --git a/src/text_window.c b/src/text_window.c index 6a24fc67d..ab14fe1fb 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -1,23 +1,24 @@ #include "global.h" #include "main.h" #include "text.h" - -u16 sub_8064EF4(u16); -void sub_8064F08(struct Window *); -void sub_8064F38(struct Window *, u8); -void sub_8064F6C(struct Window *, u8); -void AddTextPrinterParametrized(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); -const struct FrameGraphics *sub_8064FD4(u8 frameType); -static void sub_8064FF8(u8, void *); -static void sub_8065014(u8, u8); -static void DrawWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom); -u16 sub_80651C8(u16); +#include "text_window.h" + +u16 SetTextWindowBaseTileNum(u16); +void LoadTextWindowGraphics(struct Window *); +void LoadTextWindowGraphics_OverridePalSlot(struct Window *, u8); +void LoadTextWindowGraphics_OverrideFrameType(struct Window *, u8); +void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); +const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType); +static void LoadTextWindowTiles(u8, void *); +static void LoadTextWindowPalette(u8, u8); +static void DrawTextWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom); +u16 SetMessageBoxBaseTileNum(u16); void unref_sub_80651DC(struct Window *, u8 *); -void copy_textbox_border_tile_patterns_to_vram(struct Window *); -static u16 draw_win_3(u16 tilemapEntry, u8 x, u8 y, u8 width, u8 height); -static void draw_win_2(struct Window *win, u8 left, u8 top, u8 width, u8 height); -void draw_win(struct Window *win); -void sub_8065348(struct Window *win); +void DisplayMessageBox(struct Window *); +static u16 GetMessageBoxTilemapEntry(u16 tilemapEntry, u8 x, u8 y, u8 width, u8 height); +static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 height); +void DrawStandardMessageBox(struct Window *win); +void LoadMessageBoxTiles(struct Window *win); void sub_806536C(struct Window *win); static u16 sTextWindowBaseTileNum; @@ -34,39 +35,39 @@ extern const struct FrameGraphics gUnknown_083761F0[20]; extern const u16 gMessageBoxTilemap[5][7]; extern const u8 gMessageBox_Gfx[]; -u16 sub_8064EF4(u16 baseTileNum) +u16 SetTextWindowBaseTileNum(u16 baseTileNum) { sTextWindowBaseTileNum = baseTileNum; return baseTileNum + 9; } -void sub_8064F08(struct Window *win) +void LoadTextWindowGraphics(struct Window *win) { u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; - sub_8064FF8(gSaveBlock2.optionsWindowFrameType, tileData); - sub_8065014(gSaveBlock2.optionsWindowFrameType, 0xE); + LoadTextWindowTiles(gSaveBlock2.optionsWindowFrameType, tileData); + LoadTextWindowPalette(gSaveBlock2.optionsWindowFrameType, 0xE); } -void sub_8064F38(struct Window *win, u8 a2) +void LoadTextWindowGraphics_OverridePalSlot(struct Window *win, u8 palSlot) { u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; - sub_8064FF8(gSaveBlock2.optionsWindowFrameType, tileData); - sub_8065014(gSaveBlock2.optionsWindowFrameType, a2); + LoadTextWindowTiles(gSaveBlock2.optionsWindowFrameType, tileData); + LoadTextWindowPalette(gSaveBlock2.optionsWindowFrameType, palSlot); } -void sub_8064F6C(struct Window *win, u8 frameType) +void LoadTextWindowGraphics_OverrideFrameType(struct Window *win, u8 frameType) { u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; - sub_8064FF8(frameType, tileData); - sub_8065014(frameType, 0xE); + LoadTextWindowTiles(frameType, tileData); + LoadTextWindowPalette(frameType, 0xE); } -void AddTextPrinterParametrized(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) +void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) { - DrawWindowInternal(win->config->tilemap, sTextWindowBaseTileNum, left, top, right, bottom); + DrawTextWindowInternal(win->config->tilemap, sTextWindowBaseTileNum, left, top, right, bottom); } -const struct FrameGraphics *sub_8064FD4(u8 frameType) +const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType) { if (frameType > 19) return &gUnknown_083761F0[0]; @@ -74,19 +75,19 @@ const struct FrameGraphics *sub_8064FD4(u8 frameType) return &gUnknown_083761F0[frameType]; } -static void sub_8064FF8(u8 frameType, void *dest) +static void LoadTextWindowTiles(u8 frameType, void *dest) { - const struct FrameGraphics *frameGraphics = sub_8064FD4(frameType); + const struct FrameGraphics *frameGraphics = GetTextWindowFrameGraphics(frameType); CpuFastCopy(frameGraphics->tiles, dest, 9 * TILE_SIZE_4BPP); } -static void sub_8065014(u8 frameType, u8 palSlot) +static void LoadTextWindowPalette(u8 frameType, u8 palSlot) { - const struct FrameGraphics *frameGraphics = sub_8064FD4(frameType); + const struct FrameGraphics *frameGraphics = GetTextWindowFrameGraphics(frameType); LoadPalette(frameGraphics->palette, 16 * palSlot, 0x20); } -static void DrawWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom) +static void DrawTextWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom) { u8 x, y; u8 startX, endX; @@ -123,10 +124,10 @@ static void DrawWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 r dest[32 * endY + endX] = (baseTileNum + 8) | 0xE000; } -u16 sub_80651C8(u16 a1) +u16 SetMessageBoxBaseTileNum(u16 baseTileNum) { - sMessageBoxBaseTileNum = a1; - return a1 + 14; + sMessageBoxBaseTileNum = baseTileNum; + return baseTileNum + 14; } void unref_sub_80651DC(struct Window *win, u8 *text) @@ -134,13 +135,13 @@ void unref_sub_80651DC(struct Window *win, u8 *text) sub_8002EB0(win, text, sMessageBoxBaseTileNum + 14, 2, 15); } -void copy_textbox_border_tile_patterns_to_vram(struct Window *win) +void DisplayMessageBox(struct Window *win) { - sub_8065348(win); - draw_win(win); + LoadMessageBoxTiles(win); + DrawStandardMessageBox(win); } -static u16 draw_win_3(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height) +static u16 GetMessageBoxTilemapEntry(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height) { u16 tilemapEntry = 9; @@ -162,7 +163,7 @@ static u16 draw_win_3(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height) return tilemapEntry; } -static void draw_win_2(struct Window *win, u8 left, u8 top, u8 width, u8 height) +static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 height) { u8 i, j; u16 tilemapEntry = (win->paletteNum << 12) | sMessageBoxBaseTileNum; @@ -170,15 +171,15 @@ static void draw_win_2(struct Window *win, u8 left, u8 top, u8 width, u8 height) for (i = 0; i < height + 2; i++) for (j = 0; j < width + 6; j++) - tilemap[(left + j) + 32 * (top + i)] = (win->paletteNum << 12) | draw_win_3(tilemapEntry, j, i, width, height); + tilemap[(left + j) + 32 * (top + i)] = (win->paletteNum << 12) | GetMessageBoxTilemapEntry(tilemapEntry, j, i, width, height); } -void draw_win(struct Window *win) +void DrawStandardMessageBox(struct Window *win) { - draw_win_2(win, 0, 14, 26, 4); + DrawMessageBox(win, 0, 14, 26, 4); } -void sub_8065348(struct Window *win) +void LoadMessageBoxTiles(struct Window *win) { u8 *tileData = win->config->tileData; CpuFastCopy(gMessageBox_Gfx, tileData + 32 * sMessageBoxBaseTileNum, 14 * TILE_SIZE_4BPP); |