From 772c9bb894f8d9188247cd2ee6e8380bb97958bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 15 Sep 2024 19:59:42 +0200 Subject: [PATCH 1/8] Minor charmap changes - mostly windows-1252 codepage --- charmap.txt | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/charmap.txt b/charmap.txt index f13fab1bd..265c53f94 100644 --- a/charmap.txt +++ b/charmap.txt @@ -95,26 +95,34 @@ '|' = 7C '}' = 7D '~' = 7E +@ windows-1252 codepage for extended ASCII '€' = 80 +'‚' = 82 +'ƒ' = 83 +'„' = 84 '⋯' = 85 '†' = 86 +'‡' = 87 'ˆ' = 88 '‰' = 89 'Š' = 8A '‹' = 8B 'Œ' = 8C 'Ž' = 8E -'•' = 8F '‘' = 91 '’' = 92 '“' = 93 '”' = 94 +'•' = 95 +@ 96, 97 are not hyphens, 'er', and 're' superscripts in kanji_a +'˜' = 98 '™' = 99 'š' = 9A '›' = 9B 'œ' = 9C 'ž' = 9E 'Ÿ' = 9F +' ' = A0 '¡' = A1 '¢' = A2 '£' = A3 @@ -127,7 +135,7 @@ 'ª' = AA '«' = AB '¬' = AC -'—' = AD +'­' = AD @ soft hyphen '®' = AE '¯' = AF '°' = B0 @@ -137,14 +145,14 @@ '´' = B4 'µ' = B5 '¶' = B6 -'„' = B7 -'‚' = B8 +@'„' = B7 @ nonstandard, normally middle dot +@'‚' = B8 @ nonstandard, normally cedilla '¹' = B9 '⁰' = BA '»' = BB -'←' = BC -'♂' = BD -'♀' = BE +'←' = BC @ nonstandard, normally ¼ +'♂' = BD @ nonstandard, normally ½ +'♀' = BE @ nonstandard, normally ¾ '¿' = BF 'À' = C0 'Á' = C1 From f8c0ad6faf6789e47c935e1cd14fe90fba6b1bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 15 Sep 2024 20:00:38 +0200 Subject: [PATCH 2/8] unk2C seems to be unsigned --- include/ground_script.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ground_script.h b/include/ground_script.h index 987e00af9..0caa645cc 100644 --- a/include/ground_script.h +++ b/include/ground_script.h @@ -59,7 +59,7 @@ typedef struct ScriptData // padding /* 0x28 */ s16 branchDiscriminant; /* 0x2A */ s16 unk2A; - /* 0x2C */ s16 unk2C; + /* 0x2C */ u16 unk2C; // padding /* 0x30 */ s32 unk30; /* 0x34 */ Position32 pos1; From ae3c563713f24b590b71d1fe72799ac35bd9e881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 15 Sep 2024 20:29:02 +0200 Subject: [PATCH 3/8] Mega rename --- asm/code_2.s | 74 ++--- asm/code_8002774.s | 48 ++-- asm/code_800DAC0.s | 4 +- asm/code_800F990.s | 38 +-- asm/code_8010F28.s | 20 +- asm/code_80140DC.s | 24 +- asm/code_8015080.s | 6 +- asm/code_801EE10.s | 6 +- asm/code_8023868.s | 12 +- asm/code_803B050.s | 12 +- asm/code_803C1D0.s | 4 +- asm/code_803D110.s | 2 +- asm/code_803E724.s | 8 +- asm/code_8042B34.s | 14 +- asm/code_80450F8.s | 4 +- asm/code_8045A00.s | 46 ++-- asm/code_8046CE4.s | 8 +- asm/code_80521D0.s | 24 +- asm/code_805D8C8.s | 26 +- asm/code_805D8C8_1.s | 4 +- asm/code_8066D04.s | 80 +++--- asm/code_8069E0C.s | 24 +- asm/code_80718D8.s | 10 +- asm/code_807E5AC.s | 2 +- asm/code_807FCD4.s | 2 +- asm/code_8080CF0.s | 4 +- asm/code_808417C.s | 2 +- asm/code_8098468.s | 134 ++++----- asm/code_8098BDC.s | 36 +-- asm/code_809A560.s | 144 +++++----- asm/code_809C5C4.s | 6 +- asm/code_80A26CC_1.s | 6 +- asm/dungeon_2.s | 2 +- asm/dungeon_map_access.s | 8 +- asm/event_flag.s | 74 ++--- asm/ground_effect.s | 206 +++++++------- asm/ground_event.s | 50 ++-- asm/ground_link.s | 16 +- asm/ground_lives.s | 406 ++++++++++++++-------------- asm/ground_map.s | 4 +- asm/ground_map_1.s | 84 +++--- asm/ground_object.s | 252 ++++++++--------- asm/ground_script.s | 56 ++-- asm/ground_sprite.s | 22 +- asm/handleaction.s | 54 ++-- asm/pokemon.s | 12 +- asm/pokemon_2.s | 10 +- asm/pokemon_3.s | 6 +- asm/text.s | 38 +-- data/data.s | 24 +- data/data_80F59C8.s | 144 +++++----- data/data_8106A4C.s | 36 +-- data/data_8107010.s | 20 +- data/data_8115F5C.s | 174 ++++++------ data/data_8270000.s | 2 +- data/data_code_2.s | 8 +- include/code_80130A8.h | 2 +- include/code_805D8C8.h | 4 +- include/code_80972F4.h | 2 +- include/code_80A26CC.h | 4 +- include/dungeon_random.h | 2 +- include/event_flag.h | 16 +- include/friend_area.h | 2 +- include/ground_map.h | 2 +- include/ground_map_1.h | 2 +- include/ground_script.h | 14 +- include/items.h | 2 +- include/pokemon.h | 2 +- include/sprite.h | 8 +- include/structs/struct_sub80095e4.h | 4 +- include/text1.h | 6 +- include/text2.h | 4 +- src/adventure_log.c | 8 +- src/adventure_log_menu.c | 2 +- src/code.c | 80 +++--- src/code_2.c | 12 +- src/code_800558C.c | 2 +- src/code_8009804.c | 10 +- src/code_80140DC.c | 2 +- src/code_8015080.c | 2 +- src/code_801602C.c | 6 +- src/code_801AFA4.c | 4 +- src/code_801B3C0.c | 6 +- src/code_801B60C.c | 48 ++-- src/code_801C8C4.c | 10 +- src/code_801D014.c | 10 +- src/code_801D9E4.c | 10 +- src/code_801EE10.c | 8 +- src/code_801F428.c | 10 +- src/code_801F808.c | 12 +- src/code_80227B8.c | 40 +-- src/code_8023144.c | 10 +- src/code_8024458.c | 6 +- src/code_802DB28.c | 20 +- src/code_802DE84.c | 6 +- src/code_8031D70.c | 6 +- src/code_8048480.c | 26 +- src/code_8057824_1.c | 4 +- src/code_805D8C8.c | 32 +-- src/code_805D8C8_1.c | 36 +-- src/code_8066D04.c | 52 ++-- src/code_8069E0C.c | 6 +- src/code_806CD90.c | 4 +- src/code_8072B78.c | 2 +- src/code_8072F3C.c | 8 +- src/code_8073CF0.c | 42 +-- src/code_8077274_1.c | 4 +- src/code_8083288.c | 2 +- src/code_809447C.c | 8 +- src/code_80958E8.c | 2 +- src/code_80972F4.c | 36 +-- src/code_8097504.c | 16 +- src/code_809A560.c | 46 ++-- src/code_809A560_1.c | 8 +- src/code_809C5C4.c | 12 +- src/code_809D148.c | 22 +- src/code_80A26CC.c | 34 +-- src/code_80A7714.c | 20 +- src/credits1.c | 4 +- src/credits2.c | 4 +- src/debug_menu1.c | 4 +- src/debug_menu2.c | 8 +- src/debug_menu3.c | 6 +- src/debug_menu4.c | 6 +- src/ds_menus.c | 2 +- src/dungeon_ai_attack.c | 8 +- src/dungeon_random.c | 2 +- src/event_flag.c | 198 +++++++------- src/felicity_bank.c | 42 +-- src/friend_area.c | 4 +- src/friend_area_action_menu.c | 14 +- src/friend_list_menu.c | 20 +- src/friend_rescue.c | 264 +++++++++--------- src/ground_link.c | 14 +- src/ground_main.c | 46 ++-- src/ground_map.c | 30 +- src/ground_map_1.c | 12 +- src/ground_map_2.c | 10 +- src/ground_script.c | 78 +++--- src/ground_script_1.c | 294 ++++++++++---------- src/ground_script_2.c | 56 ++-- src/ground_sprite.c | 4 +- src/gulpin_shop.c | 4 +- src/gulpin_shop_801FB50.c | 48 ++-- src/hints_menu1.c | 10 +- src/hints_menu2.c | 8 +- src/iq_skill_info_menu.c | 10 +- src/iq_skill_list_menu.c | 12 +- src/iq_skill_menu.c | 4 +- src/items.c | 30 +- src/kangaskhan_storage1.c | 44 +-- src/kangaskhan_storage2.c | 8 +- src/kecleon_bros1.c | 50 ++-- src/kecleon_bros2.c | 10 +- src/kecleon_bros3.c | 10 +- src/kecleon_bros4.c | 22 +- src/load_screen.c | 8 +- src/luminous_cave.c | 38 +-- src/mailbox.c | 6 +- src/main_menu1.c | 6 +- src/main_menu2.c | 4 +- src/makuhita_dojo1.c | 24 +- src/makuhita_dojo2.c | 8 +- src/menu_input.c | 2 +- src/mission_reward.c | 32 +-- src/move_actions.c | 16 +- src/move_effects_target.c | 18 +- src/options_menu1.c | 4 +- src/options_menu2.c | 8 +- src/other_menus1.c | 4 +- src/party_list_menu.c | 30 +- src/pelipper_board.c | 6 +- src/personality_test1.c | 16 +- src/personality_test2.c | 12 +- src/pokemon_3.c | 6 +- src/pokemon_mail.c | 36 +-- src/pokemon_news1.c | 10 +- src/pokemon_news2.c | 6 +- src/pokemon_news3.c | 10 +- src/post_office_guide1.c | 30 +- src/post_office_guide2.c | 16 +- src/quick_save_read.c | 2 +- src/quick_save_write.c | 12 +- src/rescue_password_menu.c | 16 +- src/save.c | 4 +- src/save_menu.c | 6 +- src/save_read.c | 2 +- src/save_write.c | 16 +- src/sprite.c | 30 +- src/status.c | 18 +- src/status_actions.c | 4 +- src/text1.c | 48 ++-- src/text2.c | 26 +- src/thank_you_wonder_mail.c | 100 +++---- src/trade_items_menu.c | 56 ++-- src/trap.c | 6 +- src/trap_1.c | 34 +-- src/unk_menu_203B360.c | 4 +- src/wigglytuff_shop1.c | 14 +- src/wigglytuff_shop2.c | 8 +- src/wigglytuff_shop3.c | 46 ++-- src/wonder_mail.c | 144 +++++----- src/wonder_mail_2.c | 8 +- src/wonder_mail_3_mid.c | 4 +- src/wonder_mail_4.c | 10 +- src/wonder_mail_5.c | 6 +- src/wonder_mail_6.c | 12 +- src/wonder_mail_802C10C.c | 10 +- src/wonder_mail_802C4C8.c | 10 +- src/wonder_mail_802C860.c | 4 +- src/wonder_mail_802CDD4.c | 10 +- src/wonder_mail_802D098.c | 18 +- src/wonder_mail_main_menu.c | 42 +-- sym_ewram.txt | 36 +-- sym_ewram2.txt | 8 +- sym_iwram.txt | 10 +- 216 files changed, 2955 insertions(+), 2955 deletions(-) diff --git a/asm/code_2.s b/asm/code_2.s index 2b628c036..0eaed6f9b 100644 --- a/asm/code_2.s +++ b/asm/code_2.s @@ -133,7 +133,7 @@ QuickSave: movs r4, 0 movs r6, 0 movs r0, 0 - bl xxx_update_some_bg_tiles + bl UpdateFadeInTile bl sub_8014144 bl InitFontPalette movs r0, 0x2 @@ -144,7 +144,7 @@ QuickSave: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 movs r1, 0x14 bl sub_8009408 @@ -160,7 +160,7 @@ QuickSave: bl sub_8099744 bl sub_8099750 movs r0, 0x3 - bl sub_80063D8 + bl SetCharacterMask movs r0, 0 movs r1, 0 bl sub_8005838 @@ -169,7 +169,7 @@ QuickSave: movs r1, 0 movs r2, 0 movs r3, 0x20 - bl sub_80141B4 + bl xxx_info_box_80141B4 b _08000892 .align 2, 0 _080007AC: .4byte gUnknown_2026E4E @@ -234,7 +234,7 @@ _08000822: movs r1, 0 movs r2, 0 ldr r3, _08000838 - bl sub_80141B4 + bl xxx_info_box_80141B4 movs r6, 0x3C movs r4, 0x1 b _08000892 @@ -248,7 +248,7 @@ _0800083C: movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_80141B4 + bl xxx_info_box_80141B4 movs r4, 0x3 b _08000892 .align 2, 0 @@ -258,7 +258,7 @@ _08000854: movs r1, 0 movs r2, 0 ldr r3, _08000868 - bl sub_80141B4 + bl xxx_info_box_80141B4 _08000860: movs r4, 0x2 b _08000892 @@ -297,7 +297,7 @@ _08000892: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 bl xxx_update_stuff add sp, 0xC @@ -314,7 +314,7 @@ sub_80008C0: movs r4, 0 movs r6, 0 movs r0, 0 - bl xxx_update_some_bg_tiles + bl UpdateFadeInTile bl sub_8014144 bl InitFontPalette movs r0, 0x2 @@ -325,7 +325,7 @@ sub_80008C0: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 movs r1, 0x14 bl sub_8009408 @@ -341,7 +341,7 @@ sub_80008C0: bl sub_8099744 bl sub_8099750 movs r0, 0x3 - bl sub_80063D8 + bl SetCharacterMask cmp r5, 0x1 beq _08000948 cmp r5, 0x1 @@ -358,7 +358,7 @@ _08000934: movs r1, 0 movs r2, 0 movs r3, 0x20 - bl sub_80141B4 + bl xxx_info_box_80141B4 movs r4, 0x2 b _080009A2 .align 2, 0 @@ -374,7 +374,7 @@ _08000952: ldr r3, _08000964 movs r1, 0 movs r2, 0 - bl sub_80141B4 + bl xxx_info_box_80141B4 _0800095C: movs r4, 0x1 b _080009A2 @@ -425,7 +425,7 @@ _080009A2: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 bl xxx_update_stuff add sp, 0x4 @@ -446,7 +446,7 @@ sub_80009D0: adds r4, r0, 0 movs r0, 0 movs r1, 0x18 - bl sub_8001658 + bl GetScriptVarValue adds r7, r0, 0 movs r0, 0 mov r10, r0 @@ -468,7 +468,7 @@ _08000A08: movs r0, 0 movs r1, 0x18 movs r2, 0xB - bl sub_80018D8 + bl SetScriptVarValue bl sub_8096BD0 movs r0, 0x3 bl QuickSave @@ -490,13 +490,13 @@ _08000A30: _08000A3A: movs r0, 0 movs r1, 0x41 - bl sub_80015C0 + bl ClearScriptVarArray _08000A42: cmp r7, 0x4 bne _08000AB6 movs r0, 0 movs r1, 0xD - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 bl sub_8002658 @@ -536,18 +536,18 @@ _08000AA0: _08000AA2: movs r0, 0 movs r1, 0xD - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0xE movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue b _08000B70 _08000AB6: cmp r7, 0x5 bne _08000B9C movs r0, 0 movs r1, 0x12 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 mov r8, r0 @@ -638,7 +638,7 @@ _08000B78: movs r0, 0 movs r1, 0x13 mov r2, r8 - bl sub_80018D8 + bl SetScriptVarValue ldr r1, _08000B98 movs r0, 0x2 str r0, [r1] @@ -978,7 +978,7 @@ _08000E1E: add r0, sp, 0x174 bl sub_80011E8 adds r0, r5, 0 - bl sub_8000EDC + bl SaveLoadRelated_8000EDC add r4, sp, 0x1EC movs r0, 0 ldrsh r1, [r4, r0] @@ -994,7 +994,7 @@ _08000E46: _08000E50: movs r0, 0 movs r1, 0x41 - bl sub_80015C0 + bl ClearScriptVarArray ldrh r0, [r4] adds r0, 0x1 lsls r0, 16 @@ -1032,7 +1032,7 @@ _08000EA6: movs r0, 0 movs r1, 0x41 movs r2, 0 - bl sub_800199C + bl SetScriptVarArrayValue b _08000A42 _08000EB2: movs r7, 0xA @@ -1059,8 +1059,8 @@ _08000EC6: bx r1 thumb_func_end sub_80009D0 - thumb_func_start sub_8000EDC -sub_8000EDC: + thumb_func_start SaveLoadRelated_8000EDC +SaveLoadRelated_8000EDC: push {r4-r7,lr} sub sp, 0x8 adds r4, r0, 0 @@ -1207,7 +1207,7 @@ _0800101C: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8000EDC + thumb_func_end SaveLoadRelated_8000EDC thumb_func_start sub_8001024 sub_8001024: @@ -1225,7 +1225,7 @@ sub_8001024: pop {r0} bx r0 .align 2, 0 -_08001040: .4byte gUnknown_203B040 +_08001040: .4byte gPersonalityRelated_203B040 thumb_func_end sub_8001024 thumb_func_start sub_8001044 @@ -1244,7 +1244,7 @@ sub_8001044: pop {r0} bx r0 .align 2, 0 -_08001060: .4byte gUnknown_203B040 +_08001060: .4byte gPersonalityRelated_203B040 thumb_func_end sub_8001044 thumb_func_start sub_8001064 @@ -1273,7 +1273,7 @@ sub_8001064: bl sub_808CE74 b _080010AE .align 2, 0 -_0800109C: .4byte gUnknown_203B040 +_0800109C: .4byte gPersonalityRelated_203B040 _080010A0: movs r4, 0x4 ldrsh r0, [r5, r4] @@ -1304,7 +1304,7 @@ _080010AE: bl sub_808CE74 b _080010F2 .align 2, 0 -_080010E0: .4byte gUnknown_203B040 +_080010E0: .4byte gPersonalityRelated_203B040 _080010E4: movs r4, 0x6 ldrsh r0, [r5, r4] @@ -1339,7 +1339,7 @@ _0800111C: ldr r2, [r2] movs r0, 0 movs r1, 0x27 - bl sub_80018D8 + bl SetScriptVarValue _08001126: ldr r3, _08001164 movs r0, 0x6 @@ -1367,16 +1367,16 @@ _08001150: ldr r2, [r2] movs r0, 0 movs r1, 0x26 - bl sub_80018D8 + bl SetScriptVarValue _0800115A: add sp, 0x28 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08001164: .4byte gUnknown_203B040 -_08001168: .4byte gUnknown_80B690C -_0800116C: .4byte gUnknown_80B6994 +_08001164: .4byte gPersonalityRelated_203B040 +_08001168: .4byte gBaseKindTable +_0800116C: .4byte gTalkKindTable thumb_func_end sub_8001064 thumb_func_start sub_8001170 diff --git a/asm/code_8002774.s b/asm/code_8002774.s index 4478b3723..41bbd5344 100644 --- a/asm/code_8002774.s +++ b/asm/code_8002774.s @@ -602,8 +602,8 @@ _08002BAE: bx r1 thumb_func_end sub_8002B5C - thumb_func_start sub_8002BB8 -sub_8002BB8: + thumb_func_start SetVecFromDirectionSpeed +SetVecFromDirectionSpeed: push {r4,r5,lr} lsls r1, 24 asrs r1, 21 @@ -621,11 +621,11 @@ sub_8002BB8: pop {r2} bx r2 .align 2, 0 -_08002BD8: .4byte gUnknown_80B7E3C - thumb_func_end sub_8002BB8 +_08002BD8: .4byte gVectorDirections + thumb_func_end SetVecFromDirectionSpeed - thumb_func_start sub_8002BDC -sub_8002BDC: + thumb_func_start VecDirection8Sign +VecDirection8Sign: push {lr} ldr r1, [r0] cmp r1, 0 @@ -676,10 +676,10 @@ _08002C28: _08002C2A: pop {r1} bx r1 - thumb_func_end sub_8002BDC + thumb_func_end VecDirection8Sign - thumb_func_start sub_8002C30 -sub_8002C30: + thumb_func_start VecDirection4SignYX +VecDirection4SignYX: push {lr} ldr r1, [r0, 0x4] cmp r1, 0 @@ -708,10 +708,10 @@ _08002C58: _08002C5A: pop {r1} bx r1 - thumb_func_end sub_8002C30 + thumb_func_end VecDirection4SignYX - thumb_func_start sub_8002C60 -sub_8002C60: + thumb_func_start VecDirection8Radial +VecDirection8Radial: push {r4,r5,lr} adds r4, r0, 0 ldr r0, [r4] @@ -797,10 +797,10 @@ _08002CE8: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8002C60 + thumb_func_end VecDirection8Radial - thumb_func_start sub_8002CF0 -sub_8002CF0: + thumb_func_start VecDirection4Radial +VecDirection4Radial: push {r4,lr} adds r4, r0, 0 ldr r3, [r4] @@ -862,10 +862,10 @@ _08002D4C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8002CF0 + thumb_func_end VecDirection4Radial - thumb_func_start sub_8002D54 -sub_8002D54: + thumb_func_start SizedDeltaDirection4 +SizedDeltaDirection4: push {r4,r5,lr} sub sp, 0x8 adds r4, r1, 0 @@ -941,17 +941,17 @@ _08002DD8: str r0, [sp, 0x4] _08002DDC: mov r0, sp - bl sub_8002CF0 + bl VecDirection4Radial lsls r0, 24 asrs r0, 24 add sp, 0x8 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8002D54 + thumb_func_end SizedDeltaDirection4 - thumb_func_start sub_8002DF0 -sub_8002DF0: + thumb_func_start SizedDeltaDirection8 +SizedDeltaDirection8: push {r4,r5,lr} sub sp, 0x8 adds r4, r1, 0 @@ -1027,13 +1027,13 @@ _08002E74: str r0, [sp, 0x4] _08002E78: mov r0, sp - bl sub_8002C60 + bl VecDirection8Radial lsls r0, 24 asrs r0, 24 add sp, 0x8 pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8002DF0 + thumb_func_end SizedDeltaDirection8 .align 2, 0 @ Don't pad with nop. diff --git a/asm/code_800DAC0.s b/asm/code_800DAC0.s index e51d47d98..9238d4df3 100644 --- a/asm/code_800DAC0.s +++ b/asm/code_800DAC0.s @@ -56,7 +56,7 @@ _0800DD60: b _0800DE28 _0800DD64: mov r0, r8 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC movs r4, 0 ldr r0, [r5, 0x8] movs r1, 0x7 @@ -633,7 +633,7 @@ _0800E1D2: adds r4, 0x55 ldrb r4, [r4] str r4, [sp, 0x4] - bl sub_800543C + bl AxResInitUnorientedFile_800543C b _0800E200 _0800E1E4: adds r0, r5, 0 diff --git a/asm/code_800F990.s b/asm/code_800F990.s index 95eace7c9..fe0743c69 100644 --- a/asm/code_800F990.s +++ b/asm/code_800F990.s @@ -21,7 +21,7 @@ sub_800F990: movs r1, 0x14 bl sub_80095CC movs r0, 0x2 - bl xxx_update_some_bg_tiles + bl UpdateFadeInTile ldr r1, [r4] ldr r0, _0800FA2C adds r2, r1, r0 @@ -439,7 +439,7 @@ _0800FD08: str r4, [sp, 0x8] adds r0, r3, 0 movs r3, 0 - bl sub_80053AC + bl AxResInitFile_80053AC b _0800FD32 .align 2, 0 _0800FD1C: .4byte gUnknown_203B0E4 @@ -758,7 +758,7 @@ _0800FF60: str r2, [sp, 0x8] movs r2, 0 movs r3, 0 - bl sub_80053AC + bl AxResInitFile_80053AC ldr r2, [r4] ldr r1, _0800FFD4 adds r0, r2, r1 @@ -948,7 +948,7 @@ sub_80100C0: str r1, [sp, 0x8] adds r1, r2, 0 movs r2, 0 - bl sub_80053AC + bl AxResInitFile_80053AC bl sub_8011168 ldr r0, [r4] ldr r2, _080101E8 @@ -1053,7 +1053,7 @@ _0801018A: str r2, [sp, 0x8] movs r2, 0 movs r3, 0 - bl sub_80053AC + bl AxResInitFile_80053AC add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -1091,7 +1091,7 @@ _08010214: .4byte gUnknown_80D3EFC _08010218: adds r0, r3, 0 movs r2, 0 - bl sub_8092578 + bl WriteFriendAreaName _08010220: pop {r0} bx r0 @@ -1157,7 +1157,7 @@ sub_8010268: movs r1, 0x14 bl sub_80095CC movs r0, 0x2 - bl xxx_update_some_bg_tiles + bl UpdateFadeInTile bl sub_801059C adds r0, r5, 0x4 bl sub_8010494 @@ -1318,7 +1318,7 @@ _080103B0: movs r2, 0x1 str r2, [sp, 0x8] movs r2, 0 - bl sub_80053AC + bl AxResInitFile_80053AC movs r7, 0 cmp r7, r4 bge _08010448 @@ -1458,7 +1458,7 @@ _080104E6: str r6, [sp, 0x8] adds r0, r3, 0 movs r3, 0 - bl sub_80053AC + bl AxResInitFile_80053AC ldr r1, _08010508 lsls r0, r5, 2 adds r0, r1 @@ -1490,7 +1490,7 @@ _0801050E: str r2, [sp, 0x8] movs r2, 0 movs r3, 0 - bl sub_80053AC + bl AxResInitFile_80053AC ldr r2, [r4] ldr r4, _08010588 adds r3, r2, r4 @@ -1675,7 +1675,7 @@ _080106A2: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -1942,9 +1942,9 @@ _0801089A: _080108FC: .4byte gUnknown_203B0E8 _08010900: .4byte 0x000052da _08010904: .4byte 0x000052d8 -_08010908: .4byte gUnknown_202C038 +_08010908: .4byte gFontTiles_202C038 _0801090C: .4byte 0x00003114 -_08010910: .4byte gUnknown_202C838 +_08010910: .4byte gFontTilesExtra_202C838 _08010914: .4byte 0x00001114 thumb_func_end sub_8010858 @@ -1985,7 +1985,7 @@ sub_8010950: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C pop {r0} bx r0 thumb_func_end sub_8010950 @@ -2148,7 +2148,7 @@ sub_8010A88: ldr r5, [r1] ldr r3, _08010B64 adds r0, r3 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC mov r0, r9 cmp r0, 0 beq _08010AF6 @@ -2194,7 +2194,7 @@ _08010B04: adds r5, r4, 0 adds r5, 0x8 adds r0, r5, 0 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC mov r2, r9 cmp r2, 0 beq _08010B40 @@ -2287,7 +2287,7 @@ _08010BD0: add r0, sp, 0x4 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 bl sub_80073B8 ldr r0, _08010C08 @@ -2389,7 +2389,7 @@ _08010C86: adds r0, r3, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 bl sub_80073B8 str r4, [sp] @@ -2625,7 +2625,7 @@ _08010E84: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C add sp, 0xC pop {r3-r5} mov r8, r3 diff --git a/asm/code_8010F28.s b/asm/code_8010F28.s index 6cbb5fc91..57a2c1fe1 100644 --- a/asm/code_8010F28.s +++ b/asm/code_8010F28.s @@ -29,7 +29,7 @@ sub_8010F28: mov r8, r1 ldr r4, _0801108C adds r0, r4 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC ldr r3, [r6] adds r4, r3, r4 ldr r7, _08011090 @@ -74,7 +74,7 @@ _08010F98: beq _08010FD8 adds r4, 0x14 adds r0, r4, 0 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC movs r2, 0x4 ldrsh r1, [r5, r2] mov r3, r9 @@ -114,7 +114,7 @@ _08010FEC: cmp r0, 0 beq _08011062 adds r0, r1, r6 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC ldr r0, _080110A8 ldrh r0, [r0] movs r2, 0x80 @@ -278,9 +278,9 @@ _080110F2: _08011150: .4byte gUnknown_203B0E4 _08011154: .4byte 0x00004dd6 _08011158: .4byte 0x00004dd4 -_0801115C: .4byte gUnknown_202C038 +_0801115C: .4byte gFontTiles_202C038 _08011160: .4byte 0x00002014 -_08011164: .4byte gUnknown_202C838 +_08011164: .4byte gFontTilesExtra_202C838 thumb_func_end sub_80110B0 thumb_func_start sub_8011168 @@ -289,7 +289,7 @@ sub_8011168: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r3, _080111B0 ldr r1, [r3] ldr r2, _080111B4 @@ -557,7 +557,7 @@ _0801132E: movs r3, 0x1 str r3, [sp, 0x8] movs r3, 0 - bl sub_80053AC + bl AxResInitFile_80053AC _08011370: adds r6, 0x3C adds r5, 0x3C @@ -636,7 +636,7 @@ _08011406: adds r0, r4, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 bl sub_80073B8 ldr r1, _0801147C @@ -825,7 +825,7 @@ _0801152A: add r0, sp, 0x4 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r1, [r5] ldr r2, _08011628 adds r0, r1, r2 @@ -888,7 +888,7 @@ _08011628: .4byte 0x00004ddc _0801162C: .4byte 0x00004de0 _08011630: .4byte gUnknown_80D4104 _08011634: .4byte gFormatData_202DE30 -_08011638: .4byte gUnknown_202DE58 +_08011638: .4byte gFormatItems _0801163C: .4byte gUnknown_80D4120 _08011640: ldr r1, _08011690 diff --git a/asm/code_80140DC.s b/asm/code_80140DC.s index 6c69b6b1f..2edf8e45f 100644 --- a/asm/code_80140DC.s +++ b/asm/code_80140DC.s @@ -159,7 +159,7 @@ _08014368: adds r0, r4, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r1, _080143F0 movs r4, 0 movs r2, 0 @@ -188,7 +188,7 @@ _08014368: movs r1, 0x8 _080143C6: adds r0, r1, 0 - bl sub_80063D8 + bl SetCharacterMask ldr r0, _080143F8 movs r1, 0x1 str r1, [r0] @@ -505,7 +505,7 @@ _08014652: ldr r4, _08014698 adds r0, r6, 0 adds r1, r4, 0 - bl sub_8009190 + bl xxx_handle_format_global adds r6, r0, 0 adds r0, r4, 0 adds r0, 0x21 @@ -901,7 +901,7 @@ _08014978: beq _080149A8 _08014998: movs r0, 0 - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 b _080149B6 .align 2, 0 _080149A0: .4byte gUnknown_202E748 @@ -966,7 +966,7 @@ _08014A04: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r1, _08014A30 movs r0, 0 str r0, [r1] @@ -1107,7 +1107,7 @@ _08014B1E: adds r0, r4, 0 movs r1, 0x1 movs r2, 0 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r0, _08014B80 ldr r1, _08014B84 ldr r1, [r1] @@ -1221,12 +1221,12 @@ _08014BEA: adds r1, r4, 0 adds r2, r7, 0 mov r3, r8 - bl sub_8014FA8 + bl AppendString_8014FA8 ldr r0, _08014C20 adds r1, r4, 0 adds r2, r7, 0 mov r3, r8 - bl sub_8014FA8 + bl AppendString_8014FA8 b _08014C2E .align 2, 0 _08014C1C: .4byte gUnknown_202E5D8 @@ -1541,7 +1541,7 @@ _08014F0E: adds r0, r4, 0 adds r2, r7, 0 mov r3, r8 - bl sub_8014FA8 + bl AppendString_8014FA8 lsls r0, 24 cmp r0, 0 bne _08014F7E @@ -1623,8 +1623,8 @@ _08014F94: bx r1 thumb_func_end xxx_format_string - thumb_func_start sub_8014FA8 -sub_8014FA8: + thumb_func_start AppendString_8014FA8 +AppendString_8014FA8: push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -1665,7 +1665,7 @@ _08014FE8: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_8014FA8 + thumb_func_end AppendString_8014FA8 thumb_func_start PrintFormatStringOnWindow PrintFormatStringOnWindow: diff --git a/asm/code_8015080.s b/asm/code_8015080.s index e20d143eb..882348670 100644 --- a/asm/code_8015080.s +++ b/asm/code_8015080.s @@ -380,7 +380,7 @@ _080154A0: adds r0, r4 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0x1 bl sub_8015A08 bl sub_8015C1C @@ -1063,7 +1063,7 @@ sub_8015A08: push {r5-r7} sub sp, 0x24 movs r0, 0 - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 movs r0, 0 bl sub_80073B8 ldr r3, _08015A68 @@ -1325,7 +1325,7 @@ sub_8015C1C: push {r4,r5,lr} sub sp, 0x54 movs r0, 0x1 - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 movs r0, 0x1 bl sub_80073B8 ldr r0, _08015C74 diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s index 72116d70f..a55a9075a 100644 --- a/asm/code_801EE10.s +++ b/asm/code_801EE10.s @@ -19,7 +19,7 @@ sub_801F280: ldr r4, _0801F30C ldr r0, [r4] ldr r0, [r0, 0x50] - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 ldr r0, [r4] ldr r0, [r0, 0x50] bl sub_80073B8 @@ -155,7 +155,7 @@ _0801F394: cmp r0, 0 beq _0801F3DC ldr r0, [r1, 0x54] - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 ldr r0, [r4] ldr r0, [r0, 0x54] bl sub_80073B8 @@ -182,7 +182,7 @@ _0801F3DC: pop {r0} bx r0 .align 2, 0 -_0801F3EC: .4byte gUnknown_202DE58 +_0801F3EC: .4byte gFormatItems _0801F3F0: .4byte gUnknown_203B270 _0801F3F4: .4byte gUnknown_80DC2A0 thumb_func_end sub_801F280 diff --git a/asm/code_8023868.s b/asm/code_8023868.s index 87ae60b0f..fc7d5fcde 100644 --- a/asm/code_8023868.s +++ b/asm/code_8023868.s @@ -170,7 +170,7 @@ _0802398E: adds r1, r0, r1 str r1, [r2] adds r0, r6 - bl sub_8006518 + bl RestoreUnkTextStruct_8006518 ldr r1, [r5] adds r4, r1, r4 ldr r2, [r4] @@ -219,7 +219,7 @@ _08023A04: adds r0, r6 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r4, [r5] movs r0, 0xD6 lsls r0, 2 @@ -408,7 +408,7 @@ sub_8023B7C: adds r0, r1 movs r1, 0 movs r2, 0 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C bl sub_8023BD8 adds r2, r0, 0 ldr r0, [r5] @@ -557,7 +557,7 @@ sub_8023C60: adds r0, r4 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r0, [r5] bl MemoryFree movs r0, 0 @@ -660,7 +660,7 @@ _08023D38: adds r0, r2 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C pop {r4,r5} pop {r0} bx r0 @@ -683,7 +683,7 @@ sub_8023DA4: lsls r5, 2 adds r0, r5 ldr r0, [r0] - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 ldr r0, [r4] adds r0, r5 ldr r0, [r0] diff --git a/asm/code_803B050.s b/asm/code_803B050.s index 899d481e9..d9c242dbd 100644 --- a/asm/code_803B050.s +++ b/asm/code_803B050.s @@ -20,7 +20,7 @@ sub_803B050: adds r1, 0x84 str r1, [r0, 0x38] adds r0, 0x3C - bl sub_8006518 + bl RestoreUnkTextStruct_8006518 ldr r1, [r4] ldr r2, [r1, 0x34] lsls r0, r2, 1 @@ -42,7 +42,7 @@ sub_803B050: adds r0, 0x3C movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r2, 0 movs r3, 0 movs r7, 0xCB @@ -215,7 +215,7 @@ sub_803B1BC: adds r0, 0x3C movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r0, [r4] bl MemoryFree movs r0, 0 @@ -253,7 +253,7 @@ sub_803B204: adds r0, 0x3C movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r0, [r4] movs r1, 0x1A ldrsh r0, [r0, r1] @@ -284,7 +284,7 @@ sub_803B204: adds r0, 0x3C movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C pop {r4} pop {r0} bx r0 @@ -299,7 +299,7 @@ sub_803B284: ldr r6, _0803B338 ldr r0, [r6] ldr r0, [r0, 0x34] - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 ldr r0, [r6] ldr r0, [r0, 0x34] bl sub_80073B8 diff --git a/asm/code_803C1D0.s b/asm/code_803C1D0.s index 9637c5db1..f97a9750d 100644 --- a/asm/code_803C1D0.s +++ b/asm/code_803C1D0.s @@ -260,7 +260,7 @@ _0803C398: movs r0, 0 movs r1, 0x47 movs r2, 0x1 - bl sub_8001784 + bl GetScriptVarArrayValue negs r1, r0 orrs r1, r0 lsrs r5, r1, 31 @@ -270,7 +270,7 @@ _0803C3BA: movs r0, 0 movs r1, 0x47 movs r2, 0 - bl sub_8001784 + bl GetScriptVarArrayValue cmp r0, 0 beq _0803C3CE movs r5, 0x1 diff --git a/asm/code_803D110.s b/asm/code_803D110.s index 9549fb75e..6c0b66b90 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -1653,7 +1653,7 @@ _0803E156: bx r0 .align 2, 0 _0803E170: .4byte gGameOptionsRef -_0803E174: .4byte gUnknown_202D038 +_0803E174: .4byte gFontPalette thumb_func_end sub_803E13C thumb_func_start sub_803E178 diff --git a/asm/code_803E724.s b/asm/code_803E724.s index 8b840d877..ac3842db5 100644 --- a/asm/code_803E724.s +++ b/asm/code_803E724.s @@ -389,7 +389,7 @@ _0803EB70: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r0, _0803EB94 ldrb r0, [r0] cmp r0, 0 @@ -406,7 +406,7 @@ _0803EB98: ldr r0, _0803EBB4 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C ldr r0, _0803EBB8 ldrb r0, [r0] cmp r0, 0 @@ -504,7 +504,7 @@ _0803EC66: movs r1, 0 _0803EC6E: movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C b _0803EC84 .align 2, 0 _0803EC78: .4byte gUnknown_203B40C @@ -555,7 +555,7 @@ sub_803ECB4: adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C pop {r4,r5} pop {r0} bx r0 diff --git a/asm/code_8042B34.s b/asm/code_8042B34.s index 0201b1ce6..a24674e01 100644 --- a/asm/code_8042B34.s +++ b/asm/code_8042B34.s @@ -715,7 +715,7 @@ _0804300C: movs r0, 0 bl sub_800DAC0 movs r0, 0x1 - bl xxx_update_some_bg_tiles + bl UpdateFadeInTile bl sub_803DF60 bl sub_803E02C bl sub_8042E98 @@ -767,7 +767,7 @@ _080430D8: b _0804315E .align 2, 0 _0804310C: .4byte gUnknown_203B40C -_08043110: .4byte gUnknown_203B41C +_08043110: .4byte gSerializedData_203B41C _08043114: .4byte gDungeon _08043118: .4byte 0x0001cedb _0804311C: .4byte gUnknown_203B410 @@ -995,7 +995,7 @@ _08043318: strb r5, [r0] cmp r6, 0 bne _08043346 - bl sub_80840A4 + bl YetAnotherRandom24 ldr r1, [r4] movs r3, 0xD0 lsls r3, 3 @@ -1184,7 +1184,7 @@ _08043390: bl sub_80842F0 _080434A6: bl sub_803D8F0 - bl sub_8068658 + bl LoadDungeonPokemonSprites cmp r6, 0 bne _08043514 bl sub_80687AC @@ -1706,7 +1706,7 @@ _0804398C: .4byte gPtrClientFaintedMessage _08043990: .4byte 0x00000222 _08043994: .4byte gDungeonNameBannerPalette _08043998: .4byte gUnknown_203B40C -_0804399C: .4byte gUnknown_203B41C +_0804399C: .4byte gSerializedData_203B41C _080439A0: movs r0, 0x2 bl sub_8046F84 @@ -1999,7 +1999,7 @@ _08043BFC: str r0, [r1] b _08043C32 .align 2, 0 -_08043C20: .4byte gUnknown_203B41C +_08043C20: .4byte gSerializedData_203B41C _08043C24: .4byte 0x00000644 _08043C28: movs r0, 0x2 @@ -2083,7 +2083,7 @@ _08043CAC: bx r0 .align 2, 0 _08043CD0: .4byte gDungeon -_08043CD4: .4byte gUnknown_203B41C +_08043CD4: .4byte gSerializedData_203B41C thumb_func_end xxx_dungeon_8042F6C thumb_func_start sub_8043CD8 diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s index ee8f6a686..924630560 100644 --- a/asm/code_80450F8.s +++ b/asm/code_80450F8.s @@ -98,7 +98,7 @@ _0804540C: bl sub_8069F54 lsls r0, 16 asrs r0, 16 - bl sub_80687D0 + bl GetSpriteData str r0, [r4, 0x64] mov r1, r9 lsls r0, r1, 4 @@ -291,7 +291,7 @@ _0804557A: bl sub_8069F54 lsls r0, 16 asrs r0, 16 - bl sub_80687D0 + bl GetSpriteData str r0, [r4, 0x64] adds r0, r4, 0 adds r0, 0x68 diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s index c914762d0..bc6170a26 100644 --- a/asm/code_8045A00.s +++ b/asm/code_8045A00.s @@ -69,9 +69,9 @@ _08045E1E: ldr r0, _08045E3C b _08046048 .align 2, 0 -_08045E34: .4byte gUnknown_202DE58 +_08045E34: .4byte gFormatItems _08045E38: .4byte gAvailablePokemonNames -_08045E3C: .4byte gUnknown_80F8F88 +_08045E3C: .4byte gMonTerrifiedCouldntPickUpItem _08045E40: ldrb r0, [r5, 0x2] bl GetItemCategory @@ -94,8 +94,8 @@ _08045E40: ldr r0, _08045E78 b _08045FD0 .align 2, 0 -_08045E74: .4byte gUnknown_202DE58 -_08045E78: .4byte gUnknown_80F8FFC +_08045E74: .4byte gFormatItems +_08045E78: .4byte gPickedUpItem _08045E7C: ldr r0, _08045EA8 ldr r0, [r0] @@ -282,8 +282,8 @@ _08045FD0: b _08045FF2 .align 2, 0 _08045FDC: .4byte 0x00ff0008 -_08045FE0: .4byte gUnknown_202DE58 -_08045FE4: .4byte gUnknown_80F8FC4 +_08045FE0: .4byte gFormatItems +_08045FE4: .4byte gPickedUpItem2 _08045FE8: ldr r0, _08045FFC ldr r1, [r0] @@ -294,7 +294,7 @@ _08045FF2: bl sub_8052EC0 b _080460E0 .align 2, 0 -_08045FFC: .4byte gUnknown_80F8FF8 +_08045FFC: .4byte gPickedUpItemToolbox _08046000: movs r4, 0 cmp r4, r8 @@ -339,9 +339,9 @@ _08046048: bl SendMessage b _080460E0 .align 2, 0 -_08046054: .4byte gUnknown_202DE58 +_08046054: .4byte gFormatItems _08046058: .4byte gAvailablePokemonNames -_0804605C: .4byte gUnknown_80F8F54 +_0804605C: .4byte gMonSteppedOnItem _08046060: movs r0, 0xA5 lsls r0, 1 @@ -363,8 +363,8 @@ _08046060: ldr r0, _08046090 b _080460AC .align 2, 0 -_0804608C: .4byte gUnknown_202DE58 -_08046090: .4byte gUnknown_80F8FC4 +_0804608C: .4byte gFormatItems +_08046090: .4byte gPickedUpItem2 _08046094: adds r0, r5, 0 bl AddItemToInventory @@ -383,7 +383,7 @@ _080460AC: b _080460DA .align 2, 0 _080460B8: .4byte gAvailablePokemonNames -_080460BC: .4byte gUnknown_80F8FAC +_080460BC: .4byte gMonCouldntPickUpItem _080460C0: ldr r0, _080460F0 adds r1, r5, 0 @@ -408,8 +408,8 @@ _080460E0: pop {r0} bx r0 .align 2, 0 -_080460F0: .4byte gUnknown_202DE58 -_080460F4: .4byte gUnknown_80F8FF8 +_080460F0: .4byte gFormatItems +_080460F4: .4byte gPickedUpItemToolbox thumb_func_end sub_8045DB4 thumb_func_start sub_80460F8 @@ -1128,7 +1128,7 @@ _08046644: b _0804671E .align 2, 0 _08046688: .4byte gUnknown_80F4468 -_0804668C: .4byte gUnknown_202DE58 +_0804668C: .4byte gFormatItems _08046690: cmp r0, 0x2 beq _080466A4 @@ -1139,17 +1139,17 @@ _0804669A: ldr r0, _080466A0 b _080466B6 .align 2, 0 -_080466A0: .4byte gUnknown_80F93E8 +_080466A0: .4byte gItemFellOnGround _080466A4: ldr r0, _080466A8 b _080466B6 .align 2, 0 -_080466A8: .4byte gUnknown_80F9408 +_080466A8: .4byte gItemFellInWater _080466AC: ldr r0, _080466B0 b _080466B6 .align 2, 0 -_080466B0: .4byte gUnknown_80F9424 +_080466B0: .4byte gItemBuried _080466B4: ldr r0, _080466C4 _080466B6: @@ -1159,7 +1159,7 @@ _080466B6: bl sub_8052364 b _0804671E .align 2, 0 -_080466C4: .4byte gUnknown_80F949C +_080466C4: .4byte gItemFellOutOfSight _080466C8: mov r3, r8 lsls r1, r3, 16 @@ -1213,7 +1213,7 @@ _0804671E: pop {r0} bx r0 .align 2, 0 -_08046730: .4byte gUnknown_80F943C +_08046730: .4byte gItemLost thumb_func_end sub_804652C thumb_func_start sub_8046734 @@ -1726,7 +1726,7 @@ _08046B0A: .align 2, 0 _08046B2C: .4byte 0x0000052c _08046B30: .4byte 0x000004b4 -_08046B34: .4byte gUnknown_80F945C +_08046B34: .4byte gAllItemsLost _08046B38: .4byte 0x00000524 _08046B3C: ldr r0, _08046B4C @@ -1737,7 +1737,7 @@ _08046B3C: bl SendMessage b _08046C7C .align 2, 0 -_08046B4C: .4byte gUnknown_80F943C +_08046B4C: .4byte gItemLost _08046B50: .4byte 0x00000524 _08046B54: mov r0, r9 @@ -1901,7 +1901,7 @@ _08046C7C: pop {r0} bx r0 .align 2, 0 -_08046C90: .4byte gUnknown_80F947C +_08046C90: .4byte gSeveralItemsLost _08046C94: .4byte 0x00000524 _08046C98: .4byte gDungeon _08046C9C: .4byte 0x00018210 diff --git a/asm/code_8046CE4.s b/asm/code_8046CE4.s index a4d5ce0ba..80c6fec09 100644 --- a/asm/code_8046CE4.s +++ b/asm/code_8046CE4.s @@ -447,7 +447,7 @@ _080474B8: .4byte 0x00000195 _080474BC: .4byte gDungeon _080474C0: .4byte 0x0001c05e _080474C4: .4byte gAvailablePokemonNames -_080474C8: .4byte gUnknown_202DE58 +_080474C8: .4byte gFormatItems _080474CC: .4byte gUnknown_80F94C4 _080474D0: ldr r1, [sp, 0x260] @@ -479,7 +479,7 @@ _080474E2: b _08047524 .align 2, 0 _0804750C: .4byte gAvailablePokemonNames -_08047510: .4byte gUnknown_202DE58 +_08047510: .4byte gFormatItems _08047514: .4byte gUnknown_80F94D8 _08047518: ldr r0, _08047564 @@ -565,7 +565,7 @@ _080475A8: pop {r0} bx r0 .align 2, 0 -_080475BC: .4byte gUnknown_202DE58 +_080475BC: .4byte gFormatItems _080475C0: .4byte gUnknown_80F9530 thumb_func_end sub_8047190 @@ -952,7 +952,7 @@ _080478B8: b _08047904 .align 2, 0 _080478CC: .4byte 0xffffff00 -_080478D0: .4byte gUnknown_202DE58 +_080478D0: .4byte gFormatItems _080478D4: .4byte gAvailablePokemonNames _080478D8: .4byte gUnknown_80F94C4 _080478DC: diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index 2acfee959..14c1c6094 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -301,7 +301,7 @@ _080525D0: _080525F2: adds r0, r5, 0 add r1, sp, 0x4 - bl sub_8009190 + bl xxx_handle_format_global adds r5, r0, 0 ldrb r0, [r5] cmp r0, 0 @@ -950,7 +950,7 @@ _08052B14: ldrh r3, [r1] movs r1, 0 mov r2, r9 - bl sub_80141B4 + bl xxx_info_box_80141B4 _08052B3C: bl xxx_draw_string_80144C4 movs r0, 0x9 @@ -1565,7 +1565,7 @@ _08053016: _08053030: .4byte gUnknown_202B038 _08053034: .4byte gUnknown_202F1F0 _08053038: .4byte 0x0000f3ff -_0805303C: .4byte gUnknown_202D038 +_0805303C: .4byte gFontPalette _08053040: movs r2, 0x1 add r9, r2 @@ -1685,7 +1685,7 @@ _08053134: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0x9 bl sub_803E46C bl sub_8040238 @@ -1712,7 +1712,7 @@ _0805314C: pop {r0} bx r0 .align 2, 0 -_08053178: .4byte gUnknown_202D038 +_08053178: .4byte gFontPalette thumb_func_end sub_8052FB8 thumb_func_start sub_805317C @@ -6585,7 +6585,7 @@ _08055BBA: str r1, [sp, 0x4] b _08055C26 .align 2, 0 -_08055C08: .4byte gUnknown_202DE58 +_08055C08: .4byte gFormatItems _08055C0C: .4byte gUnknown_80F93C8 _08055C10: .4byte gUnknown_202F208 _08055C14: .4byte 0x00000159 @@ -6798,7 +6798,7 @@ _08055DB4: .align 2, 0 _08055DC4: .4byte gUnknown_80FC6A4 _08055DC8: .4byte 0x0000ffff -_08055DCC: .4byte gUnknown_202DE58 +_08055DCC: .4byte gFormatItems _08055DD0: .4byte gUnknown_80FD2DC _08055DD4: .4byte gUnknown_202F222 _08055DD8: .4byte gUnknown_80F4E70 @@ -7187,7 +7187,7 @@ _0805610C: .4byte 0x00003a0e _08056110: .4byte gNaturePowerMoveTable _08056114: .4byte gUnknown_80FECE0 _08056118: .4byte gAvailablePokemonNames -_0805611C: .4byte gUnknown_202DE58 +_0805611C: .4byte gFormatItems _08056120: .4byte gUnknown_80FC72C _08056124: mov r0, r10 @@ -7272,7 +7272,7 @@ _080561A0: b _08056188 .align 2, 0 _080561D4: .4byte gAvailablePokemonNames -_080561D8: .4byte gUnknown_202DE58 +_080561D8: .4byte gFormatItems _080561DC: .4byte gUnknown_80FC6D0 _080561E0: ldr r0, _0805620C @@ -7293,7 +7293,7 @@ _080561E0: bl SendMessage b _08056190 .align 2, 0 -_0805620C: .4byte gUnknown_202DE58 +_0805620C: .4byte gFormatItems _08056210: .4byte gUnknown_80FC6FC _08056214: ldr r0, _0805625C @@ -7643,7 +7643,7 @@ _080564BC: b _080564F2 .align 2, 0 _080564DC: .4byte gAvailablePokemonNames -_080564E0: .4byte gUnknown_202DE58 +_080564E0: .4byte gFormatItems _080564E4: ldr r0, _08056508 ldr r2, [sp, 0x24] @@ -7662,7 +7662,7 @@ _080564F2: bl sub_805239C b _08056518 .align 2, 0 -_08056508: .4byte gUnknown_202DE58 +_08056508: .4byte gFormatItems _0805650C: .4byte 0x00000163 _08056510: adds r0, r6, 0 diff --git a/asm/code_805D8C8.s b/asm/code_805D8C8.s index 2734a06c7..282179114 100644 --- a/asm/code_805D8C8.s +++ b/asm/code_805D8C8.s @@ -1587,7 +1587,7 @@ _08062650: adds r5, r0, 0 b _080626EA .align 2, 0 -_080626CC: .4byte gUnknown_202DE58 +_080626CC: .4byte gFormatItems _080626D0: .4byte gUnknown_80FE95C _080626D4: movs r0, 0x2 @@ -1717,7 +1717,7 @@ _0806276C: adds r5, r0, 0 b _080627FE .align 2, 0 -_080627E0: .4byte gUnknown_202DE58 +_080627E0: .4byte gFormatItems _080627E4: .4byte gUnknown_80FE960 _080627E8: movs r0, 0x2 @@ -1866,7 +1866,7 @@ sub_806285C: add r4, sp, 0x4 b _08062938 .align 2, 0 -_0806291C: .4byte gUnknown_202DE58 +_0806291C: .4byte gFormatItems _08062920: .4byte gUnknown_80FE964 _08062924: movs r0, 0x2 @@ -2165,7 +2165,7 @@ sub_8062B74: ldr r0, [r0, 0x70] mov r9, r0 movs r0, 0x2 - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 movs r0, 0x2 bl sub_80073B8 ldr r0, _08062BD0 @@ -2305,7 +2305,7 @@ _08062C8A: pop {r0} bx r0 .align 2, 0 -_08062CA0: .4byte gUnknown_202DE58 +_08062CA0: .4byte gFormatItems _08062CA4: .4byte gUnknown_8106C98 thumb_func_end sub_8062B74 @@ -2316,7 +2316,7 @@ sub_8062CA8: adds r4, r0, 0 ldr r5, [r4, 0x70] movs r0, 0x2 - bl sub_8008C54 + bl CallPrepareTextbox_8008C54 movs r0, 0x2 bl sub_80073B8 ldr r0, _08062CF8 @@ -2401,7 +2401,7 @@ _08062D52: pop {r0} bx r0 .align 2, 0 -_08062D60: .4byte gUnknown_202DE58 +_08062D60: .4byte gFormatItems _08062D64: .4byte gUnknown_8106C98 thumb_func_end sub_8062CA8 @@ -3543,7 +3543,7 @@ _08063676: pop {r0} bx r0 .align 2, 0 -_0806368C: .4byte gUnknown_202DE58 +_0806368C: .4byte gFormatItems _08063690: .4byte gUnknown_202EE10 _08063694: .4byte gUnknown_8106CC4 thumb_func_end sub_8063578 @@ -4127,7 +4127,7 @@ _08063AEC: .align 2, 0 _08063B1C: .4byte gDungeon _08063B20: .4byte 0x0001357c -_08063B24: .4byte gUnknown_202DE58 +_08063B24: .4byte gFormatItems _08063B28: .4byte 0x00000133 _08063B2C: .4byte gUnknown_80F8B40 _08063B30: @@ -4192,7 +4192,7 @@ sub_8063B54: .align 2, 0 _08063BA4: .4byte gDungeon _08063BA8: .4byte 0x0001357c -_08063BAC: .4byte gUnknown_202DE58 +_08063BAC: .4byte gFormatItems _08063BB0: .4byte 0x00000133 thumb_func_end sub_8063B54 @@ -4294,7 +4294,7 @@ _08063C5C: .align 2, 0 _08063C70: .4byte gDungeon _08063C74: .4byte 0x0001357c -_08063C78: .4byte gUnknown_202DE58 +_08063C78: .4byte gFormatItems _08063C7C: .4byte 0x00000119 _08063C80: .4byte gUnknown_202DEA8 _08063C84: .4byte 0x00000133 @@ -4447,7 +4447,7 @@ _08063D70: .align 2, 0 _08063D98: .4byte gDungeon _08063D9C: .4byte 0x0001357c -_08063DA0: .4byte gUnknown_202DE58 +_08063DA0: .4byte gFormatItems _08063DA4: .4byte 0x00000119 _08063DA8: .4byte 0x00000133 _08063DAC: .4byte gUnknown_80F8B88 @@ -4906,7 +4906,7 @@ _08064130: b _0806414E .align 2, 0 _08064140: .4byte gUnknown_202F2D8 -_08064144: .4byte gUnknown_202DE58 +_08064144: .4byte gFormatItems _08064148: .4byte gUnknown_80FDF00 _0806414C: ldr r0, _0806415C diff --git a/asm/code_805D8C8_1.s b/asm/code_805D8C8_1.s index a6dedbf9d..be8f4e4bc 100644 --- a/asm/code_805D8C8_1.s +++ b/asm/code_805D8C8_1.s @@ -648,7 +648,7 @@ _08068E1C: ldr r0, _08068E78 mov r1, r8 movs r2, 0 - bl sub_8092578 + bl WriteFriendAreaName ldr r0, _08068E7C ldr r1, [r0] movs r0, 0 @@ -690,7 +690,7 @@ _08068E52: movs r0, 0x1 b _08068E82 .align 2, 0 -_08068E78: .4byte gUnknown_202DE58 +_08068E78: .4byte gFormatItems _08068E7C: .4byte gUnknown_80FE1A4 _08068E80: movs r0, 0 diff --git a/asm/code_8066D04.s b/asm/code_8066D04.s index 3efc80e78..389223b99 100644 --- a/asm/code_8066D04.s +++ b/asm/code_8066D04.s @@ -54,7 +54,7 @@ _08066E54: ldr r0, _08066E7C b _08066F1E .align 2, 0 -_08066E78: .4byte gUnknown_202DE58 +_08066E78: .4byte gFormatItems _08066E7C: .4byte gUnknown_80F8BE0 _08066E80: ldr r1, [sp, 0x8] @@ -74,7 +74,7 @@ _08066E80: b _08066F1E .align 2, 0 _08066EA0: .4byte gUnknown_202DEA8 -_08066EA4: .4byte gUnknown_80F8C48 +_08066EA4: .4byte gItemStickyCannotMove3 _08066EA8: mov r2, r9 movs r3, 0x4 @@ -91,7 +91,7 @@ _08066EA8: ldr r0, _08066EC8 b _08066F1E .align 2, 0 -_08066EC8: .4byte gUnknown_80F8E54 +_08066EC8: .4byte gNoExchangesHere _08066ECC: adds r0, r6, 0 ldr r5, [r0] @@ -139,7 +139,7 @@ _08066F1E: b _08066F7E .align 2, 0 _08066F28: .4byte 0xffffff00 -_08066F2C: .4byte gUnknown_80F8E78 +_08066F2C: .4byte gNothingCanBePutDownHere _08066F30: ldr r3, [sp, 0x8] ldrb r0, [r3] @@ -185,9 +185,9 @@ _08066F7E: pop {r0} bx r0 .align 2, 0 -_08066F90: .4byte gUnknown_202DE58 +_08066F90: .4byte gFormatItems _08066F94: .4byte 0x0000014d -_08066F98: .4byte gUnknown_80F8EAC +_08066F98: .4byte gSwappedGroundItem _08066F9C: .4byte gDungeon _08066FA0: .4byte 0x00003a08 thumb_func_end sub_8066E14 @@ -236,8 +236,8 @@ sub_8066FA4: ldr r0, _08067004 b _0806709E .align 2, 0 -_08067000: .4byte gUnknown_202DE58 -_08067004: .4byte gUnknown_80F8C48 +_08067000: .4byte gFormatItems +_08067004: .4byte gItemStickyCannotMove3 _08067008: mov r0, r9 adds r0, 0x48 @@ -254,7 +254,7 @@ _08067008: ldr r0, _08067024 b _0806709E .align 2, 0 -_08067024: .4byte gUnknown_80F8C44 +_08067024: .4byte gItemStickyCannotMove2 _08067028: mov r1, r10 ldr r0, [r1, 0x14] @@ -266,7 +266,7 @@ _08067028: ldr r0, _0806703C b _0806709E .align 2, 0 -_0806703C: .4byte gUnknown_80F8E54 +_0806703C: .4byte gNoExchangesHere _08067040: mov r2, r10 ldr r0, [r2, 0x14] @@ -319,7 +319,7 @@ _0806709E: .align 2, 0 _080670A8: .4byte gUnknown_202DEA8 _080670AC: .4byte 0xffffff00 -_080670B0: .4byte gUnknown_80F8E78 +_080670B0: .4byte gNothingCanBePutDownHere _080670B4: ldr r1, [sp, 0x8] ldrb r0, [r1] @@ -358,7 +358,7 @@ _080670EE: bx r0 .align 2, 0 _08067100: .4byte 0x0000014d -_08067104: .4byte gUnknown_80F8EAC +_08067104: .4byte gSwappedGroundItem _08067108: .4byte gDungeon _0806710C: .4byte 0x00003a08 thumb_func_end sub_8066FA4 @@ -421,7 +421,7 @@ _08067188: pop {r0} bx r0 .align 2, 0 -_08067190: .4byte gUnknown_202DE58 +_08067190: .4byte gFormatItems _08067194: .4byte gAvailablePokemonNames _08067198: .4byte gDungeon _0806719C: .4byte 0x00003a08 @@ -459,7 +459,7 @@ sub_80671A0: ldr r0, _080671E4 b _08067230 .align 2, 0 -_080671E0: .4byte gUnknown_202DE58 +_080671E0: .4byte gFormatItems _080671E4: .4byte gUnknown_80F8BE0 _080671E8: ldrb r0, [r4, 0x2] @@ -485,7 +485,7 @@ _08067202: ldr r0, _0806721C b _08067230 .align 2, 0 -_08067218: .4byte gUnknown_202DE58 +_08067218: .4byte gFormatItems _0806721C: .4byte gUnknown_80F8BE0 _08067220: adds r0, r6, 0 @@ -680,9 +680,9 @@ _08067384: bl SendMessage b _080673C6 .align 2, 0 -_080673B0: .4byte gUnknown_202DE58 +_080673B0: .4byte gFormatItems _080673B4: .4byte gAvailablePokemonNames -_080673B8: .4byte gUnknown_80F8EC8 +_080673B8: .4byte gMonThrewItem2 _080673BC: ldr r0, _080673F8 ldr r1, [r0] @@ -712,7 +712,7 @@ _080673C6: str r1, [sp, 0xC] b _08067408 .align 2, 0 -_080673F8: .4byte gUnknown_80F8EC4 +_080673F8: .4byte gMonThrewItem1 _080673FC: .4byte 0xffff00ff _08067400: ldr r1, _0806741C @@ -908,7 +908,7 @@ sub_8067558: movs r0, 0 b _08067716 .align 2, 0 -_08067578: .4byte gUnknown_80F8EE4 +_08067578: .4byte gCannotTalk _0806757C: adds r0, r6, 0 bl sub_8070BC0 @@ -920,7 +920,7 @@ _0806757C: movs r0, 0 b _08067716 .align 2, 0 -_08067590: .4byte gUnknown_80F8EE4 +_08067590: .4byte gCannotTalk _08067594: adds r0, r6, 0 adds r1, r5, 0 @@ -1126,7 +1126,7 @@ _0806772A: pop {r0} bx r0 .align 2, 0 -_08067738: .4byte gUnknown_80F8EE4 +_08067738: .4byte gCannotTalk thumb_func_end sub_8067558 thumb_func_start sub_806773C @@ -1193,7 +1193,7 @@ sub_8067794: bl PrintFieldMessage b _0806786C .align 2, 0 -_080677B0: .4byte gUnknown_80F8F08 +_080677B0: .4byte gCannotFarewell _080677B4: ldr r0, _080677F0 adds r1, r7, 0 @@ -1225,12 +1225,12 @@ _080677B4: b _08067832 .align 2, 0 _080677F0: .4byte gAvailablePokemonNames -_080677F4: .4byte gUnknown_80F9094 +_080677F4: .4byte gSayFarewellQ _080677F8: .4byte gUnknown_80F913C _080677FC: .4byte gRecruitedPokemonRef _08067800: .4byte 0x00008df8 _08067804: .4byte gUnknown_80F9114 -_08067808: .4byte gUnknown_80F9154 +_08067808: .4byte gMonDisappointedAndLeft _0806780C: movs r2, 0xA ldrsh r0, [r4, r2] @@ -1245,7 +1245,7 @@ _0806780C: ldr r0, _08067828 b _0806782E .align 2, 0 -_08067828: .4byte gUnknown_80F90DC +_08067828: .4byte gSendMonBackQ _0806782C: ldr r0, _08067874 _0806782E: @@ -1283,8 +1283,8 @@ _0806786C: pop {r0} bx r0 .align 2, 0 -_08067874: .4byte gUnknown_80F90C8 -_08067878: .4byte gUnknown_80F9150 +_08067874: .4byte gSendMonBackWithItemQ +_08067878: .4byte gMonWentBack _0806787C: .4byte gAvailablePokemonNames _08067880: .4byte 0x0000021d thumb_func_end sub_8067794 @@ -1386,7 +1386,7 @@ sub_8067904: .align 2, 0 _08067940: .4byte gUnknown_202F208 _08067944: .4byte gAvailablePokemonNames -_08067948: .4byte gUnknown_80F8F20 +_08067948: .4byte gMonCringing _0806794C: adds r0, r6, 0 adds r0, 0xAC @@ -1405,7 +1405,7 @@ _08067962: b _08067A56 .align 2, 0 _0806796C: .4byte gAvailablePokemonNames -_08067970: .4byte gUnknown_80F8F38 +_08067970: .4byte gMonParalyzed _08067974: movs r0, 0xB0 lsls r0, 1 @@ -2118,7 +2118,7 @@ sub_8067F00: ldr r0, _08067F44 adds r1, r4, 0 movs r2, 0 - bl sub_8092578 + bl WriteFriendAreaName ldr r2, _08067F48 movs r0, 0 str r0, [sp] @@ -2164,7 +2164,7 @@ _08067F4C: .align 2, 0 _08067F8C: .4byte gAvailablePokemonNames _08067F90: .4byte gFormatData_202DE30 -_08067F94: .4byte gUnknown_202DE58 +_08067F94: .4byte gFormatItems _08067F98: .4byte gUnknown_8106E2C _08067F9C: ldr r0, _08067FCC @@ -2191,7 +2191,7 @@ _08067FA4: bl PrintFormatStringOnWindow b _08067FE6 .align 2, 0 -_08067FCC: .4byte gUnknown_202DE58 +_08067FCC: .4byte gFormatItems _08067FD0: .4byte gUnknown_8106E30 _08067FD4: .4byte gUnknown_8106E34 _08067FD8: @@ -3010,8 +3010,8 @@ _08068650: .4byte gDungeon _08068654: .4byte 0x000181e4 thumb_func_end sub_806863C - thumb_func_start sub_8068658 -sub_8068658: + thumb_func_start LoadDungeonPokemonSprites +LoadDungeonPokemonSprites: push {r4-r6,lr} movs r4, 0 ldr r6, _08068740 @@ -3029,7 +3029,7 @@ _08068664: ble _08068664 ldr r0, _0806874C movs r1, 0x1 - bl sub_8068838 + bl LoadPokemonSprite movs r4, 0 ldr r1, _08068744 ldr r0, [r1] @@ -3047,7 +3047,7 @@ _08068690: lsls r0, 16 asrs r0, 16 movs r1, 0x1 - bl sub_8068838 + bl LoadPokemonSprite adds r5, 0x8 adds r4, 0x1 ldr r0, [r6] @@ -3067,7 +3067,7 @@ _080686B2: cmp r0, 0 beq _080686CA movs r1, 0x1 - bl sub_8068838 + bl LoadPokemonSprite _080686CA: movs r4, 0 ldr r6, _08068758 @@ -3091,7 +3091,7 @@ _080686D0: movs r2, 0xE ldrsh r0, [r1, r2] movs r1, 0 - bl sub_8068838 + bl LoadPokemonSprite _080686F8: adds r4, 0x1 cmp r4, 0x3 @@ -3121,7 +3121,7 @@ _08068712: movs r1, 0x8 ldrsh r0, [r2, r1] movs r1, 0x1 - bl sub_8068838 + bl LoadPokemonSprite _08068732: adds r4, 0x1 cmp r4, 0x3 @@ -3141,6 +3141,6 @@ _08068758: .4byte gRecruitedPokemonRef _0806875C: .4byte 0x00008df8 _08068760: .4byte 0x00003a14 _08068764: .4byte 0x00008f88 - thumb_func_end sub_8068658 + thumb_func_end LoadDungeonPokemonSprites .align 2,0 diff --git a/asm/code_8069E0C.s b/asm/code_8069E0C.s index 879b8ae64..fcd6ad410 100644 --- a/asm/code_8069E0C.s +++ b/asm/code_8069E0C.s @@ -719,7 +719,7 @@ _0806A87A: pop {r0} bx r0 .align 2, 0 -_0806A890: .4byte gUnknown_202DE58 +_0806A890: .4byte gFormatItems _0806A894: .4byte gUnknown_80FEAC4 thumb_func_end sub_806A7E8 @@ -3234,7 +3234,7 @@ sub_806BB6C: ldr r0, [r7, 0x70] strh r5, [r0, 0x2] adds r0, r2, 0 - bl sub_80687D0 + bl GetSpriteData str r0, [r7, 0x64] adds r1, r7, 0 adds r1, 0x6A @@ -4677,12 +4677,12 @@ _0806C6A8: ldr r4, [sp, 0x38] str r4, [sp, 0x8] adds r0, r5, 0 - bl sub_80053AC + bl AxResInitFile_80053AC mov r10, r5 b _0806C704 _0806C6D6: ldr r0, _0806C774 - bl sub_80687D0 + bl GetSpriteData adds r5, r0, 0 bl Rand32Bit movs r1, 0x3 @@ -4699,7 +4699,7 @@ _0806C6D6: str r1, [sp, 0x8] adds r0, r4, 0 adds r1, r5, 0 - bl sub_80053AC + bl AxResInitFile_80053AC mov r10, r4 _0806C704: mov r2, r9 @@ -4749,12 +4749,12 @@ _0806C73C: cmp r0, 0 beq _0806C76A mov r0, r10 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC mov r0, r10 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC _0806C76A: mov r0, r10 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC b _0806C7E2 .align 2, 0 _0806C774: .4byte 0x000001a5 @@ -4780,9 +4780,9 @@ _0806C784: cmp r0, 0 bne _0806C7BC mov r0, r10 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC mov r0, r10 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC b _0806C7DC .align 2, 0 _0806C7B4: .4byte 0x0000066c @@ -4803,10 +4803,10 @@ _0806C7C8: cmp r0, 0x1 ble _0806C7DC mov r0, r10 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC _0806C7DC: mov r0, r10 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC _0806C7E2: ldr r1, [r6, 0xC] ldr r0, [r6, 0x14] diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s index 688796c49..0bd90c109 100644 --- a/asm/code_80718D8.s +++ b/asm/code_80718D8.s @@ -197,7 +197,7 @@ _08071F02: beq _08071EF8 movs r2, 0 ldrsh r0, [r5, r2] - bl sub_80687D0 + bl GetSpriteData ldr r1, [sp, 0xD0] cmp r0, 0 beq _08071EF8 @@ -305,7 +305,7 @@ _08071FE2: .align 2, 0 _08071FF4: .4byte gFormatData_202DE30 _08071FF8: .4byte gAvailablePokemonNames -_08071FFC: .4byte gUnknown_202DE58 +_08071FFC: .4byte gFormatItems _08072000: .4byte gUnknown_80FF730 _08072004: .4byte 0x00000149 thumb_func_end sub_8071DA4 @@ -496,7 +496,7 @@ _08072162: .align 2, 0 _08072174: .4byte gFormatData_202DE30 _08072178: .4byte gAvailablePokemonNames -_0807217C: .4byte gUnknown_202DE58 +_0807217C: .4byte gFormatItems _08072180: .4byte gUnknown_80FF730 _08072184: .4byte 0x00000149 _08072188: .4byte gUnknown_80F9B74 @@ -1439,7 +1439,7 @@ _08072894: b _08072928 .align 2, 0 _080728C8: .4byte gAvailablePokemonNames -_080728CC: .4byte gUnknown_202DE58 +_080728CC: .4byte gFormatItems _080728D0: .4byte gUnknown_80F9F04 _080728D4: mov r1, r8 @@ -1634,7 +1634,7 @@ _08072A0C: b _08072A8C .align 2, 0 _08072A44: .4byte gAvailablePokemonNames -_08072A48: .4byte gUnknown_202DE58 +_08072A48: .4byte gFormatItems _08072A4C: .4byte gUnknown_80F9F04 _08072A50: movs r0, 0 diff --git a/asm/code_807E5AC.s b/asm/code_807E5AC.s index 30e8ace2f..b7e573f24 100644 --- a/asm/code_807E5AC.s +++ b/asm/code_807E5AC.s @@ -434,7 +434,7 @@ _0807E9D8: ldrsh r0, [r4, r1] cmp r0, r9 beq _0807E9FE - bl sub_80687D0 + bl GetSpriteData str r0, [r5, 0x64] adds r0, r5, 0 bl sub_806CEBC diff --git a/asm/code_807FCD4.s b/asm/code_807FCD4.s index 37f196dc0..33fdb27a1 100644 --- a/asm/code_807FCD4.s +++ b/asm/code_807FCD4.s @@ -85,7 +85,7 @@ _08080848: bl sub_80522F4 b _08080870 .align 2, 0 -_0808085C: .4byte gUnknown_202DE58 +_0808085C: .4byte gFormatItems _08080860: .4byte gUnknown_80FDB04 _08080864: ldr r0, _08080880 diff --git a/asm/code_8080CF0.s b/asm/code_8080CF0.s index fe9ee30ab..454206a52 100644 --- a/asm/code_8080CF0.s +++ b/asm/code_8080CF0.s @@ -780,7 +780,7 @@ _0808294A: ldr r0, [r7, 0x70] strb r5, [r0, 0x6] mov r0, r8 - bl sub_80687D0 + bl GetSpriteData str r0, [r7, 0x64] lsls r0, r4, 4 adds r0, 0x40 @@ -939,7 +939,7 @@ _08082A70: ldr r0, [r7, 0x70] strb r4, [r0, 0x6] mov r0, r9 - bl sub_80687D0 + bl GetSpriteData str r0, [r7, 0x64] mov r1, r8 lsls r0, r1, 4 diff --git a/asm/code_808417C.s b/asm/code_808417C.s index 9a765506d..e311a9a49 100644 --- a/asm/code_808417C.s +++ b/asm/code_808417C.s @@ -405,7 +405,7 @@ _080844F0: _080844FC: .4byte gDungeon _08084500: .4byte 0x0000068a _08084504: .4byte gUnknown_80FA32C -_08084508: .4byte gUnknown_202DE58 +_08084508: .4byte gFormatItems _0808450C: .4byte gTeamInventoryRef _08084510: .4byte gUnknown_80FA448 _08084514: diff --git a/asm/code_8098468.s b/asm/code_8098468.s index c5976d74d..3f61e4154 100644 --- a/asm/code_8098468.s +++ b/asm/code_8098468.s @@ -32,7 +32,7 @@ xxx_script_related_8098468: _08098494: .4byte gUnknown_20398B4 _08098498: .4byte gUnknown_20398B9 _0809849C: .4byte gUnknown_20398B8 -_080984A0: .4byte gUnknown_20398BA +_080984A0: .4byte gScriptMode _080984A4: .4byte _080984A8 .align 2, 0 _080984A8: @@ -60,7 +60,7 @@ _080984D4: add r2, sp, 0x4 movs r0, 0x3 mov r1, sp - bl sub_8001B88 + bl GetScriptVarScenario ldr r2, _080984F4 movs r1, 0 ldr r0, [sp] @@ -101,7 +101,7 @@ _08098522: adds r0, r2, 0 strh r0, [r1] movs r0, 0 - bl xxx_update_some_bg_tiles + bl UpdateFadeInTile bl sub_8099648 bl sub_809975C bl sub_809D0AC @@ -113,10 +113,10 @@ _08098522: bl sub_809CB50 bl AllocGroundMapAction bl nullsub_117 - bl sub_80AD990 - bl sub_80A77F8 - bl sub_80ABB54 - bl sub_80ACB90 + bl AllocGroundEvents + bl AllocGroundLives + bl AllocGroundObjects + bl AllocGroundEffects bl sub_809A62C ldr r0, _080985BC movs r1, 0 @@ -136,11 +136,11 @@ _08098522: ldr r5, _080985D0 movs r0, 0 movs r1, 0xD - bl sub_8001658 + bl GetScriptVarValue strh r0, [r5] movs r0, 0 movs r1, 0xE - bl sub_8001658 + bl GetScriptVarValue ldr r1, _080985D4 str r0, [r1] ldr r0, _080985D8 @@ -219,20 +219,20 @@ _0809866A: ldr r2, [r0] movs r0, 0 movs r1, 0x16 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x25 movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue bl sub_8098C58 movs r0, 0 movs r1, 0x15 movs r2, 0x1 movs r3, 0x2 - bl sub_800226C + bl UpdateScriptVarWithImmediate movs r0, 0 movs r1, 0x13 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r4, r0, 16 movs r0, 0x1 @@ -243,16 +243,16 @@ _0809866A: bne _080986C0 movs r0, 0 movs r1, 0x14 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 - bl sub_80A2608 + bl GetDungeonInfo_80A2608 b _080986C6 .align 2, 0 _080986BC: .4byte gUnknown_20398B4 _080986C0: adds r0, r4, 0 - bl sub_80A2608 + bl GetDungeonInfo_80A2608 _080986C6: movs r1, 0xA ldrsh r7, [r0, r1] @@ -265,7 +265,7 @@ _080986C6: movs r0, 0 movs r1, 0x31 movs r3, 0x1 - bl sub_800199C + bl SetScriptVarArrayValue _080986E0: ldr r0, [r5] bl sub_8098FCC @@ -293,19 +293,19 @@ _0809870C: movs r0, 0 movs r1, 0x18 movs r2, 0x1 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0xF movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0xD movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0xE movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue movs r7, 0x71 b _08098756 .align 2, 0 @@ -328,13 +328,13 @@ _08098756: bne _080987C0 movs r0, 0 movs r1, 0xD - bl sub_8001658 + bl GetScriptVarValue adds r5, r0, 0 ldr r4, _08098794 ldr r2, [r4] movs r0, 0 movs r1, 0x18 - bl sub_80018D8 + bl SetScriptVarValue ldr r4, [r4] cmp r4, 0x1 beq _080987A6 @@ -345,7 +345,7 @@ _08098756: ldrsh r2, [r0, r1] movs r0, 0 movs r1, 0xF - bl sub_80018D8 + bl SetScriptVarValue b _080987A6 .align 2, 0 _08098790: .4byte gUnknown_20398B9 @@ -355,19 +355,19 @@ _0809879C: movs r0, 0 movs r1, 0xF adds r2, r5, 0 - bl sub_80018D8 + bl SetScriptVarValue _080987A6: ldr r0, _0809882C movs r1, 0 ldrsh r2, [r0, r1] movs r0, 0 movs r1, 0xD - bl sub_80018D8 + bl SetScriptVarValue ldr r0, _08098830 ldr r2, [r0] movs r0, 0 movs r1, 0xE - bl sub_80018D8 + bl SetScriptVarValue _080987C0: ldr r1, _08098834 movs r0, 0x2 @@ -394,10 +394,10 @@ _080987C0: bl sub_809A62C bl GroundMap_Reset bl sub_809D0BC - bl DeleteBlankGroundEvents - bl DeleteBlankGroundLives - bl DeleteBlankGroundObjects - bl DeleteBlankGroundEffects + bl DeleteGroundEvents + bl DeleteGroundLives + bl DeleteGroundObjects + bl DeleteGroundEffects bl sub_809C658 bl nullsub_16 bl sub_8097944 @@ -541,10 +541,10 @@ _08098988: _08098990: bl FreeGroundMapAction bl nullsub_118 - bl sub_80A78F0 - bl sub_80ABBD4 - bl sub_80ACC10 - bl sub_80ADA08 + bl FreeGroundLives + bl FreeGroundObjects + bl FreeGroundEffects + bl FreeGroundEvents bl sub_809CB74 bl sub_809A610 bl sub_809C618 @@ -605,46 +605,46 @@ _08098A30: movs r0, 0 movs r1, 0x13 adds r2, r4, 0 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x14 adds r2, r4, 0 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x18 movs r2, 0x4 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x16 movs r2, 0x4 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0xD - bl sub_8001658 + bl GetScriptVarValue adds r2, r0, 0 movs r0, 0 movs r1, 0xF - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0x5 b _08098BD2 _08098A72: movs r0, 0 movs r1, 0x13 movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x18 movs r2, 0x5 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x16 movs r2, 0x5 - bl sub_80018D8 + bl SetScriptVarValue movs r2, 0x1 negs r2, r2 movs r0, 0 movs r1, 0x13 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0x6 b _08098BD2 _08098AA0: @@ -659,27 +659,27 @@ _08098AA0: ldrsh r2, [r5, r0] movs r0, 0 movs r1, 0x13 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x14 adds r2, r4, 0 - bl sub_80018D8 + bl SetScriptVarValue ldrh r2, [r5] movs r0, 0 movs r1, 0x30 movs r3, 0x1 - bl sub_800199C + bl SetScriptVarArrayValue movs r0, 0 movs r1, 0x18 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x16 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x11 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 cmp r0, 0xA @@ -687,7 +687,7 @@ _08098AA0: movs r0, 0 movs r1, 0x11 movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue _08098B00: movs r0, 0x7 b _08098BD2 @@ -697,24 +697,24 @@ _08098B08: movs r0, 0 movs r1, 0x13 movs r2, 0x51 - bl sub_80018D8 + bl SetScriptVarValue ldr r0, _08098B54 movs r1, 0 ldrsh r2, [r0, r1] movs r0, 0 movs r1, 0x14 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x18 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x16 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x11 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 cmp r0, 0xA @@ -722,7 +722,7 @@ _08098B08: movs r0, 0 movs r1, 0x11 movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue _08098B4E: movs r0, 0x8 b _08098BD2 @@ -732,20 +732,20 @@ _08098B58: movs r0, 0 movs r1, 0x13 movs r2, 0x50 - bl sub_80018D8 + bl SetScriptVarValue ldr r0, _08098B88 ldrb r2, [r0] movs r0, 0 movs r1, 0x14 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x18 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x16 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0x9 b _08098BD2 .align 2, 0 @@ -754,21 +754,21 @@ _08098B8C: movs r0, 0 movs r1, 0x13 movs r2, 0x52 - bl sub_80018D8 + bl SetScriptVarValue ldr r0, _08098BBC movs r1, 0 ldrsh r2, [r0, r1] movs r0, 0 movs r1, 0x14 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x18 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0 movs r1, 0x16 movs r2, 0x7 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0xA b _08098BD2 .align 2, 0 @@ -777,7 +777,7 @@ _08098BC0: movs r0, 0 movs r1, 0x18 movs r2, 0x1 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0x10 bl FadeOutAllMusic movs r0, 0xE diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index 39a196645..3c6575f89 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -15,7 +15,7 @@ sub_80990EC: lsls r1, 16 asrs r4, r1, 16 adds r0, r4, 0 - bl sub_80A2608 + bl GetDungeonInfo_80A2608 mov r8, r0 ldrb r0, [r0, 0xC] movs r5, 0 @@ -229,11 +229,11 @@ sub_809927C: movs r0, 0 movs r1, 0x13 movs r2, 0x50 - bl sub_80018D8 + bl SetScriptVarValue ldrb r2, [r4] movs r0, 0 movs r1, 0x14 - bl sub_80018D8 + bl SetScriptVarValue ldr r4, _080992DC adds r0, r4, 0 adds r1, r5, 0 @@ -263,7 +263,7 @@ sub_80992E0: adds r5, r1, 0 movs r0, 0 movs r1, 0x13 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r1, r0, 16 movs r0, 0x1 @@ -279,7 +279,7 @@ sub_80992E0: strh r1, [r4] movs r0, 0 movs r1, 0x14 - bl sub_8001658 + bl GetScriptVarValue strh r0, [r5] movs r0, 0x1 b _08099322 @@ -302,17 +302,17 @@ sub_8099328: adds r4, r0, 0 movs r0, 0 movs r1, 0x13 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 cmp r0, 0x51 bne _08099358 movs r0, 0 movs r1, 0x14 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 - bl sub_80A2608 + bl GetDungeonInfo_80A2608 ldrb r0, [r0, 0xC] cmp r0, 0x3E bhi _08099358 @@ -333,7 +333,7 @@ sub_8099360: adds r4, r0, 0 movs r0, 0 movs r1, 0x13 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 cmp r0, 0x52 @@ -343,10 +343,10 @@ sub_8099360: _08099378: movs r0, 0 movs r1, 0x14 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 - bl sub_80A2608 + bl GetDungeonInfo_80A2608 ldrb r0, [r0, 0xC] strb r0, [r4] movs r0, 0x1 @@ -362,7 +362,7 @@ sub_8099394: adds r4, r0, 0 movs r0, 0 movs r1, 0x13 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 cmp r0, 0x50 @@ -372,7 +372,7 @@ sub_8099394: _080993AC: movs r0, 0 movs r1, 0x14 - bl sub_8001658 + bl GetScriptVarValue strb r0, [r4] movs r0, 0x1 _080993B8: @@ -432,14 +432,14 @@ sub_80993F0: adds r0, r2, 0 strh r0, [r1] movs r0, 0 - bl xxx_update_some_bg_tiles + bl UpdateFadeInTile movs r0, 0 movs r1, 0x14 bl sub_80095CC movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 movs r1, 0x14 bl sub_8009408 @@ -500,7 +500,7 @@ _080994B0: movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C bl GroundMap_Reset bl sub_809D0BC mov r0, r10 @@ -574,7 +574,7 @@ _08099540: add r0, sp, 0x10 movs r2, 0x80 lsls r2, 1 - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r2, [sp, 0x10] ldr r3, [sp, 0x14] movs r0, 0x2 @@ -739,7 +739,7 @@ sub_8099690: _080996BC: .4byte gUnknown_8116028 _080996C0: .4byte gSystemFileArchive _080996C4: .4byte gGameOptionsRef -_080996C8: .4byte gUnknown_202D078 +_080996C8: .4byte gFontPaletteAlt _080996CC: ldr r4, _080996D0 b _080996D6 diff --git a/asm/code_809A560.s b/asm/code_809A560.s index 7fe328120..7eff883d3 100644 --- a/asm/code_809A560.s +++ b/asm/code_809A560.s @@ -354,7 +354,7 @@ _0809ABA0: .align 2, 0 _0809ABA8: .4byte gAvailablePokemonNames _0809ABAC: .4byte gPlayerName -_0809ABB0: .4byte gUnknown_811617C +_0809ABB0: .4byte gSpeechBubbleChar thumb_func_end sub_809AB4C thumb_func_start sub_809ABB4 @@ -767,7 +767,7 @@ _0809AEA4: adds r0, r1 ldr r0, [r0] movs r1, 0 - bl sub_809A680 + bl xxx_script_textboxes_809A680 ldr r0, _0809AED4 ldr r0, [r0] adds r0, 0xC @@ -777,7 +777,7 @@ _0809AEA4: ldrh r1, [r1] adds r2, r6, 0 adds r3, r4, 0 - bl sub_809B2B8 + bl ScriptPrintText_809B2B8 b _0809AEE0 .align 2, 0 _0809AED0: .4byte gUnknown_8116134 @@ -804,7 +804,7 @@ sub_809AEEC: beq _0809AF1C movs r0, 0x2 movs r1, 0x1 - bl sub_809A680 + bl xxx_script_textboxes_809A680 ldr r0, _0809AF18 ldr r0, [r0] adds r0, 0xC @@ -812,7 +812,7 @@ sub_809AEEC: negs r2, r2 movs r1, 0xC2 adds r3, r4, 0 - bl sub_809B2B8 + bl ScriptPrintText_809B2B8 b _0809AF20 .align 2, 0 _0809AF18: .4byte gUnknown_3001B64 @@ -837,7 +837,7 @@ sub_809AF2C: beq _0809AF5C movs r0, 0x2 movs r1, 0x1 - bl sub_809A680 + bl xxx_script_textboxes_809A680 ldr r0, _0809AF58 ldr r0, [r0] adds r0, 0xC @@ -845,7 +845,7 @@ sub_809AF2C: negs r2, r2 movs r1, 0xC2 adds r3, r4, 0 - bl sub_809B2B8 + bl ScriptPrintText_809B2B8 b _0809AF60 .align 2, 0 _0809AF58: .4byte gUnknown_3001B64 @@ -870,7 +870,7 @@ sub_809AF6C: beq _0809AF9C movs r0, 0x3 movs r1, 0x1 - bl sub_809A680 + bl xxx_script_textboxes_809A680 ldr r0, _0809AF98 ldr r0, [r0] adds r0, 0xC @@ -878,7 +878,7 @@ sub_809AF6C: negs r2, r2 movs r1, 0x65 adds r3, r4, 0 - bl sub_809B2B8 + bl ScriptPrintText_809B2B8 b _0809AFA0 .align 2, 0 _0809AF98: .4byte gUnknown_3001B64 @@ -983,7 +983,7 @@ sub_809B028: adds r0, r1 ldr r0, [r0] movs r1, 0 - bl sub_809A680 + bl xxx_script_textboxes_809A680 ldr r0, _0809B088 ldr r1, [r0] ldr r0, _0809B08C @@ -1050,7 +1050,7 @@ _0809B09A: _0809B0D4: .4byte gUnknown_3001B64 _0809B0D8: .4byte gUnknown_8116148 _0809B0DC: .4byte gUnknown_202E5D8 -_0809B0E0: .4byte gUnknown_8116180 +_0809B0E0: .4byte gFormattedSpeechBubble _0809B0E4: ldr r0, _0809B134 ldr r1, _0809B138 @@ -1205,7 +1205,7 @@ _0809B1F8: _0809B202: movs r0, 0x4 movs r1, 0 - bl sub_809A680 + bl xxx_script_textboxes_809A680 ldr r0, _0809B254 ldr r1, [r0] ldr r2, _0809B258 @@ -1280,11 +1280,11 @@ _0809B288: _0809B290: .4byte gUnknown_3001B64 thumb_func_end sub_809B260 - thumb_func_start sub_809B294 -sub_809B294: + thumb_func_start ResetTextbox_809B294 +ResetTextbox_809B294: push {lr} movs r0, 0x3 - bl sub_80063D8 + bl SetCharacterMask ldr r0, _0809B2B4 ldr r0, [r0] adds r0, 0xC @@ -1292,15 +1292,15 @@ sub_809B294: negs r2, r2 movs r1, 0 movs r3, 0 - bl sub_809B2B8 + bl ScriptPrintText_809B2B8 pop {r0} bx r0 .align 2, 0 _0809B2B4: .4byte gUnknown_3001B64 - thumb_func_end sub_809B294 + thumb_func_end ResetTextbox_809B294 - thumb_func_start sub_809B2B8 -sub_809B2B8: + thumb_func_start ScriptPrintText_809B2B8 +ScriptPrintText_809B2B8: push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1330,7 +1330,7 @@ _0809B2E8: bl sub_8014490 movs r0, 0 movs r1, 0x1 - bl sub_809A680 + bl xxx_script_textboxes_809A680 b _0809B3FA _0809B2F6: movs r0, 0x1 @@ -1347,7 +1347,7 @@ _0809B2F6: b _0809B32A .align 2, 0 _0809B310: .4byte gUnknown_202E5D8 -_0809B314: .4byte gUnknown_8116180 +_0809B314: .4byte gFormattedSpeechBubble _0809B318: ldr r0, _0809B3D0 ldr r1, _0809B3D4 @@ -1473,10 +1473,10 @@ _0809B3FC: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_809B2B8 + thumb_func_end ScriptPrintText_809B2B8 - thumb_func_start sub_809B40C -sub_809B40C: + thumb_func_start IsTextboxOpen_809B40C +IsTextboxOpen_809B40C: push {lr} ldr r0, [r0, 0x4] cmp r0, 0 @@ -1493,7 +1493,7 @@ _0809B420: _0809B422: pop {r1} bx r1 - thumb_func_end sub_809B40C + thumb_func_end IsTextboxOpen_809B40C thumb_func_start sub_809B428 sub_809B428: @@ -1583,7 +1583,7 @@ _0809B4B0: ldr r0, [r4, 0x4] cmp r0, 0 beq _0809B4F2 - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, [r4, 0x4] bl _call_via_r0 lsls r0, 24 @@ -1602,7 +1602,7 @@ _0809B4B0: _0809B4E8: movs r0, 0 movs r1, 0x1 - bl sub_809A680 + bl xxx_script_textboxes_809A680 b _0809B56E _0809B4F2: ldrh r0, [r4] @@ -1667,7 +1667,7 @@ _0809B558: str r1, [r0] movs r0, 0 movs r1, 0x1 - bl sub_809A680 + bl xxx_script_textboxes_809A680 _0809B56E: bl sub_809B57C pop {r4-r6} @@ -1703,7 +1703,7 @@ sub_809B57C: bne _0809B5E4 ldr r1, [sp] movs r0, 0x1 - bl sub_809D9E0 + bl GroundScriptLock ldr r1, [r5] adds r2, r1, r4 movs r0, 0x3 @@ -1723,7 +1723,7 @@ _0809B5CC: cmp r4, 0 bne _0809B5E4 movs r0, 0 - bl sub_809D9B8 + bl GroundScriptLockJumpZero ldr r0, _0809B5FC ldr r0, [r0] str r4, [r0] @@ -1899,7 +1899,7 @@ _0809B772: cmp r0, 0x1 bne _0809B78A _0809B780: - bl sub_809B294 + bl ResetTextbox_809B294 _0809B784: movs r0, 0x1 bl _0809C394 @@ -1927,7 +1927,7 @@ _0809B7AC: ldr r0, [r0] cmp r0, 0x1 bne _0809B7F4 - bl sub_809B294 + bl ResetTextbox_809B294 ldr r1, [r6] ldr r2, _0809B7D8 adds r0, r1, r2 @@ -1990,7 +1990,7 @@ _0809B834: ldr r0, [r0] cmp r0, 0x1 bne _0809B85C - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, [r6] ldr r1, _0809B858 adds r0, r1 @@ -2039,7 +2039,7 @@ _0809B89C: ldr r0, [r0] cmp r0, 0x1 bne _0809B8C4 - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, [r6] ldr r3, _0809B8C0 adds r0, r3 @@ -2111,7 +2111,7 @@ _0809B932: _0809B93C: .4byte 0x0000042c _0809B940: .4byte gUnknown_81161B8 _0809B944: - bl sub_809B294 + bl ResetTextbox_809B294 ldr r4, _0809B984 ldr r0, [r4] movs r2, 0x84 @@ -2120,7 +2120,7 @@ _0809B944: ldr r0, [r0] cmp r0, 0x1 bne _0809B998 - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, [r4] ldr r3, _0809B988 adds r0, r3 @@ -2175,7 +2175,7 @@ _0809B9BC: bl sub_80151A4 bl _0809C392 _0809B9D2: - bl sub_809B294 + bl ResetTextbox_809B294 ldr r4, _0809BA08 ldr r0, [r4] movs r1, 0x84 @@ -2184,7 +2184,7 @@ _0809B9D2: ldr r0, [r0] cmp r0, 0x1 bne _0809BA1C - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, [r4] ldr r2, _0809BA0C adds r0, r2 @@ -2222,7 +2222,7 @@ _0809BA2A: ldr r0, [r0] cmp r0, 0x1 bne _0809BA68 - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, [r6] ldr r2, _0809BA5C adds r0, r2 @@ -2282,13 +2282,13 @@ _0809BAA8: bne _0809BB10 movs r0, 0 movs r1, 0x12 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 bl sub_80A2654 lsls r0, 16 asrs r4, r0, 16 - bl sub_809B294 + bl ResetTextbox_809B294 movs r0, 0x3 movs r1, 0 movs r2, 0xA @@ -2315,7 +2315,7 @@ _0809BAEA: movs r0, 0 movs r1, 0x12 adds r2, r5, 0 - bl sub_80018D8 + bl SetScriptVarValue _0809BB08: movs r0, 0x4 bl PlayMenuSoundEffect @@ -2340,7 +2340,7 @@ _0809BB20: asrs r2, 16 movs r0, 0 movs r1, 0x12 - bl sub_80018D8 + bl SetScriptVarValue ldr r0, [r6] movs r3, 0x86 lsls r3, 3 @@ -2366,7 +2366,7 @@ _0809BB66: ldr r0, [r0] cmp r0, 0x1 bne _0809BB9A - bl sub_809B294 + bl ResetTextbox_809B294 movs r0, 0x3 movs r1, 0 movs r2, 0xA @@ -2420,7 +2420,7 @@ _0809BBDA: ldr r0, [r0] cmp r0, 0x1 bne _0809BC14 - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, [r6] ldr r2, _0809BC10 adds r0, r2 @@ -2430,7 +2430,7 @@ _0809BBDA: movs r0, 0 movs r1, 0x18 movs r2, 0x1 - bl sub_80018D8 + bl SetScriptVarValue _0809BC02: movs r0, 0x1 bl sub_8011C28 @@ -2456,7 +2456,7 @@ _0809BC26: negs r4, r0 orrs r4, r0 lsrs r4, 31 - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl CreateKangaskhanStorage lsls r0, 24 @@ -2495,7 +2495,7 @@ _0809BC78: negs r4, r0 orrs r4, r0 lsrs r4, 31 - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl CreateFelicityBank lsls r0, 24 @@ -2522,7 +2522,7 @@ _0809BCBC: bl sub_80023E4 lsls r0, 24 lsrs r4, r0, 24 - bl sub_809B294 + bl ResetTextbox_809B294 ldr r0, _0809BCE0 ldr r0, [r0] ldr r2, _0809BCE4 @@ -2571,7 +2571,7 @@ _0809BD1C: negs r4, r0 orrs r4, r0 lsrs r4, 31 - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl sub_801FB50 lsls r0, 24 @@ -2604,10 +2604,10 @@ _0809BD64: ldr r0, [r0] cmp r0, 0x1 bne _0809BD84 - bl sub_809B294 + bl ResetTextbox_809B294 movs r0, 0 movs r1, 0x39 - bl sub_80015C0 + bl ClearScriptVarArray bl sub_802465C b _0809B784 _0809BD84: @@ -2615,7 +2615,7 @@ _0809BD84: adds r4, r0, 0 movs r0, 0 movs r1, 0x39 - bl sub_8001658 + bl GetScriptVarValue cmp r0, 0 bne _0809BDB2 bl HasEvolutionCompleted @@ -2625,7 +2625,7 @@ _0809BD84: movs r0, 0 movs r1, 0x39 movs r2, 0x1 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0x46 movs r1, 0 bl GroundMap_ExecuteEvent @@ -2663,7 +2663,7 @@ _0809BDE8: negs r4, r0 orrs r4, r0 lsrs r4, 31 - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl CreateWigglytuffShop lsls r0, 24 @@ -2716,7 +2716,7 @@ _0809BE50: .align 2, 0 _0809BE5C: .4byte gUnknown_8116248 _0809BE60: - bl sub_809B294 + bl ResetTextbox_809B294 movs r0, 0x98 lsls r0, 1 bl CreateHelperPelipperMenu @@ -2777,7 +2777,7 @@ _0809BED4: add r1, sp, 0x4 add r2, sp, 0x8 movs r0, 0x2 - bl sub_8001B88 + bl GetScriptVarScenario ldr r0, [sp, 0x8] cmp r0, 0x7 bgt _0809BF4E @@ -2858,7 +2858,7 @@ _0809BF82: add r1, sp, 0x14 add r2, sp, 0x18 movs r0, 0x2 - bl sub_8001B88 + bl GetScriptVarScenario add r4, sp, 0x1C ldr r1, [sp, 0x18] lsls r1, 24 @@ -2883,18 +2883,18 @@ _0809BFA4: _0809BFB8: movs r0, 0 movs r1, 0x19 - bl sub_8001658 + bl GetScriptVarValue cmp r0, 0x63 bgt _0809BFCE adds r2, r0, 0x1 movs r0, 0 movs r1, 0x19 - bl sub_80018D8 + bl SetScriptVarValue _0809BFCE: movs r0, 0 movs r1, 0x39 movs r2, 0x1 - bl sub_80018D8 + bl SetScriptVarValue ldr r1, [sp, 0x14] ldr r2, [sp, 0x18] adds r2, 0x1 @@ -2927,7 +2927,7 @@ _0809BFFC: asrs r4, 31 movs r0, 0x4 ands r4, r0 - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl MakuhitaDojo_New lsls r0, 24 @@ -2974,7 +2974,7 @@ _0809C072: beq _0809C082 movs r4, 0x5 _0809C082: - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl MakuhitaDojo_New lsls r0, 24 @@ -3008,7 +3008,7 @@ _0809C0B8: beq _0809C0C8 movs r4, 0x6 _0809C0C8: - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl MakuhitaDojo_New lsls r0, 24 @@ -3039,7 +3039,7 @@ _0809C0FC: beq _0809C10C movs r4, 0x7 _0809C10C: - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r4, 0 bl MakuhitaDojo_New lsls r0, 24 @@ -3083,7 +3083,7 @@ _0809C158: .align 2, 0 _0809C164: .4byte gUnknown_81162D8 _0809C168: - bl sub_809B294 + bl ResetTextbox_809B294 bl sub_803B050 lsls r0, 24 cmp r0, 0 @@ -3124,7 +3124,7 @@ _0809C1BC: str r1, [r0] b _0809C392 _0809C1C2: - bl sub_809B294 + bl ResetTextbox_809B294 b _0809C392 _0809C1C8: movs r0, 0x2 @@ -3187,7 +3187,7 @@ _0809C238: ldr r3, _0809C26C adds r0, r3 ldrb r4, [r0] - bl sub_809B294 + bl ResetTextbox_809B294 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x1 @@ -3220,11 +3220,11 @@ _0809C280: ldr r0, [r0] cmp r0, 0x1 bne _0809C2B8 - bl sub_809B294 + bl ResetTextbox_809B294 movs r0, 0 movs r1, 0x1 movs r2, 0x1 - bl sub_800641C + bl xxx_call_save_unk_text_struct_800641C movs r0, 0 movs r1, 0 movs r2, 0 @@ -3272,7 +3272,7 @@ _0809C2CA: b _0809C318 .align 2, 0 _0809C304: .4byte gTeamInventoryRef -_0809C308: .4byte gUnknown_202DE58 +_0809C308: .4byte gFormatItems _0809C30C: ldr r0, [r6] movs r3, 0x86 @@ -3300,7 +3300,7 @@ _0809C32A: ldr r0, [r0] cmp r0, 0x1 bne _0809C36C - bl sub_809B294 + bl ResetTextbox_809B294 ldr r1, [r4] ldr r3, _0809C368 adds r0, r1, r3 diff --git a/asm/code_809C5C4.s b/asm/code_809C5C4.s index a02b190ec..5dcc2f747 100644 --- a/asm/code_809C5C4.s +++ b/asm/code_809C5C4.s @@ -107,7 +107,7 @@ _0809CC82: pop {r1} bx r1 .align 2, 0 -_0809CC8C: .4byte gUnknown_202DE58 +_0809CC8C: .4byte gFormatItems thumb_func_end sub_809CBBC thumb_func_start sub_809CC90 @@ -209,7 +209,7 @@ _0809CD44: .4byte gUnknown_20399E0 thumb_func_start sub_809CD48 sub_809CD48: push {lr} - bl sub_809A750 + bl IsTextboxOpen_809A750 lsls r0, 24 cmp r0, 0 bne _0809CD58 @@ -505,7 +505,7 @@ _0809CF4E: b _0809CFDA _0809CF54: movs r0, 0x2 - bl sub_809D9B8 + bl GroundScriptLockJumpZero b _0809CFCC _0809CF5C: add r0, sp, 0x4 diff --git a/asm/code_80A26CC_1.s b/asm/code_80A26CC_1.s index ac1ebf672..5cac0b91e 100644 --- a/asm/code_80A26CC_1.s +++ b/asm/code_80A26CC_1.s @@ -3633,8 +3633,8 @@ sub_80A4620: _080A4638: .4byte 0x00000449 thumb_func_end sub_80A4620 - thumb_func_start sub_80A463C -sub_80A463C: + thumb_func_start GetDungeonBounds +GetDungeonBounds: movs r3, 0 str r3, [r1] str r3, [r1, 0x4] @@ -3652,7 +3652,7 @@ sub_80A463C: bx lr .align 2, 0 _080A465C: .4byte 0x00000449 - thumb_func_end sub_80A463C + thumb_func_end GetDungeonBounds thumb_func_start sub_80A4660 sub_80A4660: diff --git a/asm/dungeon_2.s b/asm/dungeon_2.s index d1dabc363..0053e15c0 100644 --- a/asm/dungeon_2.s +++ b/asm/dungeon_2.s @@ -323,7 +323,7 @@ _080905D0: .4byte gUnknown_8115C4C _080905D4: .4byte gUnknown_8108F42 _080905D8: .4byte gUnknown_8108F4A _080905DC: .4byte gDungeons -_080905E0: .4byte gUnknown_202DE58 +_080905E0: .4byte gFormatItems _080905E4: .4byte gUnknown_8115CB8 _080905E8: ldr r0, _080906A0 diff --git a/asm/dungeon_map_access.s b/asm/dungeon_map_access.s index b5af22572..7459c5d01 100644 --- a/asm/dungeon_map_access.s +++ b/asm/dungeon_map_access.s @@ -701,7 +701,7 @@ _0804A0E8: .4byte 0x00011884 _0804A0EC: .4byte 0x00012bda _0804A0F0: .4byte 0x00012bec _0804A0F4: .4byte 0x00012bfe -_0804A0F8: .4byte gUnknown_202C838 +_0804A0F8: .4byte gFontTilesExtra_202C838 _0804A0FC: movs r1, 0x80 lsls r1, 5 @@ -1062,7 +1062,7 @@ _0804A386: b _0804A476 .align 2, 0 _0804A3AC: .4byte 0x00011884 -_0804A3B0: .4byte gUnknown_202C838 +_0804A3B0: .4byte gFontTilesExtra_202C838 _0804A3B4: .4byte 0x00012bda _0804A3B8: movs r3, 0x80 @@ -1395,7 +1395,7 @@ _0804A60C: b _0804A702 .align 2, 0 _0804A638: .4byte 0x00011884 -_0804A63C: .4byte gUnknown_202C838 +_0804A63C: .4byte gFontTilesExtra_202C838 _0804A640: .4byte 0x00012bda _0804A644: movs r2, 0x80 @@ -1809,7 +1809,7 @@ _0804A92C: b _0804AA20 .align 2, 0 _0804A968: .4byte 0x00013554 -_0804A96C: .4byte gUnknown_202C038 +_0804A96C: .4byte gFontTiles_202C038 _0804A970: .4byte 0x00012b92 _0804A974: lsls r0, r5, 1 diff --git a/asm/event_flag.s b/asm/event_flag.s index b27cb46c0..a0fa0af68 100644 --- a/asm/event_flag.s +++ b/asm/event_flag.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8001570 -sub_8001570: + thumb_func_start ResetScriptVarArray +ResetScriptVarArray: push {r4-r7,lr} adds r7, r0, 0 lsls r1, 16 @@ -19,7 +19,7 @@ sub_8001570: b _08001590 .align 2, 0 _08001584: .4byte 0x000003ff -_08001588: .4byte gUnknown_80B7394 +_08001588: .4byte gScriptVarInfo _0800158C: lsls r1, r6, 4 ldr r0, _08001598 @@ -35,7 +35,7 @@ _0800159C: adds r0, r7, 0 adds r1, r6, 0 adds r2, r4, 0 - bl sub_800199C + bl SetScriptVarArrayValue adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -47,10 +47,10 @@ _080015B0: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8001570 + thumb_func_end ResetScriptVarArray - thumb_func_start sub_80015C0 -sub_80015C0: + thumb_func_start ClearScriptVarArray +ClearScriptVarArray: push {r4-r7,lr} adds r7, r0, 0 lsls r1, 16 @@ -63,7 +63,7 @@ sub_80015C0: b _080015E0 .align 2, 0 _080015D4: .4byte 0x000003ff -_080015D8: .4byte gUnknown_80B7394 +_080015D8: .4byte gScriptVarInfo _080015DC: lsls r1, r6, 4 ldr r0, _080015E8 @@ -78,7 +78,7 @@ _080015EC: adds r1, r6, 0 adds r2, r4, 0 movs r3, 0 - bl sub_800199C + bl SetScriptVarArrayValue adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -90,10 +90,10 @@ _080015FE: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_80015C0 + thumb_func_end ClearScriptVarArray - thumb_func_start sub_800160C -sub_800160C: + thumb_func_start GetScriptVarRef +GetScriptVarRef: push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -113,8 +113,8 @@ sub_800160C: b _0800164C .align 2, 0 _08001630: .4byte 0x000003ff -_08001634: .4byte gUnknown_80B7394 -_08001638: .4byte gUnknown_2000A88 +_08001634: .4byte gScriptVarInfo +_08001638: .4byte gScriptVarBuffer _0800163C: lsls r1, 4 ldr r0, _08001654 @@ -131,10 +131,10 @@ _0800164C: bx r0 .align 2, 0 _08001654: .4byte 0x080b2d30 - thumb_func_end sub_800160C + thumb_func_end GetScriptVarRef - thumb_func_start sub_8001658 -sub_8001658: + thumb_func_start GetScriptVarValue +GetScriptVarValue: push {r4,lr} sub sp, 0x8 adds r2, r0, 0 @@ -143,7 +143,7 @@ sub_8001658: mov r0, sp adds r1, r2, 0 adds r2, r4, 0 - bl sub_800160C + bl GetScriptVarRef ldr r0, [sp] ldrh r0, [r0] subs r0, 0x1 @@ -235,7 +235,7 @@ _08001700: .4byte _08001754 .4byte _08001764 _08001734: - bl sub_8098F94 + bl GetScriptMode adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -245,11 +245,11 @@ _0800173E: lsrs r0, 31 b _0800177A _08001746: - bl sub_808D480 + bl GetFriendSum_808D480 b _0800177A _0800174C: movs r0, 0 - bl sub_808D544 + bl GetUnitSum_808D544 b _0800177A _08001754: ldr r0, _08001760 @@ -277,11 +277,11 @@ _0800177A: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8001658 + thumb_func_end GetScriptVarValue @ https://decomp.me/scratch/xF3HH - thumb_func_start sub_8001784 -sub_8001784: + thumb_func_start GetScriptVarArrayValue +GetScriptVarArrayValue: push {r4,r5,lr} sub sp, 0x8 adds r3, r0, 0 @@ -292,7 +292,7 @@ sub_8001784: mov r0, sp adds r1, r3, 0 adds r2, r5, 0 - bl sub_800160C + bl GetScriptVarRef ldr r0, [sp] ldrh r0, [r0] subs r0, 0x1 @@ -399,7 +399,7 @@ _08001850: .4byte _080018A4 .4byte _080018B8 _08001884: - bl sub_8098F94 + bl GetScriptMode adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -409,11 +409,11 @@ _0800188E: lsrs r0, 31 b _080018CE _08001896: - bl sub_808D480 + bl GetFriendSum_808D480 b _080018CE _0800189C: movs r0, 0 - bl sub_808D544 + bl GetUnitSum_808D544 b _080018CE _080018A4: ldr r0, _080018B4 @@ -442,10 +442,10 @@ _080018CE: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8001784 + thumb_func_end GetScriptVarArrayValue - thumb_func_start sub_80018D8 -sub_80018D8: + thumb_func_start SetScriptVarValue +SetScriptVarValue: push {r4,r5,lr} sub sp, 0x8 adds r3, r0, 0 @@ -455,7 +455,7 @@ sub_80018D8: mov r0, sp adds r1, r3, 0 adds r2, r5, 0 - bl sub_800160C + bl GetScriptVarRef ldr r0, [sp] ldrh r0, [r0] subs r0, 0x1 @@ -545,10 +545,10 @@ _08001990: bx r0 .align 2, 0 _08001998: .4byte gTeamInventoryRef - thumb_func_end sub_80018D8 + thumb_func_end SetScriptVarValue - thumb_func_start sub_800199C -sub_800199C: + thumb_func_start SetScriptVarArrayValue +SetScriptVarArrayValue: push {r4-r7,lr} sub sp, 0x8 adds r4, r0, 0 @@ -560,7 +560,7 @@ sub_800199C: mov r0, sp adds r1, r4, 0 adds r2, r7, 0 - bl sub_800160C + bl GetScriptVarRef ldr r0, [sp] ldrh r0, [r0] subs r0, 0x1 @@ -659,6 +659,6 @@ _08001A68: bx r0 .align 2, 0 _08001A70: .4byte gTeamInventoryRef - thumb_func_end sub_800199C + thumb_func_end SetScriptVarArrayValue .align 2, 0 @ Don't pad with nop. diff --git a/asm/ground_effect.s b/asm/ground_effect.s index ca0ad8c53..2e460d240 100644 --- a/asm/ground_effect.s +++ b/asm/ground_effect.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80ACB90 -sub_80ACB90: + thumb_func_start AllocGroundEffects +AllocGroundEffects: push {r4,r5,lr} ldr r4, _080ACBCC movs r0, 0xE2 @@ -32,17 +32,17 @@ _080ACBB0: adds r1, r4 cmp r0, 0xF ble _080ACBB0 - bl DeleteBlankGroundEffects + bl DeleteGroundEffects pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080ACBCC: .4byte gUnknown_3001B8C +_080ACBCC: .4byte gGroundEffects _080ACBD0: .4byte 0x0000ffff - thumb_func_end sub_80ACB90 + thumb_func_end AllocGroundEffects - thumb_func_start DeleteBlankGroundEffects -DeleteBlankGroundEffects: + thumb_func_start DeleteGroundEffects +DeleteGroundEffects: push {r4-r6,lr} ldr r0, _080ACC0C ldr r4, [r0] @@ -73,13 +73,13 @@ _080ACBF2: pop {r0} bx r0 .align 2, 0 -_080ACC0C: .4byte gUnknown_3001B8C - thumb_func_end DeleteBlankGroundEffects +_080ACC0C: .4byte gGroundEffects + thumb_func_end DeleteGroundEffects - thumb_func_start sub_80ACC10 -sub_80ACC10: + thumb_func_start FreeGroundEffects +FreeGroundEffects: push {r4,lr} - bl DeleteBlankGroundEffects + bl DeleteGroundEffects ldr r4, _080ACC28 ldr r0, [r4] bl MemoryFree @@ -89,8 +89,8 @@ sub_80ACC10: pop {r0} bx r0 .align 2, 0 -_080ACC28: .4byte gUnknown_3001B8C - thumb_func_end sub_80ACC10 +_080ACC28: .4byte gGroundEffects + thumb_func_end FreeGroundEffects thumb_func_start GroundEffect_Select GroundEffect_Select: @@ -105,7 +105,7 @@ GroundEffect_Select: asrs r6, r2, 24 ldr r1, _080ACC90 adds r0, r4, 0 - bl sub_80A77D0 + bl GetGroundScript adds r5, r0, 0 ldr r1, _080ACC94 str r6, [sp] @@ -204,7 +204,7 @@ _080ACCE2: bx r0 .align 2, 0 _080ACD00: .4byte gUnknown_8118640 -_080ACD04: .4byte gUnknown_3001B8C +_080ACD04: .4byte gGroundEffects thumb_func_end GroundEffect_Cancel thumb_func_start GroundEffect_CancelBlank @@ -243,7 +243,7 @@ _080ACD2C: lsls r1, 1 adds r0, r4, r1 mov r1, sp - bl sub_80A675C + bl IsOnscreen_80A675C lsls r0, 24 cmp r0, 0 bne _080ACD5C @@ -267,7 +267,7 @@ _080ACD5C: bx r0 .align 2, 0 _080ACD7C: .4byte gUnknown_8118658 -_080ACD80: .4byte gUnknown_3001B8C +_080ACD80: .4byte gGroundEffects thumb_func_end GroundEffect_CancelBlank thumb_func_start sub_80ACD84 @@ -291,7 +291,7 @@ _080ACD9A: adds r0, r3, 0 b _080ACDBC .align 2, 0 -_080ACDA8: .4byte gUnknown_3001B8C +_080ACDA8: .4byte gGroundEffects _080ACDAC: adds r0, r2, 0 adds r2, r5 @@ -343,8 +343,8 @@ GroundEffect_Add: movs r6, 0 b _080ACE38 .align 2, 0 -_080ACE08: .4byte gFunctionScriptData -_080ACE0C: .4byte gUnknown_3001B8C +_080ACE08: .4byte gGroundEffectTypes +_080ACE0C: .4byte gGroundEffects _080ACE10: adds r0, r2, 0x1 lsls r0, 16 @@ -582,7 +582,7 @@ _080ACFD2: adds r0, 0x28 adds r1, r5, 0 adds r1, 0x30 - bl sub_80A5778 + bl GetCurrentDungeonBounds ldr r0, [sp, 0xC] cmp r0, 0 beq _080AD01A @@ -646,7 +646,7 @@ _080AD04C: adds r0, r4, 0 movs r1, 0 movs r2, 0 - bl sub_809D8C0 + bl ExecutePredefinedScript _080AD060: adds r0, r6, 0 _080AD062: @@ -659,7 +659,7 @@ _080AD062: pop {r1} bx r1 .align 2, 0 -_080AD074: .4byte gUnknown_8118544 +_080AD074: .4byte gGroundEffectCallbacks _080AD078: .4byte gFunctionScriptTable _080AD07C: .4byte gUnknown_81186CC thumb_func_end GroundEffect_Add @@ -687,14 +687,14 @@ GroundEffect_Delete: bl sub_80A7714 adds r0, r4, 0 adds r0, 0x38 - bl sub_809D648 + bl InitAction2 ldr r0, _080AD0C4 strh r0, [r4, 0x6] pop {r4} pop {r0} bx r0 .align 2, 0 -_080AD0BC: .4byte gUnknown_3001B8C +_080AD0BC: .4byte gGroundEffects _080AD0C0: .4byte gUnknown_81186D8 _080AD0C4: .4byte 0x0000ffff thumb_func_end GroundEffect_Delete @@ -733,7 +733,7 @@ _080AD102: pop {r0} bx r0 .align 2, 0 -_080AD108: .4byte gUnknown_3001B8C +_080AD108: .4byte gGroundEffects thumb_func_end sub_80AD0C8 thumb_func_start sub_80AD10C @@ -773,7 +773,7 @@ _080AD14A: pop {r0} bx r0 .align 2, 0 -_080AD150: .4byte gUnknown_3001B8C +_080AD150: .4byte gGroundEffects _080AD154: .4byte 0x337fffff thumb_func_end sub_80AD10C @@ -799,7 +799,7 @@ sub_80AD158: movs r0, 0 b _080AD188 .align 2, 0 -_080AD180: .4byte gUnknown_3001B8C +_080AD180: .4byte gGroundEffects _080AD184: adds r0, r2, 0 adds r0, 0x38 @@ -833,13 +833,13 @@ sub_80AD18C: movs r0, 0 b _080AD1CC .align 2, 0 -_080AD1B8: .4byte gUnknown_3001B8C +_080AD1B8: .4byte gGroundEffects _080AD1BC: adds r0, r2, 0 adds r0, 0x38 adds r1, r4, 0 adds r2, r3, 0 - bl sub_809D6E4 + bl GetPredefinedScript lsls r0, 24 lsrs r0, 24 _080AD1CC: @@ -877,7 +877,7 @@ GroundEffect_ExecuteScript: movs r0, 0 b _080AD22C .align 2, 0 -_080AD20C: .4byte gUnknown_3001B8C +_080AD20C: .4byte gGroundEffects _080AD210: .4byte gUnknown_81186F4 _080AD214: adds r0, r4, 0 @@ -899,8 +899,8 @@ _080AD22C: _080AD234: .4byte gUnknown_811872C thumb_func_end GroundEffect_ExecuteScript - thumb_func_start sub_80AD238 -sub_80AD238: + thumb_func_start GroundEffectsNotifyAll +GroundEffectsNotifyAll: push {r4-r7,lr} mov r7, r8 push {r7} @@ -922,7 +922,7 @@ _080AD252: adds r0, r4, 0 adds r0, 0x38 adds r1, r7, 0 - bl sub_809D968 + bl GroundScriptNotify orrs r5, r0 lsls r0, r5, 24 lsrs r5, r0, 24 @@ -944,11 +944,11 @@ _080AD26A: pop {r1} bx r1 .align 2, 0 -_080AD28C: .4byte gUnknown_3001B8C - thumb_func_end sub_80AD238 +_080AD28C: .4byte gGroundEffects + thumb_func_end GroundEffectsNotifyAll - thumb_func_start sub_80AD290 -sub_80AD290: + thumb_func_start GroundEffectsCancelAll +GroundEffectsCancelAll: push {r4-r7,lr} ldr r0, _080AD2D4 ldr r4, [r0] @@ -984,8 +984,8 @@ _080AD2B6: pop {r1} bx r1 .align 2, 0 -_080AD2D4: .4byte gUnknown_3001B8C - thumb_func_end sub_80AD290 +_080AD2D4: .4byte gGroundEffects + thumb_func_end GroundEffectsCancelAll thumb_func_start sub_80AD2D8 sub_80AD2D8: @@ -1003,7 +1003,7 @@ sub_80AD2D8: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080AD2F4: .4byte gUnknown_3001B8C +_080AD2F4: .4byte gGroundEffects thumb_func_end sub_80AD2D8 thumb_func_start sub_80AD2F8 @@ -1027,7 +1027,7 @@ sub_80AD2F8: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080AD31C: .4byte gUnknown_3001B8C +_080AD31C: .4byte gGroundEffects thumb_func_end sub_80AD2F8 thumb_func_start sub_80AD320 @@ -1055,7 +1055,7 @@ sub_80AD320: str r0, [r3, 0x4] b _080AD358 .align 2, 0 -_080AD34C: .4byte gUnknown_3001B8C +_080AD34C: .4byte gGroundEffects _080AD350: ldr r0, [r2, 0xC] ldr r1, [r2, 0x10] @@ -1092,7 +1092,7 @@ sub_80AD360: str r0, [r3] b _080AD3AA .align 2, 0 -_080AD38C: .4byte gUnknown_3001B8C +_080AD38C: .4byte gGroundEffects _080AD390: movs r1, 0x92 lsls r1, 1 @@ -1136,7 +1136,7 @@ sub_80AD3B4: pop {r1} bx r1 .align 2, 0 -_080AD3DC: .4byte gUnknown_3001B8C +_080AD3DC: .4byte gGroundEffects thumb_func_end sub_80AD3B4 thumb_func_start sub_80AD3E0 @@ -1261,24 +1261,24 @@ _080AD49C: bx r1 thumb_func_end sub_80AD430 - thumb_func_start sub_80AD4B8 -sub_80AD4B8: + thumb_func_start CallbackEffectGetIndex +CallbackEffectGetIndex: movs r1, 0x4 ldrsh r0, [r0, r1] bx lr - thumb_func_end sub_80AD4B8 + thumb_func_end CallbackEffectGetIndex - thumb_func_start sub_80AD4C0 -sub_80AD4C0: + thumb_func_start CallbackEffectGetSize +CallbackEffectGetSize: ldr r2, [r0, 0xC] ldr r3, [r0, 0x10] str r2, [r1] str r3, [r1, 0x4] bx lr - thumb_func_end sub_80AD4C0 + thumb_func_end CallbackEffectGetSize - thumb_func_start sub_80AD4CC -sub_80AD4CC: + thumb_func_start CallbackEffectSetHitboxPos +CallbackEffectSetHitboxPos: push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -1368,10 +1368,10 @@ _080AD572: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AD4CC + thumb_func_end CallbackEffectSetHitboxPos - thumb_func_start sub_80AD578 -sub_80AD578: + thumb_func_start CallbackEffectSetPositionBounds +CallbackEffectSetPositionBounds: push {r4,lr} ldr r3, [r1] ldr r4, [r1, 0x4] @@ -1384,10 +1384,10 @@ sub_80AD578: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AD578 + thumb_func_end CallbackEffectSetPositionBounds - thumb_func_start sub_80AD590 -sub_80AD590: + thumb_func_start CallbackEffectGetHitboxCenter +CallbackEffectGetHitboxCenter: adds r3, r0, 0 movs r2, 0x92 lsls r2, 1 @@ -1404,18 +1404,18 @@ sub_80AD590: adds r0, r2 str r0, [r1, 0x4] bx lr - thumb_func_end sub_80AD590 + thumb_func_end CallbackEffectGetHitboxCenter - thumb_func_start sub_80AD5B0 -sub_80AD5B0: + thumb_func_start CallbackEffectMoveReal +CallbackEffectMoveReal: push {lr} bl sub_80AD3E0 pop {r1} bx r1 - thumb_func_end sub_80AD5B0 + thumb_func_end CallbackEffectMoveReal - thumb_func_start sub_80AD5BC -sub_80AD5BC: + thumb_func_start CallbackEffectGetPosHeightAndUnk +CallbackEffectGetPosHeightAndUnk: push {r4,lr} adds r3, r0, 0 movs r4, 0x9A @@ -1431,29 +1431,29 @@ sub_80AD5BC: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AD5BC + thumb_func_end CallbackEffectGetPosHeightAndUnk - thumb_func_start sub_80AD5DC -sub_80AD5DC: + thumb_func_start CallbackEffectSetPosHeight +CallbackEffectSetPosHeight: movs r2, 0x9A lsls r2, 1 adds r0, r2 str r1, [r0] bx lr - thumb_func_end sub_80AD5DC + thumb_func_end CallbackEffectSetPosHeight - thumb_func_start sub_80AD5E8 -sub_80AD5E8: + thumb_func_start CallbackEffectGetDirection +CallbackEffectGetDirection: movs r2, 0x90 lsls r2, 1 adds r0, r2 ldrb r0, [r0] strb r0, [r1] bx lr - thumb_func_end sub_80AD5E8 + thumb_func_end CallbackEffectGetDirection - thumb_func_start sub_80AD5F4 -sub_80AD5F4: + thumb_func_start CallbackEffectSetDirection +CallbackEffectSetDirection: push {lr} adds r2, r0, 0 lsls r1, 24 @@ -1469,10 +1469,10 @@ sub_80AD5F4: _080AD60C: pop {r0} bx r0 - thumb_func_end sub_80AD5F4 + thumb_func_end CallbackEffectSetDirection - thumb_func_start sub_80AD610 -sub_80AD610: + thumb_func_start CallbackEffectSetEventIndex +CallbackEffectSetEventIndex: push {r4,r5,lr} lsls r1, 16 adds r3, r0, 0 @@ -1524,10 +1524,10 @@ _080AD668: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80AD610 + thumb_func_end CallbackEffectSetEventIndex - thumb_func_start sub_80AD670 -sub_80AD670: + thumb_func_start CallbackEffectSetUnk_80AD670 +CallbackEffectSetUnk_80AD670: push {lr} lsls r1, 16 asrs r1, 16 @@ -1544,10 +1544,10 @@ _080AD682: strh r2, [r0] pop {r0} bx r0 - thumb_func_end sub_80AD670 + thumb_func_end CallbackEffectSetUnk_80AD670 - thumb_func_start sub_80AD690 -sub_80AD690: + thumb_func_start CallbackEffectSpriteRelatedCheck_80AD690 +CallbackEffectSpriteRelatedCheck_80AD690: push {lr} adds r1, r0, 0 movs r2, 0x9E @@ -1567,10 +1567,10 @@ _080AD6AE: _080AD6B0: pop {r1} bx r1 - thumb_func_end sub_80AD690 + thumb_func_end CallbackEffectSpriteRelatedCheck_80AD690 - thumb_func_start sub_80AD6B4 -sub_80AD6B4: + thumb_func_start CallbackEffectSpriteRelated_80AD6B4 +CallbackEffectSpriteRelated_80AD6B4: push {lr} adds r1, r0, 0 movs r2, 0xA0 @@ -1592,45 +1592,45 @@ _080AD6D6: _080AD6D8: pop {r1} bx r1 - thumb_func_end sub_80AD6B4 + thumb_func_end CallbackEffectSpriteRelated_80AD6B4 - thumb_func_start sub_80AD6DC -sub_80AD6DC: + thumb_func_start CallbackEffectGetFlags +CallbackEffectGetFlags: movs r2, 0x8E lsls r2, 1 adds r0, r2 ldr r0, [r0] str r0, [r1] bx lr - thumb_func_end sub_80AD6DC + thumb_func_end CallbackEffectGetFlags - thumb_func_start sub_80AD6E8 -sub_80AD6E8: + thumb_func_start CallbackEffectSetFlags +CallbackEffectSetFlags: push {lr} movs r2, 0x4 ldrsh r0, [r0, r2] bl sub_80AD0C8 pop {r0} bx r0 - thumb_func_end sub_80AD6E8 + thumb_func_end CallbackEffectSetFlags - thumb_func_start sub_80AD6F8 -sub_80AD6F8: + thumb_func_start CallbackEffectClearFlags +CallbackEffectClearFlags: push {lr} movs r2, 0x4 ldrsh r0, [r0, r2] bl sub_80AD10C pop {r0} bx r0 - thumb_func_end sub_80AD6F8 + thumb_func_end CallbackEffectClearFlags - thumb_func_start sub_80AD708 -sub_80AD708: + thumb_func_start CallbackEffectMoveRelative +CallbackEffectMoveRelative: push {lr} bl sub_80AD430 pop {r1} bx r1 - thumb_func_end sub_80AD708 + thumb_func_end CallbackEffectMoveRelative thumb_func_start GroundEffect_Action GroundEffect_Action: @@ -1666,14 +1666,14 @@ _080AD72C: bl GroundEffect_Delete b _080AD78A .align 2, 0 -_080AD754: .4byte gUnknown_3001B8C +_080AD754: .4byte gGroundEffects _080AD758: .4byte gUnknown_811874C _080AD75C: adds r0, r4, 0 movs r1, 0 movs r2, 0x1 ldr r3, _080AD7A8 - bl sub_809D8C0 + bl ExecutePredefinedScript _080AD768: ldrb r0, [r6] cmp r0, 0 @@ -1804,7 +1804,7 @@ _080AD83C: pop {r0} bx r0 .align 2, 0 -_080AD864: .4byte gUnknown_3001B8C +_080AD864: .4byte gGroundEffects thumb_func_end sub_80AD7AC .align 2,0 diff --git a/asm/ground_event.s b/asm/ground_event.s index 98c15bcf7..29a6b5650 100644 --- a/asm/ground_event.s +++ b/asm/ground_event.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80AD990 -sub_80AD990: + thumb_func_start AllocGroundEvents +AllocGroundEvents: push {r4,lr} ldr r4, _080AD9C8 movs r0, 0x80 @@ -30,17 +30,17 @@ _080AD9AC: adds r1, 0x20 cmp r0, 0x1F ble _080AD9AC - bl DeleteBlankGroundEvents + bl DeleteGroundEvents pop {r4} pop {r0} bx r0 .align 2, 0 -_080AD9C8: .4byte gUnknown_3001B90 +_080AD9C8: .4byte gGroundEvents _080AD9CC: .4byte 0x0000ffff - thumb_func_end sub_80AD990 + thumb_func_end AllocGroundEvents - thumb_func_start DeleteBlankGroundEvents -DeleteBlankGroundEvents: + thumb_func_start DeleteGroundEvents +DeleteGroundEvents: push {r4-r6,lr} ldr r0, _080ADA04 ldr r4, [r0] @@ -69,13 +69,13 @@ _080AD9EE: pop {r0} bx r0 .align 2, 0 -_080ADA04: .4byte gUnknown_3001B90 - thumb_func_end DeleteBlankGroundEvents +_080ADA04: .4byte gGroundEvents + thumb_func_end DeleteGroundEvents - thumb_func_start sub_80ADA08 -sub_80ADA08: + thumb_func_start FreeGroundEvents +FreeGroundEvents: push {r4,lr} - bl DeleteBlankGroundEvents + bl DeleteGroundEvents ldr r4, _080ADA20 ldr r0, [r4] bl MemoryFree @@ -85,8 +85,8 @@ sub_80ADA08: pop {r0} bx r0 .align 2, 0 -_080ADA20: .4byte gUnknown_3001B90 - thumb_func_end sub_80ADA08 +_080ADA20: .4byte gGroundEvents + thumb_func_end FreeGroundEvents thumb_func_start GroundEvent_Select GroundEvent_Select: @@ -101,7 +101,7 @@ GroundEvent_Select: asrs r6, r2, 24 ldr r1, _080ADA88 adds r0, r4, 0 - bl sub_80A77D0 + bl GetGroundScript adds r5, r0, 0 ldr r1, _080ADA8C str r6, [sp] @@ -199,7 +199,7 @@ _080ADADC: bx r0 .align 2, 0 _080ADAF8: .4byte gGroundEventCancelText -_080ADAFC: .4byte gUnknown_3001B90 +_080ADAFC: .4byte gGroundEvents thumb_func_end GroundEvent_Cancel thumb_func_start GroundEvent_Add @@ -232,7 +232,7 @@ GroundEvent_Add: movs r7, 0 b _080ADB68 .align 2, 0 -_080ADB38: .4byte gUnknown_3001B90 +_080ADB38: .4byte gGroundEvents _080ADB3C: adds r0, r2, 0x1 lsls r0, 16 @@ -287,7 +287,7 @@ _080ADB68: movs r0, 0x60 b _080ADBAA .align 2, 0 -_080ADBA0: .4byte gUnknown_3001B90 +_080ADBA0: .4byte gGroundEvents _080ADBA4: .4byte gGroundEventAddText _080ADBA8: movs r0, 0x20 @@ -383,7 +383,7 @@ GroundEvent_Delete: pop {r0} bx r0 .align 2, 0 -_080ADC58: .4byte gUnknown_3001B90 +_080ADC58: .4byte gGroundEvents _080ADC5C: .4byte gGroundEventDeleteText _080ADC60: .4byte 0x0000ffff thumb_func_end GroundEvent_Delete @@ -406,7 +406,7 @@ sub_80ADC64: movs r0, 0 b _080ADC9A .align 2, 0 -_080ADC84: .4byte gUnknown_3001B90 +_080ADC84: .4byte gGroundEvents _080ADC88: ldr r0, [r2, 0x1C] str r0, [r3] @@ -422,8 +422,8 @@ _080ADC9A: bx r1 thumb_func_end sub_80ADC64 - thumb_func_start sub_80ADCA0 -sub_80ADCA0: + thumb_func_start FindGroundEvent +FindGroundEvent: push {r4-r7,lr} adds r7, r0, 0 adds r4, r1, 0 @@ -463,7 +463,7 @@ _080ADCB6: adds r0, r5, 0 b _080ADD04 .align 2, 0 -_080ADCEC: .4byte gUnknown_3001B90 +_080ADCEC: .4byte gGroundEvents _080ADCF0: adds r0, r6, 0 movs r1, 0x80 @@ -479,7 +479,7 @@ _080ADD04: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80ADCA0 + thumb_func_end FindGroundEvent thumb_func_start sub_80ADD0C sub_80ADD0C: @@ -536,7 +536,7 @@ _080ADD2C: adds r0, r7, 0 b _080ADD8C .align 2, 0 -_080ADD74: .4byte gUnknown_3001B90 +_080ADD74: .4byte gGroundEvents _080ADD78: mov r0, r12 movs r1, 0x80 diff --git a/asm/ground_link.s b/asm/ground_link.s index 83ed054c6..341a13944 100644 --- a/asm/ground_link.s +++ b/asm/ground_link.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80AD8B4 -sub_80AD8B4: + thumb_func_start GroundLink_GetPos +GroundLink_GetPos: push {r4,lr} adds r4, r1, 0 lsls r0, 16 @@ -55,11 +55,11 @@ _080AD906: pop {r1} bx r1 .align 2, 0 -_080AD910: .4byte gUnknown_203B4B8 - thumb_func_end sub_80AD8B4 +_080AD910: .4byte gCurrentGroundLink + thumb_func_end GroundLink_GetPos - thumb_func_start sub_80AD914 -sub_80AD914: + thumb_func_start GroundLink_GetArea +GroundLink_GetArea: push {r4,r5,lr} adds r4, r1, 0 adds r5, r2, 0 @@ -123,7 +123,7 @@ _080AD970: pop {r1} bx r1 .align 2, 0 -_080AD98C: .4byte gUnknown_203B4B8 - thumb_func_end sub_80AD914 +_080AD98C: .4byte gCurrentGroundLink + thumb_func_end GroundLink_GetArea .align 2,0 diff --git a/asm/ground_lives.s b/asm/ground_lives.s index 98d92b81e..3a313dec8 100644 --- a/asm/ground_lives.s +++ b/asm/ground_lives.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80A77F8 -sub_80A77F8: + thumb_func_start AllocGroundLives +AllocGroundLives: push {r4,r5,lr} ldr r4, _080A7860 movs r0, 0xCE @@ -45,25 +45,25 @@ _080A7826: adds r1, r0 movs r0, 0 movs r2, 0x19 - bl sub_809D710 + bl GetFunctionScript ldr r0, [r4] movs r1, 0xCC lsls r1, 2 adds r0, r1 movs r1, 0x1 strh r1, [r0] - bl DeleteBlankGroundLives + bl DeleteGroundLives pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A7860: .4byte gUnknown_3001B80 -_080A7864: .4byte gUnknown_3001B84 +_080A7860: .4byte gGroundLivesMeta +_080A7864: .4byte gGroundLives _080A7868: .4byte 0x0000ffff - thumb_func_end sub_80A77F8 + thumb_func_end AllocGroundLives - thumb_func_start DeleteBlankGroundLives -DeleteBlankGroundLives: + thumb_func_start DeleteGroundLives +DeleteGroundLives: push {r4-r6,lr} ldr r0, _080A78E8 ldr r4, [r0] @@ -129,14 +129,14 @@ _080A78CE: pop {r0} bx r0 .align 2, 0 -_080A78E8: .4byte gUnknown_3001B84 -_080A78EC: .4byte gUnknown_3001B80 - thumb_func_end DeleteBlankGroundLives +_080A78E8: .4byte gGroundLives +_080A78EC: .4byte gGroundLivesMeta + thumb_func_end DeleteGroundLives - thumb_func_start sub_80A78F0 -sub_80A78F0: + thumb_func_start FreeGroundLives +FreeGroundLives: push {r4,r5,lr} - bl DeleteBlankGroundLives + bl DeleteGroundLives ldr r4, _080A7914 ldr r0, [r4] bl MemoryFree @@ -150,9 +150,9 @@ sub_80A78F0: pop {r0} bx r0 .align 2, 0 -_080A7914: .4byte gUnknown_3001B84 -_080A7918: .4byte gUnknown_3001B80 - thumb_func_end sub_80A78F0 +_080A7914: .4byte gGroundLives +_080A7918: .4byte gGroundLivesMeta + thumb_func_end FreeGroundLives thumb_func_start GroundLives_Select GroundLives_Select: @@ -167,7 +167,7 @@ GroundLives_Select: asrs r6, r2, 24 ldr r1, _080A7980 adds r0, r4, 0 - bl sub_80A77D0 + bl GetGroundScript adds r5, r0, 0 ldr r1, _080A7984 str r6, [sp] @@ -267,7 +267,7 @@ _080A79D4: bx r0 .align 2, 0 _080A79F4: .4byte gUnknown_81180BC -_080A79F8: .4byte gUnknown_3001B84 +_080A79F8: .4byte gGroundLives thumb_func_end GroundLives_Cancel thumb_func_start GroundLives_CancelBlank_1 @@ -306,7 +306,7 @@ _080A7A20: lsls r1, 1 adds r0, r4, r1 mov r1, sp - bl sub_80A675C + bl IsOnscreen_80A675C lsls r0, 24 cmp r0, 0 bne _080A7A50 @@ -330,7 +330,7 @@ _080A7A50: bx r0 .align 2, 0 _080A7A70: .4byte gUnknown_81180D8 -_080A7A74: .4byte gUnknown_3001B84 +_080A7A74: .4byte gGroundLives thumb_func_end GroundLives_CancelBlank_1 thumb_func_start GroundLives_CancelBlank_2 @@ -367,11 +367,11 @@ _080A7A92: adds r0, 0x8 adds r2, r4, r0 movs r0, 0x20 - bl sub_80ADCA0 + bl FindGroundEvent b _080A7ACA .align 2, 0 _080A7AC0: .4byte gUnknown_81180D8 -_080A7AC4: .4byte gUnknown_3001B84 +_080A7AC4: .4byte gGroundLives _080A7AC8: ldr r0, _080A7AE4 _080A7ACA: @@ -425,7 +425,7 @@ _080A7B16: adds r0, r3, 0 b _080A7B38 .align 2, 0 -_080A7B24: .4byte gUnknown_3001B84 +_080A7B24: .4byte gGroundLives _080A7B28: adds r0, r2, 0 adds r2, r6 @@ -470,7 +470,7 @@ _080A7B58: adds r0, r3, 0 b _080A7B8C .align 2, 0 -_080A7B70: .4byte gUnknown_3001B84 +_080A7B70: .4byte gGroundLives _080A7B74: adds r0, r2, 0 movs r3, 0x80 @@ -513,7 +513,7 @@ sub_80A7B94: bne _080A7C10 movs r0, 0 movs r1, 0x1C - bl sub_8001658 + bl GetScriptVarValue adds r4, r0, 0 cmp r4, 0x1 beq _080A7BDE @@ -523,7 +523,7 @@ sub_80A7B94: beq _080A7BF2 b _080A7C08 .align 2, 0 -_080A7BD4: .4byte gUnknown_811E63C +_080A7BD4: .4byte gGroundLivesTypeData_811E63C _080A7BD8: cmp r4, 0x2 beq _080A7BE4 @@ -564,11 +564,11 @@ _080A7C14: bne _080A7CD2 movs r0, 0 movs r1, 0x1D - bl sub_8001658 + bl GetScriptVarValue adds r4, r0, 0 movs r0, 0 movs r1, 0x1E - bl sub_8001658 + bl GetScriptVarValue adds r2, r0, 0 ldrh r1, [r7] subs r0, r1, 0x4 @@ -704,7 +704,7 @@ _080A7D12: bhi _080A7DA6 movs r0, 0 movs r1, 0x10 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 bl sub_8002658 @@ -863,7 +863,7 @@ _080A7E22: strh r6, [r7] b _080A7E04 .align 2, 0 -_080A7E50: .4byte gUnknown_811E63C +_080A7E50: .4byte gGroundLivesTypeData_811E63C _080A7E54: .4byte gUnknown_81180F0 _080A7E58: movs r0, 0x9 @@ -905,7 +905,7 @@ _080A7E90: _080A7E9E: movs r0, 0 movs r1, 0x10 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 bl sub_8002658 @@ -1064,7 +1064,7 @@ _080A8010: .4byte gUnknown_81180FC _080A8014: movs r0, 0 movs r1, 0x1F - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 cmp r0, 0 @@ -1091,7 +1091,7 @@ _080A8046: add r1, sp, 0x14 add r2, sp, 0x18 movs r0, 0x2 - bl sub_8001B88 + bl GetScriptVarScenario add r4, sp, 0x1C ldr r1, [sp, 0x18] lsls r1, 24 @@ -1200,7 +1200,7 @@ _080A8104: _080A8108: movs r0, 0 movs r1, 0x1D - bl sub_8001658 + bl GetScriptVarValue cmp r0, 0 bne _080A8116 movs r7, 0x1 @@ -1225,7 +1225,7 @@ _080A8118: adds r0, r2, 0 b _080A8162 .align 2, 0 -_080A813C: .4byte gUnknown_811E63C +_080A813C: .4byte gGroundLivesTypeData_811E63C _080A8140: ldr r0, _080A8150 ldr r0, [r0] @@ -1236,7 +1236,7 @@ _080A8140: movs r0, 0x21 b _080A8162 .align 2, 0 -_080A8150: .4byte gUnknown_3001B84 +_080A8150: .4byte gGroundLives _080A8154: ldr r0, _080A8188 ldr r0, [r0] @@ -1265,7 +1265,7 @@ _080A8162: movs r6, 0x3 b _080A81B4 .align 2, 0 -_080A8188: .4byte gUnknown_3001B84 +_080A8188: .4byte gGroundLives _080A818C: adds r0, r2, 0x1 lsls r0, 16 @@ -1354,7 +1354,7 @@ _080A81F0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A8234: .4byte gUnknown_3001B84 +_080A8234: .4byte gGroundLives _080A8238: .4byte gUnknown_811811C _080A823C: .4byte _080A8240 .align 2, 0 @@ -1566,7 +1566,7 @@ _080A834A: b _080A83EC .align 2, 0 _080A83DC: .4byte 0x2300068d -_080A83E0: .4byte gUnknown_3001B80 +_080A83E0: .4byte gGroundLivesMeta _080A83E4: movs r4, 0xA0 lsls r4, 1 @@ -1589,7 +1589,7 @@ _080A83EC: lsls r3, 1 adds r2, r5, r3 movs r0, 0x20 - bl sub_80ADCA0 + bl FindGroundEvent movs r4, 0x9F lsls r4, 1 adds r1, r5, r4 @@ -1605,7 +1605,7 @@ _080A8420: adds r0, 0x28 adds r1, r5, 0 adds r1, 0x30 - bl sub_80A5778 + bl GetCurrentDungeonBounds ldr r1, [sp, 0x20] cmp r1, 0 beq _080A84AC @@ -1664,7 +1664,7 @@ _080A8420: _080A849C: .4byte 0x0000ffff _080A84A0: .4byte 0x0000015d _080A84A4: .4byte 0x00000807 -_080A84A8: .4byte gUnknown_8117F10 +_080A84A8: .4byte gGroundLivesCallbacks _080A84AC: adds r4, r5, 0 adds r4, 0x38 @@ -1700,7 +1700,7 @@ _080A84AC: adds r0, r5 b _080A8508 .align 2, 0 -_080A84F0: .4byte gUnknown_3001B80 +_080A84F0: .4byte gGroundLivesMeta _080A84F4: adds r1, r5, 0 adds r1, 0x80 @@ -1715,7 +1715,7 @@ _080A84F4: _080A8508: mov r8, r0 adds r0, r4, 0 - bl sub_809D648 + bl InitAction2 ldr r1, _080A8544 ldr r0, [sp, 0x18] str r0, [sp] @@ -1741,12 +1741,12 @@ _080A8508: mov r8, r1 b _080A8566 .align 2, 0 -_080A8544: .4byte gUnknown_8117F10 -_080A8548: .4byte gUnknown_3001B80 +_080A8544: .4byte gGroundLivesCallbacks +_080A8548: .4byte gGroundLivesMeta _080A854C: .4byte gUnknown_8118170 _080A8550: adds r0, r4, 0 - bl sub_809D648 + bl InitAction2 ldr r1, _080A861C ldr r2, [sp, 0x18] str r2, [sp] @@ -1842,12 +1842,12 @@ _080A860C: adds r0, r4, 0 movs r1, 0 movs r2, 0 - bl sub_809D8C0 + bl ExecutePredefinedScript b _080A865A .align 2, 0 -_080A861C: .4byte gUnknown_8117F10 +_080A861C: .4byte gGroundLivesCallbacks _080A8620: .4byte gFunctionScriptTable -_080A8624: .4byte gUnknown_3001B80 +_080A8624: .4byte gGroundLivesMeta _080A8628: .4byte gUnknown_811817C _080A862C: .4byte gUnknown_8118188 _080A8630: @@ -1917,14 +1917,14 @@ GroundLives_Delete: bl sub_80A74E4 adds r0, r4, 0 adds r0, 0x38 - bl sub_809D648 + bl InitAction2 ldr r0, _080A86C4 strh r0, [r4, 0x2] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A86BC: .4byte gUnknown_3001B84 +_080A86BC: .4byte gGroundLives _080A86C0: .4byte gUnknown_8118194 _080A86C4: .4byte 0x0000ffff thumb_func_end GroundLives_Delete @@ -1962,7 +1962,7 @@ sub_80A86C8: bl sub_80AB5A4 b _080A872E .align 2, 0 -_080A8708: .4byte gUnknown_3001B84 +_080A8708: .4byte gGroundLives _080A870C: movs r0, 0x80 lsls r0, 5 @@ -1997,7 +1997,7 @@ _080A8744: pop {r0} bx r0 .align 2, 0 -_080A874C: .4byte gUnknown_3001B80 +_080A874C: .4byte gGroundLivesMeta thumb_func_end sub_80A86C8 thumb_func_start sub_80A8750 @@ -2047,7 +2047,7 @@ _080A87A2: pop {r0} bx r0 .align 2, 0 -_080A87A8: .4byte gUnknown_3001B84 +_080A87A8: .4byte gGroundLives thumb_func_end sub_80A8750 thumb_func_start sub_80A87AC @@ -2077,7 +2077,7 @@ _080A87D8: pop {r0} bx r0 .align 2, 0 -_080A87DC: .4byte gUnknown_3001B84 +_080A87DC: .4byte gGroundLives thumb_func_end sub_80A87AC thumb_func_start sub_80A87E0 @@ -2113,7 +2113,7 @@ sub_80A87E0: movs r0, 0x1 b _080A8826 .align 2, 0 -_080A8820: .4byte gUnknown_3001B84 +_080A8820: .4byte gGroundLives _080A8824: movs r0, 0 _080A8826: @@ -2142,7 +2142,7 @@ sub_80A882C: movs r0, 0 b _080A8858 .align 2, 0 -_080A8850: .4byte gUnknown_3001B84 +_080A8850: .4byte gGroundLives _080A8854: adds r0, r2, 0 adds r0, 0x38 @@ -2174,13 +2174,13 @@ sub_80A885C: movs r0, 0 b _080A8898 .align 2, 0 -_080A8884: .4byte gUnknown_3001B84 +_080A8884: .4byte gGroundLives _080A8888: adds r0, r2, 0 adds r0, 0x38 adds r1, r4, 0 adds r2, r3, 0 - bl sub_809D6E4 + bl GetPredefinedScript lsls r0, 24 lsrs r0, 24 _080A8898: @@ -2209,7 +2209,7 @@ sub_80A88A0: movs r0, 0 b _080A88D4 .align 2, 0 -_080A88C4: .4byte gUnknown_3001B84 +_080A88C4: .4byte gGroundLives _080A88C8: adds r0, r2, 0 adds r0, 0x38 @@ -2252,7 +2252,7 @@ GroundLives_ExecuteScript: movs r0, 0 b _080A8934 .align 2, 0 -_080A8914: .4byte gUnknown_3001B84 +_080A8914: .4byte gGroundLives _080A8918: .4byte gUnknown_81181B0 _080A891C: adds r0, r5, 0 @@ -2353,7 +2353,7 @@ sub_80A89AC: pop {r1} bx r1 .align 2, 0 -_080A89CC: .4byte gUnknown_3001B84 +_080A89CC: .4byte gGroundLives thumb_func_end sub_80A89AC thumb_func_start GroundLives_ExecutePlayerScriptActionLives @@ -2393,7 +2393,7 @@ GroundLives_ExecutePlayerScriptActionLives: adds r0, r6, 0 mov r1, sp movs r2, 0x2 - bl sub_809D6E4 + bl GetPredefinedScript lsls r0, 24 cmp r0, 0 beq _080A8A50 @@ -2406,7 +2406,7 @@ GroundLives_ExecutePlayerScriptActionLives: ldr r3, _080A8A4C adds r0, r6, 0 movs r2, 0x3 - bl sub_809D8C0 + bl ExecutePredefinedScript add r1, sp, 0xC adds r0, r5, 0 mov r2, sp @@ -2415,7 +2415,7 @@ GroundLives_ExecutePlayerScriptActionLives: lsrs r0, 24 b _080A8A52 .align 2, 0 -_080A8A48: .4byte gUnknown_3001B84 +_080A8A48: .4byte gGroundLives _080A8A4C: .4byte gUnknown_8118250 _080A8A50: movs r0, 0 @@ -2473,7 +2473,7 @@ sub_80A8A5C: lsrs r0, 24 b _080A8AC2 .align 2, 0 -_080A8ABC: .4byte gUnknown_3001B84 +_080A8ABC: .4byte gGroundLives _080A8AC0: movs r0, 0 _080A8AC2: @@ -2515,7 +2515,7 @@ sub_80A8ACC: lsrs r0, 24 b _080A8B12 .align 2, 0 -_080A8B0C: .4byte gUnknown_3001B84 +_080A8B0C: .4byte gGroundLives _080A8B10: movs r0, 0 _080A8B12: @@ -2525,8 +2525,8 @@ _080A8B12: bx r1 thumb_func_end sub_80A8ACC - thumb_func_start sub_80A8B1C -sub_80A8B1C: + thumb_func_start GroundLivesNotifyAll +GroundLivesNotifyAll: push {r4-r7,lr} mov r7, r8 push {r7} @@ -2548,7 +2548,7 @@ _080A8B36: adds r0, r4, 0 adds r0, 0x38 adds r1, r7, 0 - bl sub_809D968 + bl GroundScriptNotify orrs r5, r0 lsls r0, r5, 24 lsrs r5, r0, 24 @@ -2570,11 +2570,11 @@ _080A8B4E: pop {r1} bx r1 .align 2, 0 -_080A8B70: .4byte gUnknown_3001B84 - thumb_func_end sub_80A8B1C +_080A8B70: .4byte gGroundLives + thumb_func_end GroundLivesNotifyAll - thumb_func_start sub_80A8B74 -sub_80A8B74: + thumb_func_start GroundLivesCancelAll +GroundLivesCancelAll: push {r4-r7,lr} ldr r0, _080A8BB8 ldr r4, [r0] @@ -2610,8 +2610,8 @@ _080A8B9A: pop {r1} bx r1 .align 2, 0 -_080A8BB8: .4byte gUnknown_3001B84 - thumb_func_end sub_80A8B74 +_080A8BB8: .4byte gGroundLives + thumb_func_end GroundLivesCancelAll thumb_func_start sub_80A8BBC sub_80A8BBC: @@ -2627,7 +2627,7 @@ sub_80A8BBC: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080A8BD4: .4byte gUnknown_3001B84 +_080A8BD4: .4byte gGroundLives thumb_func_end sub_80A8BBC thumb_func_start sub_80A8BD8 @@ -2649,7 +2649,7 @@ sub_80A8BD8: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080A8BF8: .4byte gUnknown_3001B84 +_080A8BF8: .4byte gGroundLives thumb_func_end sub_80A8BD8 thumb_func_start sub_80A8BFC @@ -2672,7 +2672,7 @@ sub_80A8BFC: movs r0, 0 b _080A8C28 .align 2, 0 -_080A8C20: .4byte gUnknown_3001B84 +_080A8C20: .4byte gGroundLives _080A8C24: movs r1, 0x8 ldrsh r0, [r2, r1] @@ -2727,7 +2727,7 @@ sub_80A8C4C: str r0, [r5] b _080A8C8A .align 2, 0 -_080A8C80: .4byte gUnknown_3001B84 +_080A8C80: .4byte gGroundLives _080A8C84: movs r0, 0x63 strb r0, [r5] @@ -2777,7 +2777,7 @@ _080A8CC6: movs r0, 0x1 b _080A8CEA .align 2, 0 -_080A8CD4: .4byte gUnknown_3001B84 +_080A8CD4: .4byte gGroundLives _080A8CD8: .4byte gUnknown_8117FCE _080A8CDC: adds r1, 0x2 @@ -2851,7 +2851,7 @@ _080A8D4A: pop {r1} bx r1 .align 2, 0 -_080A8D50: .4byte gUnknown_3001B84 +_080A8D50: .4byte gGroundLives thumb_func_end sub_80A8D20 thumb_func_start sub_80A8D54 @@ -2947,7 +2947,7 @@ _080A8DF8: bhi _080A8E92 movs r0, 0 movs r1, 0x10 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 bl sub_8002658 @@ -3039,7 +3039,7 @@ sub_80A8E9C: pop {r1} bx r1 .align 2, 0 -_080A8EBC: .4byte gUnknown_3001B84 +_080A8EBC: .4byte gGroundLives thumb_func_end sub_80A8E9C thumb_func_start sub_80A8EC0 @@ -3097,7 +3097,7 @@ _080A8F20: bl strcpy b _080A8F44 .align 2, 0 -_080A8F2C: .4byte gUnknown_811E63C +_080A8F2C: .4byte gGroundLivesTypeData_811E63C _080A8F30: movs r2, 0x2 ldrsh r1, [r0, r2] @@ -3157,7 +3157,7 @@ sub_80A8F74: pop {r0} bx r0 .align 2, 0 -_080A8F98: .4byte gUnknown_3001B84 +_080A8F98: .4byte gGroundLives thumb_func_end sub_80A8F74 thumb_func_start sub_80A8F9C @@ -3183,7 +3183,7 @@ sub_80A8F9C: str r0, [r3, 0x4] b _080A8FD0 .align 2, 0 -_080A8FC4: .4byte gUnknown_3001B84 +_080A8FC4: .4byte gGroundLives _080A8FC8: ldr r0, [r2, 0xC] ldr r1, [r2, 0x10] @@ -3218,7 +3218,7 @@ sub_80A8FD8: str r0, [r3] b _080A901E .align 2, 0 -_080A9000: .4byte gUnknown_3001B84 +_080A9000: .4byte gGroundLives _080A9004: movs r1, 0xA2 lsls r1, 1 @@ -3260,7 +3260,7 @@ sub_80A9028: pop {r1} bx r1 .align 2, 0 -_080A904C: .4byte gUnknown_3001B84 +_080A904C: .4byte gGroundLives thumb_func_end sub_80A9028 thumb_func_start sub_80A9050 @@ -3285,7 +3285,7 @@ sub_80A9050: strb r3, [r4] b _080A9086 .align 2, 0 -_080A9078: .4byte gUnknown_3001B84 +_080A9078: .4byte gGroundLives _080A907C: movs r1, 0xA1 lsls r1, 1 @@ -3329,7 +3329,7 @@ _080A90BA: pop {r1} bx r1 .align 2, 0 -_080A90C4: .4byte gUnknown_3001B84 +_080A90C4: .4byte gGroundLives thumb_func_end sub_80A9090 thumb_func_start sub_80A90C8 @@ -3349,7 +3349,7 @@ sub_80A90C8: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080A90E4: .4byte gUnknown_3001B84 +_080A90E4: .4byte gGroundLives thumb_func_end sub_80A90C8 thumb_func_start sub_80A90E8 @@ -3416,17 +3416,17 @@ sub_80A90E8: adds r3, r4, 0 adds r3, 0xC mov r0, sp - bl sub_8002DF0 + bl SizedDeltaDirection8 b _080A917E .align 2, 0 -_080A916C: .4byte gUnknown_3001B84 +_080A916C: .4byte gGroundLives _080A9170: adds r1, r5, 0 adds r1, 0xC adds r3, r4, 0 adds r3, 0xC mov r0, sp - bl sub_8002D54 + bl SizedDeltaDirection4 _080A917E: lsls r0, 24 asrs r1, r0, 24 @@ -3520,7 +3520,7 @@ sub_80A91A0: adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 - bl sub_8002DF0 + bl SizedDeltaDirection8 lsls r0, 24 asrs r0, 24 mov r9, r0 @@ -3528,7 +3528,7 @@ sub_80A91A0: adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 - bl sub_8002D54 + bl SizedDeltaDirection4 lsls r0, 24 asrs r1, r0, 24 cmp r9, r10 @@ -3546,7 +3546,7 @@ sub_80A91A0: strb r2, [r0] b _080A926C .align 2, 0 -_080A9260: .4byte gUnknown_3001B84 +_080A9260: .4byte gGroundLives _080A9264: movs r3, 0xA1 lsls r3, 1 @@ -3584,8 +3584,8 @@ _080A9290: bx r1 thumb_func_end sub_80A91A0 - thumb_func_start sub_80A92A0 -sub_80A92A0: + thumb_func_start GetLivesCollision_80A92A0 +GetLivesCollision_80A92A0: push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -3650,7 +3650,7 @@ _080A92C2: adds r0, r2, 0 b _080A9338 .align 2, 0 -_080A931C: .4byte gUnknown_3001B84 +_080A931C: .4byte gGroundLives _080A9320: adds r0, r5, 0 movs r7, 0x80 @@ -3671,7 +3671,7 @@ _080A9338: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A92A0 + thumb_func_end GetLivesCollision_80A92A0 thumb_func_start sub_80A9344 sub_80A9344: @@ -3741,7 +3741,7 @@ _080A936E: adds r0, r4, 0 b _080A93E0 .align 2, 0 -_080A93C4: .4byte gUnknown_3001B84 +_080A93C4: .4byte gGroundLives _080A93C8: adds r0, r7, 0 movs r2, 0x80 @@ -3842,7 +3842,7 @@ _080A9458: pop {r1} bx r1 .align 2, 0 -_080A947C: .4byte gUnknown_3001B84 +_080A947C: .4byte gGroundLives _080A9480: .4byte 0x000007ff _080A9484: .4byte 0x000007fe thumb_func_end sub_80A93F0 @@ -3910,7 +3910,7 @@ _080A94D2: beq _080A9504 mov r0, sp adds r1, r4, 0 - bl sub_80A585C + bl CheckMapCollision_80A585C lsls r0, 24 cmp r0, 0 bne _080A9522 @@ -3948,7 +3948,7 @@ _080A9530: ldrsh r0, [r5, r6] adds r2, r7, 0 mov r3, r8 - bl sub_80A92A0 + bl GetLivesCollision_80A92A0 lsls r0, 16 cmp r0, 0 blt _080A9556 @@ -3984,7 +3984,7 @@ _080A957A: movs r0, 0x40 adds r1, r7, 0 mov r2, r8 - bl sub_80ADCA0 + bl FindGroundEvent lsls r0, 16 cmp r0, 0 blt _080A959E @@ -4065,7 +4065,7 @@ _080A95F8: beq _080A962C mov r0, sp adds r1, r4, 0 - bl sub_80A585C + bl CheckMapCollision_80A585C lsls r0, 24 cmp r0, 0 beq _080A962C @@ -4099,7 +4099,7 @@ _080A964A: movs r1, 0x44 adds r2, r7, 0 mov r3, r8 - bl sub_80A92A0 + bl GetLivesCollision_80A92A0 lsls r0, 16 asrs r2, r0, 16 mov r9, r2 @@ -4144,7 +4144,7 @@ _080A96B2: .align 2, 0 _080A96BC: .4byte 0x000007ff _080A96C0: .4byte 0x000007fe -_080A96C4: .4byte gUnknown_3001B84 +_080A96C4: .4byte gGroundLives _080A96C8: movs r6, 0x8E lsls r6, 1 @@ -4187,7 +4187,7 @@ _080A9708: movs r0, 0x40 adds r1, r7, 0 mov r2, r8 - bl sub_80ADCA0 + bl FindGroundEvent lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 @@ -5119,7 +5119,7 @@ _080AA0F4: movs r0, 0x20 mov r1, sp adds r2, r5, 0 - bl sub_80ADCA0 + bl FindGroundEvent lsls r0, 16 asrs r5, r0, 16 cmp r5, 0 @@ -5198,7 +5198,7 @@ sub_80AA180: subs r1, r0 add r0, sp, 0x8 str r1, [r0, 0x4] - bl sub_8002C60 + bl VecDirection8Radial lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 @@ -5270,7 +5270,7 @@ _080AA220: ldr r1, [sp, 0x4] subs r1, r2 str r1, [r0, 0x4] - bl sub_8002C60 + bl VecDirection8Radial lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 @@ -5391,7 +5391,7 @@ _080AA31A: movs r1, 0x80 mov r2, sp mov r3, r9 - bl sub_80A92A0 + bl GetLivesCollision_80A92A0 lsls r0, 16 asrs r5, r0, 16 cmp r5, 0 @@ -5455,7 +5455,7 @@ _080AA3BE: .align 2, 0 _080AA3C4: .4byte 0x000007ff _080AA3C8: .4byte 0x000007fe -_080AA3CC: .4byte gUnknown_3001B84 +_080AA3CC: .4byte gGroundLives _080AA3D0: movs r0, 0x10 mov r1, r10 @@ -5494,7 +5494,7 @@ sub_80AA3F8: movs r2, 0x80 lsls r2, 1 mov r0, sp - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r4, [sp] ldr r5, [sp, 0x4] movs r0, 0xA2 @@ -5843,7 +5843,7 @@ sub_80AA690: movs r2, 0x80 lsls r2, 1 mov r0, sp - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r5, [sp] ldr r6, [sp, 0x4] ldr r0, [r7, 0xC] @@ -6052,7 +6052,7 @@ _080AA80C: movs r1, 0x80 mov r2, sp adds r3, r4, 0 - bl sub_80A92A0 + bl GetLivesCollision_80A92A0 lsls r0, 16 asrs r4, r0, 16 cmp r4, 0 @@ -6131,7 +6131,7 @@ sub_80AA8BC: lsls r2, 1 add r0, sp, 0x4 mov r1, r8 - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r4, [sp, 0x4] ldr r5, [sp, 0x8] ldr r0, [r6, 0xC] @@ -6538,7 +6538,7 @@ _080AABFC: lsls r2, 1 add r0, sp, 0x28 adds r1, r4, 0 - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r0, [sp, 0x28] ldr r1, [sp, 0x2C] str r0, [sp, 0x38] @@ -6671,7 +6671,7 @@ _080AACF6: lsls r2, 1 add r0, sp, 0x48 adds r1, r4, 0 - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r0, [sp, 0x48] ldr r1, [sp, 0x4C] str r0, [sp, 0x50] @@ -6750,7 +6750,7 @@ _080AAD7C: strb r4, [r0] b _080AADA6 .align 2, 0 -_080AAD98: .4byte gUnknown_3001B80 +_080AAD98: .4byte gGroundLivesMeta _080AAD9C: ldr r0, _080AADF0 ldr r0, [r0] @@ -6781,7 +6781,7 @@ _080AADCA: lsls r2, 1 add r0, sp, 0x68 adds r1, r4, 0 - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r0, [sp, 0x68] ldr r1, [sp, 0x6C] str r0, [sp, 0x70] @@ -6794,7 +6794,7 @@ _080AADCA: str r6, [sp, 0x78] b _080AAEC0 .align 2, 0 -_080AADF0: .4byte gUnknown_3001B80 +_080AADF0: .4byte gGroundLivesMeta _080AADF4: movs r4, 0xA1 lsls r4, 1 @@ -6818,7 +6818,7 @@ _080AAE06: movs r0, 0 mov r1, sp movs r2, 0x9 - bl sub_809D710 + bl GetFunctionScript adds r0, r5, 0 movs r1, 0 mov r2, sp @@ -6841,7 +6841,7 @@ _080AAE32: movs r0, 0 adds r1, r4, 0 movs r2, 0x6 - bl sub_809D710 + bl GetFunctionScript movs r2, 0 ldrsh r0, [r6, r2] adds r1, r5, 0 @@ -6877,7 +6877,7 @@ _080AAE9C: ldr r2, _080AAEB4 movs r0, 0 adds r1, r4, 0 - bl sub_809D710 + bl GetFunctionScript adds r0, r5, 0 movs r1, 0 adds r2, r4, 0 @@ -7064,24 +7064,24 @@ _080AB002: bx r0 thumb_func_end sub_80AAF68 - thumb_func_start sub_80AB008 -sub_80AB008: + thumb_func_start CallbackLivesGetIndex +CallbackLivesGetIndex: movs r1, 0 ldrsh r0, [r0, r1] bx lr - thumb_func_end sub_80AB008 + thumb_func_end CallbackLivesGetIndex - thumb_func_start sub_80AB010 -sub_80AB010: + thumb_func_start CallbackLivesGetSize +CallbackLivesGetSize: ldr r2, [r0, 0xC] ldr r3, [r0, 0x10] str r2, [r1] str r3, [r1, 0x4] bx lr - thumb_func_end sub_80AB010 + thumb_func_end CallbackLivesGetSize - thumb_func_start sub_80AB01C -sub_80AB01C: + thumb_func_start CallbackLivesSetHitboxPos +CallbackLivesSetHitboxPos: push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -7171,10 +7171,10 @@ _080AB0C2: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AB01C + thumb_func_end CallbackLivesSetHitboxPos - thumb_func_start sub_80AB0C8 -sub_80AB0C8: + thumb_func_start CallbackLivesSetPositionBounds +CallbackLivesSetPositionBounds: push {r4,lr} ldr r3, [r1] ldr r4, [r1, 0x4] @@ -7187,10 +7187,10 @@ sub_80AB0C8: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AB0C8 + thumb_func_end CallbackLivesSetPositionBounds - thumb_func_start sub_80AB0E0 -sub_80AB0E0: + thumb_func_start CallbackLivesGetHitboxCenter +CallbackLivesGetHitboxCenter: adds r3, r0, 0 movs r2, 0xA2 lsls r2, 1 @@ -7207,18 +7207,18 @@ sub_80AB0E0: adds r0, r2 str r0, [r1, 0x4] bx lr - thumb_func_end sub_80AB0E0 + thumb_func_end CallbackLivesGetHitboxCenter - thumb_func_start sub_80AB100 -sub_80AB100: + thumb_func_start CallbackLivesMoveReal +CallbackLivesMoveReal: push {lr} bl sub_80A9F20 pop {r1} bx r1 - thumb_func_end sub_80AB100 + thumb_func_end CallbackLivesMoveReal - thumb_func_start sub_80AB10C -sub_80AB10C: + thumb_func_start CallbackLivesGetPosHeightAndUnk +CallbackLivesGetPosHeightAndUnk: push {r4,lr} adds r3, r0, 0 movs r4, 0xAA @@ -7234,29 +7234,29 @@ sub_80AB10C: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AB10C + thumb_func_end CallbackLivesGetPosHeightAndUnk - thumb_func_start sub_80AB12C -sub_80AB12C: + thumb_func_start CallbackLivesSetPosHeight +CallbackLivesSetPosHeight: movs r2, 0xAA lsls r2, 1 adds r0, r2 str r1, [r0] bx lr - thumb_func_end sub_80AB12C + thumb_func_end CallbackLivesSetPosHeight - thumb_func_start sub_80AB138 -sub_80AB138: + thumb_func_start CallbackLivesGetDirection +CallbackLivesGetDirection: movs r2, 0xA1 lsls r2, 1 adds r0, r2 ldrb r0, [r0] strb r0, [r1] bx lr - thumb_func_end sub_80AB138 + thumb_func_end CallbackLivesGetDirection - thumb_func_start sub_80AB144 -sub_80AB144: + thumb_func_start CallbackLivesSetDirection +CallbackLivesSetDirection: push {lr} adds r3, r0, 0 lsls r1, 24 @@ -7290,20 +7290,20 @@ _080AB17C: bx r0 .align 2, 0 _080AB180: .4byte 0x0000015d - thumb_func_end sub_80AB144 + thumb_func_end CallbackLivesSetDirection - thumb_func_start sub_80AB184 -sub_80AB184: + thumb_func_start CallbackLivesSetEventIndex +CallbackLivesSetEventIndex: push {lr} lsls r1, 16 lsrs r1, 16 bl sub_80A9750 pop {r0} bx r0 - thumb_func_end sub_80AB184 + thumb_func_end CallbackLivesSetEventIndex - thumb_func_start sub_80AB194 -sub_80AB194: + thumb_func_start CallbackLivesSetUnk_80AB194 +CallbackLivesSetUnk_80AB194: push {lr} mov r12, r0 lsls r1, 16 @@ -7325,15 +7325,15 @@ _080AB1A8: str r2, [r0] pop {r0} bx r0 - thumb_func_end sub_80AB194 + thumb_func_end CallbackLivesSetUnk_80AB194 thumb_func_start nullsub_211 nullsub_211: bx lr thumb_func_end nullsub_211 - thumb_func_start sub_80AB1C0 -sub_80AB1C0: + thumb_func_start CallbackLivesSpriteRelatedCheck_80AB1C0 +CallbackLivesSpriteRelatedCheck_80AB1C0: push {lr} adds r1, r0, 0 movs r2, 0xAE @@ -7353,10 +7353,10 @@ _080AB1DE: _080AB1E0: pop {r1} bx r1 - thumb_func_end sub_80AB1C0 + thumb_func_end CallbackLivesSpriteRelatedCheck_80AB1C0 - thumb_func_start sub_80AB1E4 -sub_80AB1E4: + thumb_func_start CallbackLivesSpriteRelated_80AB1E4 +CallbackLivesSpriteRelated_80AB1E4: push {lr} adds r1, r0, 0 movs r2, 0xB5 @@ -7378,40 +7378,40 @@ _080AB206: _080AB208: pop {r1} bx r1 - thumb_func_end sub_80AB1E4 + thumb_func_end CallbackLivesSpriteRelated_80AB1E4 - thumb_func_start sub_80AB20C -sub_80AB20C: + thumb_func_start CallbackLivesGetFlags +CallbackLivesGetFlags: movs r2, 0x8E lsls r2, 1 adds r0, r2 ldr r0, [r0] str r0, [r1] bx lr - thumb_func_end sub_80AB20C + thumb_func_end CallbackLivesGetFlags - thumb_func_start sub_80AB218 -sub_80AB218: + thumb_func_start CallbackLivesSetFlags +CallbackLivesSetFlags: push {lr} movs r2, 0 ldrsh r0, [r0, r2] bl sub_80A86C8 pop {r0} bx r0 - thumb_func_end sub_80AB218 + thumb_func_end CallbackLivesSetFlags - thumb_func_start sub_80AB228 -sub_80AB228: + thumb_func_start CallbackLivesClearFlags +CallbackLivesClearFlags: push {lr} movs r2, 0 ldrsh r0, [r0, r2] bl sub_80A8750 pop {r0} bx r0 - thumb_func_end sub_80AB228 + thumb_func_end CallbackLivesClearFlags - thumb_func_start sub_80AB238 -sub_80AB238: + thumb_func_start CallbackLivesSpriteRelated_80AB238 +CallbackLivesSpriteRelated_80AB238: push {lr} movs r2, 0xB8 lsls r2, 1 @@ -7419,15 +7419,15 @@ sub_80AB238: bl sub_80A6EC8 pop {r0} bx r0 - thumb_func_end sub_80AB238 + thumb_func_end CallbackLivesSpriteRelated_80AB238 - thumb_func_start sub_80AB248 -sub_80AB248: + thumb_func_start CallbackLivesMoveRelative +CallbackLivesMoveRelative: push {lr} bl sub_80A9F94 pop {r1} bx r1 - thumb_func_end sub_80AB248 + thumb_func_end CallbackLivesMoveRelative thumb_func_start GroundLives_Action GroundLives_Action: @@ -7468,7 +7468,7 @@ _080AB292: bl GroundLives_Delete b _080AB47C .align 2, 0 -_080AB29C: .4byte gUnknown_3001B84 +_080AB29C: .4byte gGroundLives _080AB2A0: .4byte gUnknown_8118280 _080AB2A4: movs r0, 0x8E @@ -7624,7 +7624,7 @@ _080AB3C4: ble _080AB44C _080AB3DA: adds r0, r4, 0 - bl sub_8002C60 + bl VecDirection8Radial add r1, sp, 0x8 strb r0, [r1] lsls r0, 24 @@ -7682,7 +7682,7 @@ _080AB440: adds r0, r4, 0 movs r1, 0 movs r2, 0x1 - bl sub_809D8C0 + bl ExecutePredefinedScript _080AB44C: movs r2, 0xAE lsls r2, 1 @@ -7748,8 +7748,8 @@ _080AB4BE: .align 2, 0 _080AB4C4: .4byte gUnknown_811828C _080AB4C8: .4byte 0x0000015d -_080AB4CC: .4byte gUnknown_3001B80 -_080AB4D0: .4byte gUnknown_3001B84 +_080AB4CC: .4byte gGroundLivesMeta +_080AB4D0: .4byte gGroundLives _080AB4D4: movs r0, 0x80 lsls r0, 5 @@ -7889,7 +7889,7 @@ _080AB5BC: pop {r0} bx r0 .align 2, 0 -_080AB5D0: .4byte gUnknown_3001B80 +_080AB5D0: .4byte gGroundLivesMeta thumb_func_end sub_80AB5A4 thumb_func_start sub_80AB5D4 @@ -7987,7 +7987,7 @@ _080AB670: movs r2, 0x80 lsls r2, 1 mov r0, sp - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r0, [sp] ldr r1, [sp, 0x4] str r0, [sp, 0x8] @@ -8014,7 +8014,7 @@ _080AB6B0: str r0, [r4, 0x4] b _080AB9E6 .align 2, 0 -_080AB6BC: .4byte gUnknown_3001B80 +_080AB6BC: .4byte gGroundLivesMeta _080AB6C0: ldr r5, [sp, 0x28] ldr r0, [r5, 0x4] @@ -8095,7 +8095,7 @@ _080AB71E: mov r10, r4 b _080AB75A .align 2, 0 -_080AB754: .4byte gUnknown_3001B80 +_080AB754: .4byte gGroundLivesMeta _080AB758: str r6, [sp, 0x10] _080AB75A: @@ -8169,7 +8169,7 @@ _080AB7C8: str r0, [r4, 0x8] b _080AB7DC .align 2, 0 -_080AB7D4: .4byte gUnknown_3001B80 +_080AB7D4: .4byte gGroundLivesMeta _080AB7D8: movs r5, 0 mov r10, r5 @@ -8243,7 +8243,7 @@ _080AB846: mov r2, r8 b _080AB8B0 .align 2, 0 -_080AB860: .4byte gUnknown_3001B80 +_080AB860: .4byte gGroundLivesMeta _080AB864: .4byte gUnknown_8118050 _080AB868: .4byte 0xffffff00 _080AB86C: @@ -8347,7 +8347,7 @@ _080AB8FC: add r5, r9 movs r4, 0 ldrsb r4, [r5, r4] - bl sub_8002C60 + bl VecDirection8Radial adds r1, r0, 0 lsls r1, 24 asrs r1, 24 @@ -8379,7 +8379,7 @@ _080AB95E: bl sub_80AAF68 b _080AB982 .align 2, 0 -_080AB96C: .4byte gUnknown_3001B80 +_080AB96C: .4byte gGroundLivesMeta _080AB970: ldr r4, _080AB9F8 movs r0, 0xB2 @@ -8483,7 +8483,7 @@ _080ABA24: bne _080ABA24 b _080ABA72 .align 2, 0 -_080ABA34: .4byte gUnknown_3001B80 +_080ABA34: .4byte gGroundLivesMeta _080ABA38: cmp r3, r1 bge _080ABA72 @@ -8633,7 +8633,7 @@ _080ABB2C: pop {r0} bx r0 .align 2, 0 -_080ABB50: .4byte gUnknown_3001B84 +_080ABB50: .4byte gGroundLives thumb_func_end sub_80ABA7C .align 2,0 diff --git a/asm/ground_map.s b/asm/ground_map.s index 566a42d48..f64662c0e 100644 --- a/asm/ground_map.s +++ b/asm/ground_map.s @@ -23,10 +23,10 @@ GroundMap_GetStationScript: lsls r5, 24 asrs r5, 24 adds r0, r4, 0 - bl sub_80A77A0 + bl ChangeScriptFile ldr r1, _080A4BE0 adds r0, r4, 0 - bl sub_80A77D0 + bl GetGroundScript mov r9, r0 ldr r1, _080A4BE4 str r5, [sp] diff --git a/asm/ground_map_1.s b/asm/ground_map_1.s index fdbf1dc20..8cd5e2798 100644 --- a/asm/ground_map_1.s +++ b/asm/ground_map_1.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80A4D7C -sub_80A4D7C: + thumb_func_start GetAdjustedGroundMap +GetAdjustedGroundMap: push {r4,r5,lr} lsls r0, 16 asrs r5, r0, 16 @@ -23,11 +23,11 @@ _080A4D90: _080A4D94: movs r0, 0 movs r1, 0x27 - bl sub_8001658 + bl GetScriptVarValue adds r4, r0, 0 movs r0, 0 movs r1, 0x28 - bl sub_8001658 + bl GetScriptVarValue lsls r1, r4, 1 adds r1, r4 lsls r1, 1 @@ -48,7 +48,7 @@ _080A4DC4: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80A4D7C + thumb_func_end GetAdjustedGroundMap thumb_func_start GroundMap_Select GroundMap_Select: @@ -61,10 +61,10 @@ GroundMap_Select: bl Log movs r0, 0 movs r1, 0x37 - bl sub_80015C0 + bl ClearScriptVarArray movs r0, 0 movs r1, 0x38 - bl sub_80015C0 + bl ClearScriptVarArray movs r0, 0 bl sub_80A5EDC ldr r4, _080A4E3C @@ -99,7 +99,7 @@ _080A4E08: b _080A50BA .align 2, 0 _080A4E38: .4byte gUnknown_81176A4 -_080A4E3C: .4byte gUnknown_3001B70 +_080A4E3C: .4byte gGroundMapDungeon_3001B70 _080A4E40: .4byte 0x0000055c _080A4E44: .4byte gGroundMapAction _080A4E48: .4byte gUnknown_8117324 @@ -150,7 +150,7 @@ _080A4EA8: strh r0, [r1] b _080A4F30 .align 2, 0 -_080A4EC0: .4byte gUnknown_3001B70 +_080A4EC0: .4byte gGroundMapDungeon_3001B70 _080A4EC4: .4byte gUnknown_811733C _080A4EC8: .4byte gUnknown_2026E4E _080A4ECC: @@ -163,7 +163,7 @@ _080A4ECC: b _080A4EEA .align 2, 0 _080A4EDC: .4byte gUnknown_81173C0 -_080A4EE0: .4byte gUnknown_3001B70 +_080A4EE0: .4byte gGroundMapDungeon_3001B70 _080A4EE4: adds r4, 0xC movs r2, 0 @@ -256,7 +256,7 @@ _080A4F30: beq _080A5084 b _080A50A2 .align 2, 0 -_080A4FA0: .4byte gUnknown_3001B70 +_080A4FA0: .4byte gGroundMapDungeon_3001B70 _080A4FA4: .4byte gUnknown_8117324 _080A4FA8: .4byte gGroundMapAction _080A4FAC: @@ -306,7 +306,7 @@ _080A4FEE: ldr r2, _080A5008 b _080A5050 .align 2, 0 -_080A5000: .4byte gUnknown_3001B70 +_080A5000: .4byte gGroundMapDungeon_3001B70 _080A5004: .4byte gUnknown_2026E4E _080A5008: .4byte 0x00000808 _080A500C: @@ -314,7 +314,7 @@ _080A500C: ldr r0, [r0] b _080A5062 .align 2, 0 -_080A5014: .4byte gUnknown_3001B70 +_080A5014: .4byte gGroundMapDungeon_3001B70 _080A5018: ldr r0, [r5] movs r1, 0x1 @@ -327,7 +327,7 @@ _080A5020: bl sub_80A3B80 b _080A50A2 .align 2, 0 -_080A5030: .4byte gUnknown_3001B70 +_080A5030: .4byte gGroundMapDungeon_3001B70 _080A5034: ldr r1, _080A503C ldr r2, _080A5040 @@ -399,7 +399,7 @@ _080A50BA: pop {r0} bx r0 .align 2, 0 -_080A50C0: .4byte gUnknown_3001B70 +_080A50C0: .4byte gGroundMapDungeon_3001B70 _080A50C4: .4byte gUnknown_81176F8 thumb_func_end GroundMap_Select @@ -420,10 +420,10 @@ GroundMap_SelectDungeon: bl Log movs r0, 0 movs r1, 0x37 - bl sub_80015C0 + bl ClearScriptVarArray movs r0, 0 movs r1, 0x38 - bl sub_80015C0 + bl ClearScriptVarArray movs r0, 0 bl sub_80A5EDC ldr r7, _080A5150 @@ -465,7 +465,7 @@ _080A5138: b _080A51EC .align 2, 0 _080A514C: .4byte gUnknown_8117700 -_080A5150: .4byte gUnknown_3001B70 +_080A5150: .4byte gGroundMapDungeon_3001B70 _080A5154: .4byte 0x0000055c _080A5158: .4byte gGroundMapAction _080A515C: .4byte gUnknown_8117324 @@ -1230,7 +1230,7 @@ sub_80A56A0: pop {r0} bx r0 .align 2, 0 -_080A56BC: .4byte gUnknown_3001B70 +_080A56BC: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A56A0 thumb_func_start sub_80A56C0 @@ -1244,7 +1244,7 @@ sub_80A56C0: pop {r0} bx r0 .align 2, 0 -_080A56D4: .4byte gUnknown_3001B70 +_080A56D4: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A56C0 thumb_func_start sub_80A56D8 @@ -1258,7 +1258,7 @@ sub_80A56D8: pop {r0} bx r0 .align 2, 0 -_080A56EC: .4byte gUnknown_3001B70 +_080A56EC: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A56D8 thumb_func_start sub_80A56F0 @@ -1337,7 +1337,7 @@ sub_80A5758: movs r0, 0 b _080A5772 .align 2, 0 -_080A5768: .4byte gUnknown_3001B70 +_080A5768: .4byte gGroundMapDungeon_3001B70 _080A576C: bl sub_80A4608 movs r0, 0x1 @@ -1346,8 +1346,8 @@ _080A5772: bx r1 thumb_func_end sub_80A5758 - thumb_func_start sub_80A5778 -sub_80A5778: + thumb_func_start GetCurrentDungeonBounds +GetCurrentDungeonBounds: push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -1358,15 +1358,15 @@ sub_80A5778: movs r0, 0 b _080A5798 .align 2, 0 -_080A578C: .4byte gUnknown_3001B70 +_080A578C: .4byte gGroundMapDungeon_3001B70 _080A5790: adds r1, r3, 0 - bl sub_80A463C + bl GetDungeonBounds movs r0, 0x1 _080A5798: pop {r1} bx r1 - thumb_func_end sub_80A5778 + thumb_func_end GetCurrentDungeonBounds thumb_func_start sub_80A579C sub_80A579C: @@ -1396,7 +1396,7 @@ sub_80A579C: adds r0, r3, 0 adds r1, r6, 0 adds r2, r5, 0 - bl sub_80A463C + bl GetDungeonBounds ldr r2, [r6] mov r12, r2 movs r0, 0xF0 @@ -1450,7 +1450,7 @@ _080A5832: movs r0, 0x1 b _080A5856 .align 2, 0 -_080A5838: .4byte gUnknown_3001B70 +_080A5838: .4byte gGroundMapDungeon_3001B70 _080A583C: .4byte gGroundMapAction _080A5840: .4byte gGroundConversion_811BAF4 _080A5844: .4byte 0xffff8800 @@ -1465,8 +1465,8 @@ _080A5856: bx r1 thumb_func_end sub_80A579C - thumb_func_start sub_80A585C -sub_80A585C: + thumb_func_start CheckMapCollision_80A585C +CheckMapCollision_80A585C: push {r4-r7,lr} adds r7, r1, 0 ldr r1, _080A5884 @@ -1488,7 +1488,7 @@ _080A587E: movs r0, 0x1 b _080A58C0 .align 2, 0 -_080A5884: .4byte gUnknown_3001B70 +_080A5884: .4byte gGroundMapDungeon_3001B70 _080A5888: .4byte 0x00000544 _080A588C: .4byte 0x00000405 _080A5890: @@ -1524,7 +1524,7 @@ _080A58C0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80A585C + thumb_func_end CheckMapCollision_80A585C thumb_func_start sub_80A58C8 sub_80A58C8: @@ -1549,7 +1549,7 @@ _080A58EA: movs r0, 0x1 b _080A592C .align 2, 0 -_080A58F0: .4byte gUnknown_3001B70 +_080A58F0: .4byte gGroundMapDungeon_3001B70 _080A58F4: .4byte 0x00000544 _080A58F8: .4byte 0x00000405 _080A58FC: @@ -1606,7 +1606,7 @@ sub_80A5934: pop {r1} bx r1 .align 2, 0 -_080A5958: .4byte gUnknown_3001B70 +_080A5958: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A5934 thumb_func_start sub_80A595C @@ -1628,7 +1628,7 @@ sub_80A595C: pop {r1} bx r1 .align 2, 0 -_080A5980: .4byte gUnknown_3001B70 +_080A5980: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A595C thumb_func_start sub_80A5984 @@ -1645,7 +1645,7 @@ sub_80A5984: pop {r1} bx r1 .align 2, 0 -_080A599C: .4byte gUnknown_3001B70 +_080A599C: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A5984 thumb_func_start sub_80A59A0 @@ -1664,7 +1664,7 @@ sub_80A59A0: pop {r0} bx r0 .align 2, 0 -_080A59BC: .4byte gUnknown_3001B70 +_080A59BC: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A59A0 thumb_func_start GroundMap_Action @@ -1733,7 +1733,7 @@ _080A5A2C: _080A5A32: b _080A5E46 .align 2, 0 -_080A5A34: .4byte gUnknown_3001B70 +_080A5A34: .4byte gGroundMapDungeon_3001B70 _080A5A38: .4byte gGroundMapAction _080A5A3C: cmp r0, 0xA8 @@ -1832,7 +1832,7 @@ _080A5A8C: ldr r0, [r5] b _080A5DD0 .align 2, 0 -_080A5AF0: .4byte gUnknown_3001B70 +_080A5AF0: .4byte gGroundMapDungeon_3001B70 _080A5AF4: ldr r2, [r6] adds r3, r2, 0 @@ -1883,7 +1883,7 @@ _080A5B20: movs r1, 0 b _080A5DD2 .align 2, 0 -_080A5B54: .4byte gUnknown_3001B70 +_080A5B54: .4byte gGroundMapDungeon_3001B70 _080A5B58: adds r4, r3, 0 adds r4, 0xF0 @@ -2286,7 +2286,7 @@ _080A5E5A: pop {r0} bx r0 .align 2, 0 -_080A5E6C: .4byte gUnknown_3001B70 +_080A5E6C: .4byte gGroundMapDungeon_3001B70 thumb_func_end sub_80A59DC .align 2,0 diff --git a/asm/ground_object.s b/asm/ground_object.s index ef85cece8..a29dfb014 100644 --- a/asm/ground_object.s +++ b/asm/ground_object.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_80ABB54 -sub_80ABB54: + thumb_func_start AllocGroundObjects +AllocGroundObjects: push {r4,r5,lr} ldr r4, _080ABB90 movs r0, 0xE2 @@ -32,17 +32,17 @@ _080ABB74: adds r1, r4 cmp r0, 0xF ble _080ABB74 - bl DeleteBlankGroundObjects + bl DeleteGroundObjects pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080ABB90: .4byte gUnknown_3001B88 +_080ABB90: .4byte gGroundObjects _080ABB94: .4byte 0x0000ffff - thumb_func_end sub_80ABB54 + thumb_func_end AllocGroundObjects - thumb_func_start DeleteBlankGroundObjects -DeleteBlankGroundObjects: + thumb_func_start DeleteGroundObjects +DeleteGroundObjects: push {r4-r6,lr} ldr r0, _080ABBD0 ldr r4, [r0] @@ -73,13 +73,13 @@ _080ABBB6: pop {r0} bx r0 .align 2, 0 -_080ABBD0: .4byte gUnknown_3001B88 - thumb_func_end DeleteBlankGroundObjects +_080ABBD0: .4byte gGroundObjects + thumb_func_end DeleteGroundObjects - thumb_func_start sub_80ABBD4 -sub_80ABBD4: + thumb_func_start FreeGroundObjects +FreeGroundObjects: push {r4,lr} - bl DeleteBlankGroundObjects + bl DeleteGroundObjects ldr r4, _080ABBEC ldr r0, [r4] bl MemoryFree @@ -89,8 +89,8 @@ sub_80ABBD4: pop {r0} bx r0 .align 2, 0 -_080ABBEC: .4byte gUnknown_3001B88 - thumb_func_end sub_80ABBD4 +_080ABBEC: .4byte gGroundObjects + thumb_func_end FreeGroundObjects thumb_func_start GroundObject_Select GroundObject_Select: @@ -105,7 +105,7 @@ GroundObject_Select: asrs r6, r2, 24 ldr r1, _080ABC54 adds r0, r4, 0 - bl sub_80A77D0 + bl GetGroundScript adds r5, r0, 0 ldr r1, _080ABC58 str r6, [sp] @@ -204,7 +204,7 @@ _080ABCA6: bx r0 .align 2, 0 _080ABCC4: .4byte gUnknown_8118414 -_080ABCC8: .4byte gUnknown_3001B88 +_080ABCC8: .4byte gGroundObjects thumb_func_end GroundObject_Cancel thumb_func_start GroundObject_CancelBlank @@ -243,7 +243,7 @@ _080ABCF0: lsls r1, 1 adds r0, r4, r1 mov r1, sp - bl sub_80A675C + bl IsOnscreen_80A675C lsls r0, 24 cmp r0, 0 bne _080ABD20 @@ -267,7 +267,7 @@ _080ABD20: bx r0 .align 2, 0 _080ABD40: .4byte gUnknown_811842C -_080ABD44: .4byte gUnknown_3001B88 +_080ABD44: .4byte gGroundObjects thumb_func_end GroundObject_CancelBlank thumb_func_start sub_80ABD48 @@ -291,7 +291,7 @@ _080ABD5E: adds r0, r3, 0 b _080ABD80 .align 2, 0 -_080ABD6C: .4byte gUnknown_3001B88 +_080ABD6C: .4byte gGroundObjects _080ABD70: adds r0, r2, 0 adds r2, r5 @@ -329,7 +329,7 @@ GroundObject_Add: bne _080ABDDA movs r0, 0 movs r1, 0x28 - bl sub_8001658 + bl GetScriptVarValue cmp r0, 0x1 bgt _080ABDBC movs r4, 0x1B @@ -337,12 +337,12 @@ GroundObject_Add: _080ABDBC: movs r0, 0 movs r1, 0x29 - bl sub_8001658 + bl GetScriptVarValue cmp r0, 0 bne _080ABDD4 movs r0, 0 movs r1, 0x27 - bl sub_8001658 + bl GetScriptVarValue adds r0, 0x1C b _080ABDD6 _080ABDD4: @@ -378,8 +378,8 @@ _080ABDF4: movs r7, 0 b _080ABE40 .align 2, 0 -_080ABE10: .4byte gUnknown_811ED20 -_080ABE14: .4byte gUnknown_3001B88 +_080ABE10: .4byte gGroundObjectTypes +_080ABE14: .4byte gGroundObjects _080ABE18: adds r0, r3, 0x1 lsls r0, 16 @@ -456,7 +456,7 @@ _080ABE9C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ABEA8: .4byte gUnknown_3001B88 +_080ABEA8: .4byte gGroundObjects _080ABEAC: .4byte gUnknown_8118448 _080ABEB0: .4byte _080ABEB4 .align 2, 0 @@ -693,7 +693,7 @@ _080AC076: adds r0, 0x28 adds r1, r5, 0 adds r1, 0x30 - bl sub_80A5778 + bl GetCurrentDungeonBounds ldr r3, [sp, 0x10] cmp r3, 0 beq _080AC0C0 @@ -742,7 +742,7 @@ _080AC0C0: movs r2, 0xA2 lsls r2, 1 adds r0, r5, r2 - bl sub_80A66A4 + bl SpriteHasPokemonSize_80A66A4 lsls r0, 24 ldr r2, _080AC158 cmp r0, 0 @@ -784,7 +784,7 @@ _080AC11C: adds r0, r4, 0 movs r1, 0 movs r2, 0 - bl sub_809D8C0 + bl ExecutePredefinedScript _080AC140: adds r0, r7, 0 _080AC142: @@ -797,7 +797,7 @@ _080AC142: pop {r1} bx r1 .align 2, 0 -_080AC154: .4byte gUnknown_81182A0 +_080AC154: .4byte gGroundObjectCallbacks _080AC158: .4byte gUnknown_81182F4 _080AC15C: .4byte gUnknown_8118350 _080AC160: .4byte gFunctionScriptTable @@ -827,14 +827,14 @@ GroundObject_Delete: bl sub_80A7658 adds r0, r4, 0 adds r0, 0x38 - bl sub_809D648 + bl InitAction2 ldr r0, _080AC1AC strh r0, [r4, 0x6] pop {r4} pop {r0} bx r0 .align 2, 0 -_080AC1A4: .4byte gUnknown_3001B88 +_080AC1A4: .4byte gGroundObjects _080AC1A8: .4byte gUnknown_81184B0 _080AC1AC: .4byte 0x0000ffff thumb_func_end GroundObject_Delete @@ -873,7 +873,7 @@ _080AC1EA: pop {r0} bx r0 .align 2, 0 -_080AC1F0: .4byte gUnknown_3001B88 +_080AC1F0: .4byte gGroundObjects thumb_func_end sub_80AC1B0 thumb_func_start sub_80AC1F4 @@ -913,7 +913,7 @@ _080AC232: pop {r0} bx r0 .align 2, 0 -_080AC238: .4byte gUnknown_3001B88 +_080AC238: .4byte gGroundObjects _080AC23C: .4byte 0x337fffff thumb_func_end sub_80AC1F4 @@ -939,7 +939,7 @@ sub_80AC240: movs r0, 0 b _080AC270 .align 2, 0 -_080AC268: .4byte gUnknown_3001B88 +_080AC268: .4byte gGroundObjects _080AC26C: adds r0, r2, 0 adds r0, 0x38 @@ -973,13 +973,13 @@ sub_80AC274: movs r0, 0 b _080AC2B4 .align 2, 0 -_080AC2A0: .4byte gUnknown_3001B88 +_080AC2A0: .4byte gGroundObjects _080AC2A4: adds r0, r2, 0 adds r0, 0x38 adds r1, r4, 0 adds r2, r3, 0 - bl sub_809D6E4 + bl GetPredefinedScript lsls r0, 24 lsrs r0, 24 _080AC2B4: @@ -1017,7 +1017,7 @@ GroundObject_ExecuteScript: movs r0, 0 b _080AC314 .align 2, 0 -_080AC2F4: .4byte gUnknown_3001B88 +_080AC2F4: .4byte gGroundObjects _080AC2F8: .4byte gUnknown_81184CC _080AC2FC: adds r0, r4, 0 @@ -1039,8 +1039,8 @@ _080AC314: _080AC31C: .4byte gUnknown_8118504 thumb_func_end GroundObject_ExecuteScript - thumb_func_start sub_80AC320 -sub_80AC320: + thumb_func_start GroundObjectsNotifyAll +GroundObjectsNotifyAll: push {r4-r7,lr} mov r7, r8 push {r7} @@ -1062,7 +1062,7 @@ _080AC33A: adds r0, r4, 0 adds r0, 0x38 adds r1, r7, 0 - bl sub_809D968 + bl GroundScriptNotify orrs r5, r0 lsls r0, r5, 24 lsrs r5, r0, 24 @@ -1084,11 +1084,11 @@ _080AC352: pop {r1} bx r1 .align 2, 0 -_080AC374: .4byte gUnknown_3001B88 - thumb_func_end sub_80AC320 +_080AC374: .4byte gGroundObjects + thumb_func_end GroundObjectsNotifyAll - thumb_func_start sub_80AC378 -sub_80AC378: + thumb_func_start GroundObjectsCancellAll +GroundObjectsCancellAll: push {r4-r7,lr} ldr r0, _080AC3BC ldr r4, [r0] @@ -1124,8 +1124,8 @@ _080AC39E: pop {r1} bx r1 .align 2, 0 -_080AC3BC: .4byte gUnknown_3001B88 - thumb_func_end sub_80AC378 +_080AC3BC: .4byte gGroundObjects + thumb_func_end GroundObjectsCancellAll thumb_func_start sub_80AC3C0 sub_80AC3C0: @@ -1143,7 +1143,7 @@ sub_80AC3C0: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080AC3DC: .4byte gUnknown_3001B88 +_080AC3DC: .4byte gGroundObjects thumb_func_end sub_80AC3C0 thumb_func_start sub_80AC3E0 @@ -1167,7 +1167,7 @@ sub_80AC3E0: ldrsh r0, [r0, r1] bx lr .align 2, 0 -_080AC404: .4byte gUnknown_3001B88 +_080AC404: .4byte gGroundObjects thumb_func_end sub_80AC3E0 thumb_func_start sub_80AC408 @@ -1195,7 +1195,7 @@ sub_80AC408: str r0, [r3, 0x4] b _080AC440 .align 2, 0 -_080AC434: .4byte gUnknown_3001B88 +_080AC434: .4byte gGroundObjects _080AC438: ldr r0, [r2, 0xC] ldr r1, [r2, 0x10] @@ -1232,7 +1232,7 @@ sub_80AC448: str r0, [r3] b _080AC492 .align 2, 0 -_080AC474: .4byte gUnknown_3001B88 +_080AC474: .4byte gGroundObjects _080AC478: movs r1, 0x92 lsls r1, 1 @@ -1269,14 +1269,14 @@ sub_80AC49C: ldr r4, [r3] adds r4, r2 adds r0, r4, 0 - bl sub_80AC6AC + bl TryMoveObjectRelative_80AC6AC movs r1, 0x6 ldrsh r0, [r4, r1] pop {r4} pop {r1} bx r1 .align 2, 0 -_080AC4C4: .4byte gUnknown_3001B88 +_080AC4C4: .4byte gGroundObjects thumb_func_end sub_80AC49C thumb_func_start sub_80AC4C8 @@ -1334,7 +1334,7 @@ _080AC4DE: adds r0, r5, 0 b _080AC54C .align 2, 0 -_080AC530: .4byte gUnknown_3001B88 +_080AC530: .4byte gGroundObjects _080AC534: adds r0, r6, 0 movs r1, 0x80 @@ -1416,7 +1416,7 @@ _080AC576: adds r0, r6, 0 b _080AC5E4 .align 2, 0 -_080AC5C8: .4byte gUnknown_3001B88 +_080AC5C8: .4byte gGroundObjects _080AC5CC: adds r0, r7, 0 movs r2, 0x80 @@ -1440,8 +1440,8 @@ _080AC5E4: bx r1 thumb_func_end sub_80AC554 - thumb_func_start sub_80AC5F4 -sub_80AC5F4: + thumb_func_start GetObjectCollision_80AC5F4 +GetObjectCollision_80AC5F4: push {r4-r7,lr} mov r7, r8 push {r7} @@ -1500,7 +1500,7 @@ _080AC63A: beq _080AC678 mov r0, sp adds r1, r2, 0 - bl sub_80A585C + bl CheckMapCollision_80A585C lsls r0, 24 cmp r0, 0 beq _080AC678 @@ -1522,7 +1522,7 @@ _080AC678: negs r0, r0 adds r2, r5, 0 adds r3, r6, 0 - bl sub_80A92A0 + bl GetLivesCollision_80A92A0 lsls r0, 16 cmp r0, 0 blt _080AC69E @@ -1537,10 +1537,10 @@ _080AC6A0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_80AC5F4 + thumb_func_end GetObjectCollision_80AC5F4 - thumb_func_start sub_80AC6AC -sub_80AC6AC: + thumb_func_start TryMoveObjectRelative_80AC6AC +TryMoveObjectRelative_80AC6AC: push {r4,r5,lr} sub sp, 0x10 adds r5, r0, 0 @@ -1578,7 +1578,7 @@ _080AC6EA: _080AC6EE: adds r0, r5, 0 mov r1, sp - bl sub_80AC5F4 + bl GetObjectCollision_80AC5F4 cmp r0, 0 bne _080AC718 movs r0, 0x92 @@ -1601,10 +1601,10 @@ _080AC718: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80AC6AC + thumb_func_end TryMoveObjectRelative_80AC6AC - thumb_func_start sub_80AC720 -sub_80AC720: + thumb_func_start TryMoveRelative_80AC720 +TryMoveRelative_80AC720: push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 @@ -1680,7 +1680,7 @@ _080AC7A4: _080AC7A6: adds r0, r4, 0 mov r1, sp - bl sub_80AC5F4 + bl GetObjectCollision_80AC5F4 cmp r0, 0 bne _080AC7D8 movs r3, 0x92 @@ -1708,26 +1708,26 @@ _080AC7D8: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_80AC720 + thumb_func_end TryMoveRelative_80AC720 - thumb_func_start sub_80AC7E0 -sub_80AC7E0: + thumb_func_start CallbackObjectGetIndex +CallbackObjectGetIndex: movs r1, 0x4 ldrsh r0, [r0, r1] bx lr - thumb_func_end sub_80AC7E0 + thumb_func_end CallbackObjectGetIndex - thumb_func_start sub_80AC7E8 -sub_80AC7E8: + thumb_func_start CallbackObjectGetSize +CallbackObjectGetSize: ldr r2, [r0, 0xC] ldr r3, [r0, 0x10] str r2, [r1] str r3, [r1, 0x4] bx lr - thumb_func_end sub_80AC7E8 + thumb_func_end CallbackObjectGetSize - thumb_func_start sub_80AC7F4 -sub_80AC7F4: + thumb_func_start CallbackObjectSetHitboxPos +CallbackObjectSetHitboxPos: push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -1817,10 +1817,10 @@ _080AC89A: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AC7F4 + thumb_func_end CallbackObjectSetHitboxPos - thumb_func_start sub_80AC8A0 -sub_80AC8A0: + thumb_func_start CallbackObjectSetPositionBounds +CallbackObjectSetPositionBounds: push {r4,lr} ldr r3, [r1] ldr r4, [r1, 0x4] @@ -1833,10 +1833,10 @@ sub_80AC8A0: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AC8A0 + thumb_func_end CallbackObjectSetPositionBounds - thumb_func_start sub_80AC8B8 -sub_80AC8B8: + thumb_func_start CallbackObjectGetHitboxCenter +CallbackObjectGetHitboxCenter: adds r3, r0, 0 movs r2, 0x92 lsls r2, 1 @@ -1853,18 +1853,18 @@ sub_80AC8B8: adds r0, r2 str r0, [r1, 0x4] bx lr - thumb_func_end sub_80AC8B8 + thumb_func_end CallbackObjectGetHitboxCenter - thumb_func_start sub_80AC8D8 -sub_80AC8D8: + thumb_func_start CallbackObjectMoveReal +CallbackObjectMoveReal: push {lr} - bl sub_80AC6AC + bl TryMoveObjectRelative_80AC6AC pop {r1} bx r1 - thumb_func_end sub_80AC8D8 + thumb_func_end CallbackObjectMoveReal - thumb_func_start sub_80AC8E4 -sub_80AC8E4: + thumb_func_start CallbackObjectGetPosHeightAndUnk +CallbackObjectGetPosHeightAndUnk: push {r4,lr} adds r3, r0, 0 movs r4, 0x9A @@ -1880,29 +1880,29 @@ sub_80AC8E4: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80AC8E4 + thumb_func_end CallbackObjectGetPosHeightAndUnk - thumb_func_start sub_80AC904 -sub_80AC904: + thumb_func_start CallbackObjectSetPosHeight +CallbackObjectSetPosHeight: movs r2, 0x9A lsls r2, 1 adds r0, r2 str r1, [r0] bx lr - thumb_func_end sub_80AC904 + thumb_func_end CallbackObjectSetPosHeight - thumb_func_start sub_80AC910 -sub_80AC910: + thumb_func_start CallbackObjectGetDirection +CallbackObjectGetDirection: movs r2, 0x90 lsls r2, 1 adds r0, r2 ldrb r0, [r0] strb r0, [r1] bx lr - thumb_func_end sub_80AC910 + thumb_func_end CallbackObjectGetDirection - thumb_func_start sub_80AC91C -sub_80AC91C: + thumb_func_start CallbackObjectSetDirection +CallbackObjectSetDirection: push {lr} adds r2, r0, 0 lsls r1, 24 @@ -1918,10 +1918,10 @@ sub_80AC91C: _080AC934: pop {r0} bx r0 - thumb_func_end sub_80AC91C + thumb_func_end CallbackObjectSetDirection - thumb_func_start sub_80AC938 -sub_80AC938: + thumb_func_start CallbackObjectSetEventIndex +CallbackObjectSetEventIndex: push {r4,r5,lr} lsls r1, 16 adds r3, r0, 0 @@ -1973,10 +1973,10 @@ _080AC990: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_80AC938 + thumb_func_end CallbackObjectSetEventIndex - thumb_func_start sub_80AC998 -sub_80AC998: + thumb_func_start CallbackObjectSetUnk_80AC998 +CallbackObjectSetUnk_80AC998: push {lr} lsls r1, 16 asrs r1, 16 @@ -1993,10 +1993,10 @@ _080AC9AA: strh r2, [r0] pop {r0} bx r0 - thumb_func_end sub_80AC998 + thumb_func_end CallbackObjectSetUnk_80AC998 - thumb_func_start sub_80AC9B8 -sub_80AC9B8: + thumb_func_start CallbackObjectSpriteRelatedCheck_80AC9B8 +CallbackObjectSpriteRelatedCheck_80AC9B8: push {lr} adds r1, r0, 0 movs r2, 0x9E @@ -2016,10 +2016,10 @@ _080AC9D6: _080AC9D8: pop {r1} bx r1 - thumb_func_end sub_80AC9B8 + thumb_func_end CallbackObjectSpriteRelatedCheck_80AC9B8 - thumb_func_start sub_80AC9DC -sub_80AC9DC: + thumb_func_start CallbackObjectSpriteRelated_80AC9DC +CallbackObjectSpriteRelated_80AC9DC: push {lr} adds r1, r0, 0 movs r2, 0xA0 @@ -2041,45 +2041,45 @@ _080AC9FE: _080ACA00: pop {r1} bx r1 - thumb_func_end sub_80AC9DC + thumb_func_end CallbackObjectSpriteRelated_80AC9DC - thumb_func_start sub_80ACA04 -sub_80ACA04: + thumb_func_start CallbackObjectGetFlags +CallbackObjectGetFlags: movs r2, 0x8E lsls r2, 1 adds r0, r2 ldr r0, [r0] str r0, [r1] bx lr - thumb_func_end sub_80ACA04 + thumb_func_end CallbackObjectGetFlags - thumb_func_start sub_80ACA10 -sub_80ACA10: + thumb_func_start CallbackObjectSetFlags +CallbackObjectSetFlags: push {lr} movs r2, 0x4 ldrsh r0, [r0, r2] bl sub_80AC1B0 pop {r0} bx r0 - thumb_func_end sub_80ACA10 + thumb_func_end CallbackObjectSetFlags - thumb_func_start sub_80ACA20 -sub_80ACA20: + thumb_func_start CallbackObjectClearFlags +CallbackObjectClearFlags: push {lr} movs r2, 0x4 ldrsh r0, [r0, r2] bl sub_80AC1F4 pop {r0} bx r0 - thumb_func_end sub_80ACA20 + thumb_func_end CallbackObjectClearFlags - thumb_func_start sub_80ACA30 -sub_80ACA30: + thumb_func_start CallbackObjectMoveRelative +CallbackObjectMoveRelative: push {lr} - bl sub_80AC720 + bl TryMoveRelative_80AC720 pop {r1} bx r1 - thumb_func_end sub_80ACA30 + thumb_func_end CallbackObjectMoveRelative thumb_func_start GroundObject_Action GroundObject_Action: @@ -2115,14 +2115,14 @@ _080ACA54: bl GroundObject_Delete b _080ACAB2 .align 2, 0 -_080ACA7C: .4byte gUnknown_3001B88 +_080ACA7C: .4byte gGroundObjects _080ACA80: .4byte gUnknown_8118524 _080ACA84: adds r0, r4, 0 movs r1, 0 movs r2, 0x1 ldr r3, _080ACAD0 - bl sub_809D8C0 + bl ExecutePredefinedScript _080ACA90: ldrb r0, [r6] cmp r0, 0 @@ -2253,7 +2253,7 @@ _080ACB64: pop {r0} bx r0 .align 2, 0 -_080ACB8C: .4byte gUnknown_3001B88 +_080ACB8C: .4byte gGroundObjects thumb_func_end sub_80ACAD4 .align 2,0 diff --git a/asm/ground_script.s b/asm/ground_script.s index bb5dffbf8..39a16b3af 100644 --- a/asm/ground_script.s +++ b/asm/ground_script.s @@ -214,7 +214,7 @@ _080A172C: .4byte gFriendAreaDialogue _080A1730: movs r0, 0 movs r1, 0x14 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r0, 16 bl sub_80A2740 @@ -271,7 +271,7 @@ _080A1794: movs r0, 0 movs r1, 0x2F adds r2, r4, 0 - bl sub_8001784 + bl GetScriptVarArrayValue cmp r0, 0 bne _080A17B6 bl _080A234E @@ -1001,7 +1001,7 @@ _080A1DA8: movs r0, 0 movs r1, 0x1F adds r2, r5, 0 - bl sub_80018D8 + bl SetScriptVarValue ldr r4, _080A1DE8 adds r0, r5, 0 bl GetFriendArea @@ -1010,7 +1010,7 @@ _080A1DA8: lsrs r1, 24 adds r0, r4, 0 movs r2, 0 - bl sub_8092578 + bl WriteFriendAreaName adds r0, r5, 0 bl GetFriendArea lsls r0, 24 @@ -1027,7 +1027,7 @@ _080A1DE8: .4byte gUnknown_202E628 _080A1DEC: movs r0, 0 movs r1, 0x1F - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r5, r0, 16 ldr r4, _080A1E2C @@ -1038,7 +1038,7 @@ _080A1DEC: lsrs r1, 24 adds r0, r4, 0 movs r2, 0 - bl sub_8092578 + bl WriteFriendAreaName cmp r5, 0 bne _080A1E14 b _080A236A @@ -1067,7 +1067,7 @@ _080A1E3C: _080A1E42: movs r0, 0 movs r1, 0x1F - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r5, r0, 16 adds r6, r5, 0 @@ -1079,7 +1079,7 @@ _080A1E42: lsrs r1, 24 adds r0, r4, 0 movs r2, 0 - bl sub_8092578 + bl WriteFriendAreaName cmp r5, 0 bne _080A1E6C b _080A236A @@ -1171,7 +1171,7 @@ _080A1F28: bl AddToTeamMoney b _080A236A .align 2, 0 -_080A1F30: .4byte gUnknown_202DE58 +_080A1F30: .4byte gFormatItems _080A1F34: .4byte gUnknown_81167EC _080A1F38: .4byte 0x00002710 _080A1F3C: @@ -1212,7 +1212,7 @@ _080A1F80: negs r2, r2 movs r0, 0x3 movs r1, 0x12 - bl sub_8001D44 + bl ScriptVarScenarioAfter lsls r0, 24 cmp r0, 0 bne _080A1F94 @@ -1220,7 +1220,7 @@ _080A1F80: _080A1F94: movs r0, 0 movs r1, 0xF - bl sub_8001658 + bl GetScriptVarValue cmp r0, 0x4 bne _080A1FA2 b _080A236A @@ -1228,7 +1228,7 @@ _080A1FA2: movs r0, 0 movs r1, 0x42 movs r2, 0 - bl sub_8001784 + bl GetScriptVarArrayValue cmp r0, 0 ble _080A1FB2 b _080A236A @@ -1242,14 +1242,14 @@ _080A1FB2: movs r1, 0x42 movs r2, 0 movs r3, 0x4 - bl sub_800199C + bl SetScriptVarArrayValue b _080A1EBE _080A1FCC: movs r0, 0 movs r1, 0x42 movs r2, 0 movs r3, 0x1 - bl sub_800199C + bl SetScriptVarArrayValue b _080A236A _080A1FDA: ldr r6, _080A200C @@ -1527,7 +1527,7 @@ _080A21F4: movs r2, 0x80 lsls r2, 1 add r0, sp, 0x360 - bl sub_8002BB8 + bl SetVecFromDirectionSpeed add r0, sp, 0x360 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -1687,7 +1687,7 @@ _080A234E: movs r1, 0x2F adds r2, r4, 0 movs r3, 0x1 - bl sub_800199C + bl SetScriptVarArrayValue adds r0, r5, 0 subs r0, 0x10 b _080A236C @@ -1695,7 +1695,7 @@ _080A2360: movs r0, 0 movs r1, 0x1F movs r2, 0 - bl sub_80018D8 + bl SetScriptVarValue _080A236A: movs r0, 0 _080A236C: @@ -1733,22 +1733,22 @@ _080A2390: lsls r5, r6, 16 asrs r5, 16 adds r0, r5, 0 - bl sub_80A4D2C + bl GroundMapNotifyAll adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 adds r0, r5, 0 - bl sub_80A8B1C + bl GroundLivesNotifyAll orrs r4, r0 lsls r4, 24 lsrs r4, 24 adds r0, r5, 0 - bl sub_80AC320 + bl GroundObjectsNotifyAll orrs r4, r0 lsls r4, 24 lsrs r4, 24 adds r0, r5, 0 - bl sub_80AD238 + bl GroundEffectsNotifyAll orrs r4, r0 lsls r4, 24 lsrs r4, 24 @@ -1765,13 +1765,13 @@ _080A2390: lsls r4, 16 asrs r4, 16 adds r0, r4, 0 - bl sub_80A4D2C + bl GroundMapNotifyAll adds r0, r4, 0 - bl sub_80A8B1C + bl GroundLivesNotifyAll adds r0, r4, 0 - bl sub_80AC320 + bl GroundObjectsNotifyAll adds r0, r4, 0 - bl sub_80AD238 + bl GroundEffectsNotifyAll movs r0, 0 strb r0, [r5] _080A240C: @@ -1785,10 +1785,10 @@ _080A2414: pop {r0} bx r0 .align 2, 0 -_080A241C: .4byte gUnknown_2039A36 -_080A2420: .4byte gUnknown_2039A38 +_080A241C: .4byte gAnyScriptLocked +_080A2420: .4byte gScriptLocks _080A2424: .4byte gUnknown_8116848 -_080A2428: .4byte gUnknown_2039AC0 +_080A2428: .4byte gScriptLockConds thumb_func_end GroundScript_Unlock .align 2,0 diff --git a/asm/ground_sprite.s b/asm/ground_sprite.s index ca67ea03c..52cac0d6e 100644 --- a/asm/ground_sprite.s +++ b/asm/ground_sprite.s @@ -105,8 +105,8 @@ sub_80A6688: bx r0 thumb_func_end sub_80A6688 - thumb_func_start sub_80A66A4 -sub_80A66A4: + thumb_func_start SpriteHasPokemonSize_80A66A4 +SpriteHasPokemonSize_80A66A4: push {lr} movs r1, 0 adds r0, 0x48 @@ -119,7 +119,7 @@ _080A66B4: adds r0, r1, 0 pop {r1} bx r1 - thumb_func_end sub_80A66A4 + thumb_func_end SpriteHasPokemonSize_80A66A4 thumb_func_start sub_80A66BC sub_80A66BC: @@ -224,8 +224,8 @@ _080A6754: bx r1 thumb_func_end sub_80A671C - thumb_func_start sub_80A675C -sub_80A675C: + thumb_func_start IsOnscreen_80A675C +IsOnscreen_80A675C: push {r4-r6,lr} sub sp, 0x8 adds r6, r1, 0 @@ -287,7 +287,7 @@ _080A67C2: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80A675C + thumb_func_end IsOnscreen_80A675C thumb_func_start sub_80A67CC sub_80A67CC: @@ -1429,7 +1429,7 @@ _080A7016: str r0, [sp, 0x8] adds r0, r4, 0 adds r1, r5, 0 - bl sub_80053D0 + bl AxResInit_80053D0 _080A7038: add sp, 0xC pop {r4-r7} @@ -1772,7 +1772,7 @@ sub_80A72B8: movs r0, 0 strh r0, [r1] adds r0, r6, 0 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC b _080A7304 _080A72D2: adds r5, r6, 0 @@ -1795,7 +1795,7 @@ _080A72EE: adds r0, r7, r1 strh r0, [r5] adds r0, r6, 0 - bl sub_80054BC + bl RunAxAnimationFrame_80054BC movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0xFF @@ -2153,7 +2153,7 @@ _080A758C: add r1, sp, 0x14 mov r0, r8 adds r2, r5, 0 - bl sub_808E668 + bl AddShadowSprite _080A75B4: adds r0, r5, 0 adds r1, r6, 0 @@ -2207,7 +2207,7 @@ sub_80A75CC: str r0, [sp, 0x4] b _080A762A .align 2, 0 -_080A7618: .4byte gUnknown_8117AE4 +_080A7618: .4byte gGroundObjectKinds _080A761C: .4byte 0xffff0000 _080A7620: .4byte 0x0000ffff _080A7624: .4byte gOrnamentFileArchive diff --git a/asm/handleaction.s b/asm/handleaction.s index c0d4c8ba7..c27916321 100644 --- a/asm/handleaction.s +++ b/asm/handleaction.s @@ -489,7 +489,7 @@ _0809E016: bl _call_via_r2 adds r4, r0, 0 adds r0, r5, 0 - bl sub_8002C60 + bl VecDirection8Radial lsls r0, 24 adds r2, r7, 0 adds r2, 0x4A @@ -595,7 +595,7 @@ _0809E0E8: ldr r2, [r7, 0x54] add r4, sp, 0xEC adds r0, r4, 0 - bl sub_8002BB8 + bl SetVecFromDirectionSpeed ldr r2, [r4] ldr r3, [r4, 0x4] add r1, sp, 0xF4 @@ -738,7 +738,7 @@ _0809E20C: lsls r0, 16 asrs r0, 16 adds r1, r4, 0 - bl sub_80AD8B4 + bl GroundLink_GetPos _0809E234: cmp r5, 0 beq _0809E282 @@ -759,7 +759,7 @@ _0809E234: adds r0, r5, 0 adds r1, r4, 0 adds r2, r6, 0 - bl sub_8002DF0 + bl SizedDeltaDirection8 lsls r0, 24 asrs r0, 24 mov r8, r0 @@ -771,7 +771,7 @@ _0809E234: adds r0, r5, 0 adds r1, r3, 0 adds r2, r6, 0 - bl sub_8002D54 + bl SizedDeltaDirection4 lsls r0, 24 asrs r0, 24 mov r8, r0 @@ -844,7 +844,7 @@ _0809E2F0: ldr r1, [r0] b _0809E8EC .align 2, 0 -_0809E304: .4byte gUnknown_2039B48 +_0809E304: .4byte gUnlockBranchLabels _0809E308: adds r0, r7, 0 adds r0, 0x46 @@ -909,7 +909,7 @@ _0809E376: add r0, sp, 0x11C ldr r1, [r0] adds r0, r7, 0 - bl sub_80A2460 + bl ResolveJump b _0809E8C8 _0809E382: add r0, sp, 0x120 @@ -941,7 +941,7 @@ _0809E390: _0809E3BA: ldr r1, [r4] adds r0, r7, 0 - bl sub_80A2460 + bl ResolveJump b _0809E8C8 _0809E3C4: adds r4, r7, 0 @@ -969,7 +969,7 @@ _0809E3DE: asrs r2, 16 movs r0, 0 movs r1, 0x12 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0x1 b _0809E402 _0809E400: @@ -990,14 +990,14 @@ _0809E40C: str r0, [r1] movs r0, 0 movs r1, 0x12 - bl sub_8001658 + bl GetScriptVarValue adds r2, r0, 0 lsls r2, 16 asrs r4, r2, 16 lsrs r2, 16 movs r0, 0 movs r1, 0x30 - bl sub_8001784 + bl GetScriptVarArrayValue cmp r4, 0x13 bne _0809E43C cmp r0, 0 @@ -1009,7 +1009,7 @@ _0809E43C: bl sub_8098DCC adds r0, r7, 0 movs r1, 0 - bl sub_80A2460 + bl ResolveJump str r0, [r7, 0x28] movs r0, 0 movs r1, 0 @@ -1019,7 +1019,7 @@ _0809E45A: movs r0, 0 movs r1, 0x13 movs r2, 0x13 - bl sub_80018D8 + bl SetScriptVarValue _0809E464: adds r0, r7, 0 adds r0, 0x4C @@ -1053,7 +1053,7 @@ _0809E49C: asrs r2, r0, 16 movs r0, 0 movs r1, 0x13 - bl sub_80018D8 + bl SetScriptVarValue movs r0, 0x1 b _0809E4AC _0809E4AA: @@ -1075,7 +1075,7 @@ _0809E4B4: _0809E4C4: movs r0, 0 movs r1, 0x13 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 16 asrs r6, r0, 16 add r4, sp, 0x18 @@ -1125,7 +1125,7 @@ _0809E524: bne _0809E5B8 movs r0, 0 movs r1, 0x14 - bl sub_8001658 + bl GetScriptVarValue lsls r0, 24 lsrs r0, 24 bl GetMailatIndex @@ -1171,7 +1171,7 @@ _0809E58E: bl sub_809B1C0 adds r0, r7, 0 movs r1, 0x1 - bl sub_809D8EC + bl GroundScriptCheckLockCondition lsls r0, 24 cmp r0, 0 bne _0809E5A4 @@ -1231,7 +1231,7 @@ _0809E608: adds r0, r7, 0 movs r1, 0x1 _0809E60C: - bl sub_80A2460 + bl ResolveJump str r0, [r7, 0x28] b _0809E9CC _0809E614: @@ -1263,7 +1263,7 @@ _0809E63C: movs r0, 0 movs r1, 0x13 adds r2, r4, 0 - bl sub_80018D8 + bl SetScriptVarValue adds r0, r7, 0 adds r1, r4, 0 b _0809E8EE @@ -1310,7 +1310,7 @@ _0809E6A4: add r0, sp, 0x134 ldr r1, [r0] adds r0, r7, 0 - bl sub_80A2460 + bl ResolveJump b _0809E8C8 .align 2, 0 _0809E6B0: .4byte gUnknown_2039D98 @@ -1331,7 +1331,7 @@ _0809E6C2: _0809E6D0: ldr r1, [r4] adds r0, r7, 0 - bl sub_80A2460 + bl ResolveJump b _0809E8C8 .align 2, 0 _0809E6DC: .4byte gUnknown_2039D98 @@ -1395,7 +1395,7 @@ _0809E74A: add r0, sp, 0x13C ldr r1, [r0] adds r0, r7, 0 - bl sub_80A2460 + bl ResolveJump b _0809E8C8 .align 2, 0 _0809E758: .4byte gUnknown_2039D98 @@ -1515,7 +1515,7 @@ _0809E812: bl sub_80A87AC adds r0, r7, 0 movs r1, 0 - bl sub_809D8EC + bl GroundScriptCheckLockCondition lsls r0, 24 cmp r0, 0 beq _0809E844 @@ -1593,7 +1593,7 @@ _0809E898: ldrsh r1, [r0, r5] _0809E8C2: adds r0, r7, 0 - bl sub_80A242C + bl FindLabel _0809E8C8: str r0, [r7, 0x28] _0809E8CA: @@ -1619,14 +1619,14 @@ _0809E8D8: _0809E8EC: adds r0, r7, 0 _0809E8EE: - bl sub_80A2460 + bl ResolveJump str r0, [r7, 0x28] _0809E8F4: movs r0, 0x3 strh r0, [r7, 0x26] b _0809E9CC .align 2, 0 -_0809E8FC: .4byte gUnknown_2039B48 +_0809E8FC: .4byte gUnlockBranchLabels _0809E900: adds r0, r7, 0 bl ExecuteScriptCommand @@ -1768,7 +1768,7 @@ _0809E9DA: ldr r2, [r4, 0x4] subs r1, r2 str r1, [r0, 0x4] - bl sub_8002C60 + bl VecDirection8Radial lsls r0, 24 adds r2, r7, 0 adds r2, 0x4A diff --git a/asm/pokemon.s b/asm/pokemon.s index fae56e3e9..1ce0b21da 100644 --- a/asm/pokemon.s +++ b/asm/pokemon.s @@ -391,8 +391,8 @@ _0808D478: bx r1 thumb_func_end sub_808D434 - thumb_func_start sub_808D480 -sub_808D480: + thumb_func_start GetFriendSum_808D480 +GetFriendSum_808D480: push {r4,r5,lr} ldr r0, _0808D4A8 ldr r2, [r0] @@ -418,7 +418,7 @@ _0808D498: .align 2, 0 _0808D4A8: .4byte gRecruitedPokemonRef _0808D4AC: .4byte 0x0000019d - thumb_func_end sub_808D480 + thumb_func_end GetFriendSum_808D480 thumb_func_start sub_808D4B0 sub_808D4B0: @@ -504,8 +504,8 @@ _0808D53C: .4byte gRecruitedPokemonRef _0808D540: .4byte 0x0000fffd thumb_func_end sub_808D500 - thumb_func_start sub_808D544 -sub_808D544: + thumb_func_start GetUnitSum_808D544 +GetUnitSum_808D544: push {r4-r7,lr} adds r4, r0, 0 ldr r0, _0808D57C @@ -539,7 +539,7 @@ _0808D56C: bx r1 .align 2, 0 _0808D57C: .4byte gRecruitedPokemonRef - thumb_func_end sub_808D544 + thumb_func_end GetUnitSum_808D544 thumb_func_start sub_808D580 sub_808D580: diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index 2ffbf378c..f31cf5d9b 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_808E53C -sub_808E53C: + thumb_func_start InitShadowSprites +InitShadowSprites: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -130,8 +130,8 @@ _0808E62C: .4byte gDungeonFileArchive _0808E630: .4byte 0x06010000 _0808E634: .4byte 0x0000f3ff _0808E638: .4byte 0x00003fff -_0808E63C: .4byte gUnknown_8107698 -_0808E640: .4byte gUnknown_202F3E8 +_0808E63C: .4byte gShadowSpriteSizeFlags_8107698 +_0808E640: .4byte gShadowSprites _0808E644: .4byte 0x0000feff _0808E648: .4byte 0x0000fdff _0808E64C: .4byte 0x0000efff @@ -141,6 +141,6 @@ _0808E658: .4byte 0x000003ff _0808E65C: .4byte 0x00000fff _0808E660: .4byte 0x0000fffe _0808E664: .4byte 0x0000fffd - thumb_func_end sub_808E53C + thumb_func_end InitShadowSprites .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index 78e8fe7be..237659a3a 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -367,7 +367,7 @@ _0808FA74: b _0808FAA6 .align 2, 0 _0808FA94: .4byte gUnknown_810DE50 -_0808FA98: .4byte gUnknown_202DE58 +_0808FA98: .4byte gFormatItems _0808FA9C: ldr r0, _0808FB24 ldr r1, _0808FB28 @@ -435,7 +435,7 @@ _0808FB10: str r4, [sp] b _0808FECC .align 2, 0 -_0808FB24: .4byte gUnknown_202DE58 +_0808FB24: .4byte gFormatItems _0808FB28: .4byte gUnknown_810DE58 _0808FB2C: .4byte gUnknown_810DE6C _0808FB30: .4byte gFormatData_202DE30 @@ -886,7 +886,7 @@ _0808FEEC: .4byte gUnknown_8107798 _0808FEF0: .4byte gAvailablePokemonNames _0808FEF4: .4byte gFormatData_202DE30 _0808FEF8: .4byte gUnknown_810DEB4 -_0808FEFC: .4byte gUnknown_202DE58 +_0808FEFC: .4byte gFormatItems _0808FF00: .4byte gUnknown_810DEC8 _0808FF04: .4byte gUnknown_810DEDC _0808FF08: .4byte gUnknown_810DFB4 diff --git a/asm/text.s b/asm/text.s index 20958c474..145649fc4 100644 --- a/asm/text.s +++ b/asm/text.s @@ -1095,8 +1095,8 @@ _08008624: _0800862C: .4byte gUnknown_80B86A4 thumb_func_end GetCharacter - thumb_func_start sub_8008630 -sub_8008630: + thumb_func_start HexdigitValue +HexdigitValue: push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -1124,7 +1124,7 @@ _08008658: _0800865C: pop {r1} bx r1 - thumb_func_end sub_8008630 + thumb_func_end HexdigitValue thumb_func_start xxx_get_next_char_from_string xxx_get_next_char_from_string: @@ -1136,10 +1136,10 @@ xxx_get_next_char_from_string: bne _08008696 adds r5, 0x1 ldrb r0, [r5] - bl sub_8008630 + bl HexdigitValue adds r4, r0, 0 ldrb r0, [r5, 0x1] - bl sub_8008630 + bl HexdigitValue lsls r4, 4 adds r4, r0 ldrb r0, [r5] @@ -2000,25 +2000,25 @@ _08008C44: bx r0 thumb_func_end sub_80089AC - thumb_func_start sub_8008C54 -sub_8008C54: + thumb_func_start CallPrepareTextbox_8008C54 +CallPrepareTextbox_8008C54: push {lr} adds r1, r0, 0 ldr r0, _08008C64 - bl sub_8008C6C + bl PrepareTextbox_8008C6C pop {r0} bx r0 .align 2, 0 _08008C64: .4byte gUnknown_2027370 - thumb_func_end sub_8008C54 + thumb_func_end CallPrepareTextbox_8008C54 thumb_func_start nullsub_169 nullsub_169: bx lr thumb_func_end nullsub_169 - thumb_func_start sub_8008C6C -sub_8008C6C: + thumb_func_start PrepareTextbox_8008C6C +PrepareTextbox_8008C6C: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2164,7 +2164,7 @@ _08008D60: .align 2, 0 _08008D84: .4byte 0xeeeeeeee _08008D88: .4byte 0xdddddddd - thumb_func_end sub_8008C6C + thumb_func_end PrepareTextbox_8008C6C thumb_func_start sub_8008D8C sub_8008D8C: @@ -2745,8 +2745,8 @@ _08009186: bx r1 thumb_func_end sub_800915C - thumb_func_start sub_8009190 -sub_8009190: + thumb_func_start xxx_handle_format_global +xxx_handle_format_global: push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -2757,7 +2757,7 @@ sub_8009190: bx r1 .align 2, 0 _080091A4: .4byte gUnknown_2027370 - thumb_func_end sub_8009190 + thumb_func_end xxx_handle_format_global thumb_func_start sub_80091A8 sub_80091A8: @@ -2940,7 +2940,7 @@ _080092D4: str r0, [r5, 0x18] _080092DC: ldrb r0, [r4, 0x2] - bl sub_800963C + bl InterpretColorChar str r0, [r5, 0x10] adds r4, 0x3 b _080091C0 @@ -3425,8 +3425,8 @@ _08009638: bx r1 thumb_func_end sub_8009614 - thumb_func_start sub_800963C -sub_800963C: + thumb_func_start InterpretColorChar +InterpretColorChar: push {lr} lsls r0, 24 lsrs r0, 24 @@ -3496,7 +3496,7 @@ _080096D8: _080096DA: pop {r1} bx r1 - thumb_func_end sub_800963C + thumb_func_end InterpretColorChar thumb_func_start InitGraphics InitGraphics: diff --git a/data/data.s b/data/data.s index 2052c286f..36c75d7ff 100644 --- a/data/data.s +++ b/data/data.s @@ -5,8 +5,8 @@ .string "pksdir0\0" .align 2, 0 - .global gUnknown_80B6D30 -gUnknown_80B6D30: + .global gLocalScriptVarInfo +gLocalScriptVarInfo: .2byte 5, 7, 0, 0, 1, 0; .4byte gUnknown_80B6D88 .2byte 5, 7, 2, 0, 1, 0; .4byte gUnknown_80B6D80 .2byte 5, 7, 4, 0, 1, 0; .4byte gUnknown_80B6D78 @@ -587,8 +587,8 @@ gUnknown_80B7388: @ 80B7388 @ code.c .string "pksdir0\0" - .global gUnknown_80B7394 -gUnknown_80B7394: @ 80B7394 + .global gScriptVarInfo +gScriptVarInfo: @ 80B7394 .2byte 6, 2, 0, 0, 1, 29; .4byte gUnknown_80B7DF8 .2byte 6, 2, 4, 0, 1, 0; .4byte gUnknown_80B7DEC .2byte 2, 2, 110, 0, 2, 0; .4byte gUnknown_80B7DDC @@ -1010,8 +1010,8 @@ gUnknown_80B7DF8: .string "pksdir0\0" .fill 8, 1, 0 - .global gUnknown_80B7E3C -gUnknown_80B7E3C: @ 80B7E3C + .global gVectorDirections +gVectorDirections: @ 80B7E3C .4byte 0, 1, 1, 1, 1, 0, 1, -1, 0, -1, -1, -1, -1, 0, -1, 1 @ ??? @@ -1787,8 +1787,8 @@ gUnknown_80B857C: @ 80B857C .4byte 0, 3, 0, 0, 0, 0 .4byte 0, 3, 0, 0, 0, 0 - .global gUnknown_80B85DC -gUnknown_80B85DC: @ 80B85DC + .global gCharMasksOffsets +gCharMasksOffsets: @ 80B85DC @ Type: unkShiftData[8] .4byte 0xFFFFFFFF, 0x00000000, 0x00, 0x20 .4byte 0x0FFFFFFF, 0xF0000000, 0x04, 0x1C @@ -1834,8 +1834,8 @@ gKanjiB_file_string: @ 80B87BC .string "kanji_b\0" .align 2,0 - .global gUnknown_80B87C4 -gUnknown_80B87C4: @ 80B87C4 + .global gFadeInNone +gFadeInNone: @ 80B87C4 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -1845,8 +1845,8 @@ gUnknown_80B87C4: @ 80B87C4 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global gUnknown_80B87E4 -gUnknown_80B87E4: @ 80B87E4 + .global gFadeInDungeon +gFadeInDungeon: @ 80B87E4 .byte 0x88, 0x88, 0x88, 0x88 .byte 0x88, 0x88, 0x88, 0x88 .byte 0x88, 0x88, 0x88, 0x88 diff --git a/data/data_80F59C8.s b/data/data_80F59C8.s index 7c67b13c1..2bff80aba 100644 --- a/data/data_80F59C8.s +++ b/data/data_80F59C8.s @@ -2102,16 +2102,16 @@ gUnknown_80F8C14: @ 80F8C14 .string "It can{APOSTROPHE}t be moved.\0" .align 2, 0 -.global gUnknown_80F8C40 -gUnknown_80F8C40: @ 80F8C40 +.global gItemStickyCannotMove1 +gItemStickyCannotMove1: @ 80F8C40 .4byte gUnknown_80F8C14 -.global gUnknown_80F8C44 -gUnknown_80F8C44: @ 80F8C44 +.global gItemStickyCannotMove2 +gItemStickyCannotMove2: @ 80F8C44 .4byte gUnknown_80F8C14 -.global gUnknown_80F8C48 -gUnknown_80F8C48: @ 80F8C48 +.global gItemStickyCannotMove3 +gItemStickyCannotMove3: @ 80F8C48 .4byte gUnknown_80F8C14 .global gUnknown_80F8C4C @@ -2120,8 +2120,8 @@ gUnknown_80F8C4C: @ 80F8C4C .string "It can{APOSTROPHE}t be equipped.\0" .align 2,0 -.global gUnknown_80F8C7C -gUnknown_80F8C7C: @ 80F8C7C +.global gItemStickyCannotEquip +gItemStickyCannotEquip: @ 80F8C7C .4byte gUnknown_80F8C4C .global gUnknown_80F8C80 @@ -2130,8 +2130,8 @@ gUnknown_80F8C80: @ 80F8C80 .string "and returned the {ARG_MOVE_ITEM_1}.\0" .align 2,0 -.global gUnknown_80F8CA8 -gUnknown_80F8CA8: @ 80F8CA8 +.global gMonTookAndReturnedItem +gMonTookAndReturnedItem: @ 80F8CA8 @ replacing .incbin "baserom.gba", 0xF8CA8, 0x3C .4byte gUnknown_80F8C80 @@ -2251,8 +2251,8 @@ gUnknown_80F8E30: @ 80F8E30 .string "Items can{APOSTROPHE}t be exchanged here.\0" .align 2, 0 -.global gUnknown_80F8E54 -gUnknown_80F8E54: @ 80F8E54 +.global gNoExchangesHere +gNoExchangesHere: @ 80F8E54 @ replacing .incbin "baserom.gba", 0xF8E54, 0x24 .4byte gUnknown_80F8E30 @@ -2261,8 +2261,8 @@ gUnknown_80F8E58: @ 80F8E58 .string "Nothing can be put down here.\0" .align 2, 0 -.global gUnknown_80F8E78 -gUnknown_80F8E78: @ 80F8E78 +.global gNothingCanBePutDownHere +gNothingCanBePutDownHere: @ 80F8E78 @ replacing .incbin "baserom.gba", 0xF8E78, 0x34 .4byte gUnknown_80F8E58 @@ -2272,8 +2272,8 @@ gUnknown_80F8E7C: @ 80F8E7C .string "ground with the {ARG_MOVE_ITEM_0}.\0" .align 2, 0 -.global gUnknown_80F8EAC -gUnknown_80F8EAC: @ 80F8EAC +.global gSwappedGroundItem +gSwappedGroundItem: @ 80F8EAC @ replacing .incbin "baserom.gba", 0xF8EAC, 0x18 .4byte gUnknown_80F8E7C @@ -2282,13 +2282,13 @@ gUnknown_80F8EB0: @ 80F8EB0 .string "{ARG_POKEMON_0} threw the {ARG_MOVE_ITEM_0}!\0" .align 2, 0 -.global gUnknown_80F8EC4 -gUnknown_80F8EC4: @ 80F8EC4 +.global gMonThrewItem1 +gMonThrewItem1: @ 80F8EC4 @ replacing .incbin "baserom.gba", 0xF8EC4, 0x4 .4byte gUnknown_80F8EB0 -.global gUnknown_80F8EC8 -gUnknown_80F8EC8: @ 80F8EC8 +.global gMonThrewItem2 +gMonThrewItem2: @ 80F8EC8 @ replacing .incbin "baserom.gba", 0xF8EC8, 0x1C .4byte gUnknown_80F8EB0 @@ -2297,8 +2297,8 @@ gUnknown_80F8ECC: @ 80F8ECC .string "You can{APOSTROPHE}t talk now.\0" .align 2, 0 -.global gUnknown_80F8EE4 -gUnknown_80F8EE4: @ 80F8EE4 +.global gCannotTalk +gCannotTalk: @ 80F8EE4 @ replacing .incbin "baserom.gba", 0xF8EE4, 0x24 .4byte gUnknown_80F8ECC @@ -2307,8 +2307,8 @@ gUnknown_80F8EE8: @ 80F8EE8 .string "You can{APOSTROPHE}t say farewell now.\0" .align 2, 0 -.global gUnknown_80F8F08 -gUnknown_80F8F08: @ 80F8F08 +.global gCannotFarewell +gCannotFarewell: @ 80F8F08 @ replacing .incbin "baserom.gba", 0xF8F08, 0x18 .4byte gUnknown_80F8EE8 @@ -2317,8 +2317,8 @@ gUnknown_80F8F0C: @ 80F8F0C .string "{ARG_POKEMON_0} is cringing!\0" .align 2, 0 -.global gUnknown_80F8F20 -gUnknown_80F8F20: @ 80F8F20 +.global gMonCringing +gMonCringing: @ 80F8F20 @ replacing .incbin "baserom.gba", 0xF8F20, 0x18 .4byte gUnknown_80F8F0C @@ -2327,8 +2327,8 @@ gUnknown_80F8F24: @ 80F8F24 .string "{ARG_POKEMON_0} is paralyzed!\0" .align 2, 0 -.global gUnknown_80F8F38 -gUnknown_80F8F38: @ 80F8F38 +.global gMonParalyzed +gMonParalyzed: @ 80F8F38 @ replacing .incbin "baserom.gba", 0xF8F38, 0x1C .4byte gUnknown_80F8F24 @@ -2338,8 +2338,8 @@ gUnknown_80F8F3C: @ 80F8F3C .string "the {ARG_MOVE_ITEM_0}.\0" .align 2, 0 -.global gUnknown_80F8F54 -gUnknown_80F8F54: @ 80F8F54 +.global gMonSteppedOnItem +gMonSteppedOnItem: @ 80F8F54 @ replacing .incbin "baserom.gba", 0xF8F54, 0x34 .4byte gUnknown_80F8F3C @@ -2349,8 +2349,8 @@ gUnknown_80F8F58: @ 80F8F58 .string "It didn{APOSTROPHE}t pick up the {ARG_MOVE_ITEM_0}.\0" .align 2, 0 -.global gUnknown_80F8F88 -gUnknown_80F8F88: @ 80F8F88 +.global gMonTerrifiedCouldntPickUpItem +gMonTerrifiedCouldntPickUpItem: @ 80F8F88 @ replacing .incbin "baserom.gba", 0xF8F88, 0x24 .4byte gUnknown_80F8F58 @@ -2360,8 +2360,8 @@ gUnknown_80F8F8C: @ 80F8F8C .string "the {ARG_MOVE_ITEM_0}.\0" .align 2, 0 -.global gUnknown_80F8FAC -gUnknown_80F8FAC: @ 80F8FAC +.global gMonCouldntPickUpItem +gMonCouldntPickUpItem: @ 80F8FAC @ replacing .incbin "baserom.gba", 0xF8FAC, 0x18 .4byte gUnknown_80F8F8C @@ -2370,8 +2370,8 @@ gUnknown_80F8FB0: @ 80F8FB0 .string "Picked up the {ARG_MOVE_ITEM_0}.\0" .align 2, 0 -.global gUnknown_80F8FC4 -gUnknown_80F8FC4: @ 80F8FC4 +.global gPickedUpItem2 +gPickedUpItem2: @ 80F8FC4 @ replacing .incbin "baserom.gba", 0xF8FC4, 0x34 .4byte gUnknown_80F8FB0 @@ -2381,13 +2381,13 @@ gUnknown_80F8FC8: @ 80F8FC8 .string "put it in the Toolbox.\0" .align 2, 0 -.global gUnknown_80F8FF8 -gUnknown_80F8FF8: @ 80F8FF8 +.global gPickedUpItemToolbox +gPickedUpItemToolbox: @ 80F8FF8 @ replacing .incbin "baserom.gba", 0xF8FF8, 0x4 .4byte gUnknown_80F8FC8 -.global gUnknown_80F8FFC -gUnknown_80F8FFC: @ 80F8FFC +.global gPickedUpItem +gPickedUpItem: @ 80F8FFC @ replacing .incbin "baserom.gba", 0xF8FFC, 0x1C .4byte gUnknown_80F8FB0 @@ -2397,8 +2397,8 @@ gUnknown_80F9000: @ 80F9000 .string "the {ARG_MOVE_ITEM_0}.\0" .align 2, 0 -.global gUnknown_80F9018 -gUnknown_80F9018: @ 80F9018 +.global gMonPickedUpItem2 +gMonPickedUpItem2: @ 80F9018 @ replacing .incbin "baserom.gba", 0xF9018, 0x38 .4byte gUnknown_80F9000 @@ -2408,13 +2408,13 @@ gUnknown_80F901C: @ 80F901C .string "{ARG_MOVE_ITEM_0} and put it in the Toolbox.\0" .align 2, 0 -.global gUnknown_80F9050 -gUnknown_80F9050: @ 80F9050 +.global gMonPickedUpItemToolbox +gMonPickedUpItemToolbox: @ 80F9050 @ replacing .incbin "baserom.gba", 0xF9050, 0x4 .4byte gUnknown_80F901C -.global gUnknown_80F9054 -gUnknown_80F9054: @ 80F9054 +.global gMonPickedUpItem +gMonPickedUpItem: @ 80F9054 @ replacing .incbin "baserom.gba", 0xF9054, 0x40 .4byte gUnknown_80F9000 @@ -2424,8 +2424,8 @@ gUnknown_80F9058: @ 80F9058 .string "It will be gone from the team forever.\0" .align 2, 0 -.global gUnknown_80F9094 -gUnknown_80F9094: @ 80F9094 +.global gSayFarewellQ +gSayFarewellQ: @ 80F9094 @ replacing .incbin "baserom.gba", 0xF9094, 0x34 .4byte gUnknown_80F9058 @@ -2435,8 +2435,8 @@ gUnknown_80F9098: @ 80F9098 .string "{ARG_POKEMON_0}{APOSTROPHE}s hold item will be lost.\0" .align 2, 0 -.global gUnknown_80F90C8 -gUnknown_80F90C8: @ 80F90C8 +.global gSendMonBackWithItemQ +gSendMonBackWithItemQ: @ 80F90C8 @ replacing .incbin "baserom.gba", 0xF90C8, 0x14 .4byte gUnknown_80F9098 @@ -2445,8 +2445,8 @@ gUnknown_80F90CC: @ 80F90CC .string "Send {ARG_POKEMON_0} back?\0" .align 2, 0 -.global gUnknown_80F90DC -gUnknown_80F90DC: @ 80F90DC +.global gSendMonBackQ +gSendMonBackQ: @ 80F90DC @ replacing .incbin "baserom.gba", 0xF90DC, 0x38 .4byte gUnknown_80F90CC @@ -2476,13 +2476,13 @@ gUnknown_80F9140: @ 80F9140 .string "{ARG_POKEMON_0} went back.\0" .align 2, 0 -.global gUnknown_80F9150 -gUnknown_80F9150: @ 80F9150 +.global gMonWentBack +gMonWentBack: @ 80F9150 @ replacing .incbin "baserom.gba", 0xF9150, 0x4 .4byte gUnknown_80F9140 -.global gUnknown_80F9154 -gUnknown_80F9154: @ 80F9154 +.global gMonDisappointedAndLeft +gMonDisappointedAndLeft: @ 80F9154 @ replacing .incbin "baserom.gba", 0xF9154, 0x4 .4byte gUnknown_80F9118 @@ -2725,8 +2725,8 @@ gUnknown_80F93CC: @ 80F93CC .string "The {ARG_MOVE_ITEM_0} fell on the ground.\0" .align 2, 0 -.global gUnknown_80F93E8 -gUnknown_80F93E8: @ 80F93E8 +.global gItemFellOnGround +gItemFellOnGround: @ 80F93E8 @ replacing .incbin "baserom.gba", 0xF93E8, 0x20 .4byte gUnknown_80F93CC @@ -2735,8 +2735,8 @@ gUnknown_80F93EC: @ 80F93EC .string "The {ARG_MOVE_ITEM_0} fell in the water.\0" .align 2, 0 -.global gUnknown_80F9408 -gUnknown_80F9408: @ 80F9408 +.global gItemFellInWater +gItemFellInWater: @ 80F9408 @ replacing .incbin "baserom.gba", 0xF9408, 0x1C .4byte gUnknown_80F93EC @@ -2745,8 +2745,8 @@ gUnknown_80F940C: @ 80F940C .string "The {ARG_MOVE_ITEM_0} became buried.\0" .align 2, 0 -.global gUnknown_80F9424 -gUnknown_80F9424: @ 80F9424 +.global gItemBuried +gItemBuried: @ 80F9424 @ replacing .incbin "baserom.gba", 0xF9424, 0x18 .4byte gUnknown_80F940C @@ -2755,8 +2755,8 @@ gUnknown_80F9428: @ 80F9428 .string "The {ARG_MOVE_ITEM_0} was lost!\0" .align 2, 0 -.global gUnknown_80F943C -gUnknown_80F943C: @ 80F943C +.global gItemLost +gItemLost: @ 80F943C @ replacing .incbin "baserom.gba", 0xF943C, 0x20 .4byte gUnknown_80F9428 @@ -2765,8 +2765,8 @@ gUnknown_80F9440: @ 80F9440 .string "All the items were lost!\0" .align 2, 0 -.global gUnknown_80F945C -gUnknown_80F945C: @ 80F945C +.global gAllItemsLost +gAllItemsLost: @ 80F945C @ replacing .incbin "baserom.gba", 0xF945C, 0x20 .4byte gUnknown_80F9440 @@ -2775,8 +2775,8 @@ gUnknown_80F9460: @ 80F9460 .string "Several items were lost!\0" .align 2, 0 -.global gUnknown_80F947C -gUnknown_80F947C: @ 80F947C +.global gSeveralItemsLost +gSeveralItemsLost: @ 80F947C @ replacing .incbin "baserom.gba", 0xF947C, 0x20 .4byte gUnknown_80F9460 @@ -2785,8 +2785,8 @@ gUnknown_80F9480: @ 80F9480 .string "The {ARG_MOVE_ITEM_0} fell out of sight!\0" .align 2, 0 -.global gUnknown_80F949C -gUnknown_80F949C: @ 80F949C +.global gItemFellOutOfSight +gItemFellOutOfSight: @ 80F949C @ replacing .incbin "baserom.gba", 0xF949C, 0x28 .4byte gUnknown_80F9480 @@ -8518,8 +8518,8 @@ gUnknown_80FE3C0: @ 80FE3C0 .string "It doesn{APOSTROPHE}t work!\0" .align 2, 0 -.global gUnknown_80FE3E8 -gUnknown_80FE3E8: @ 80FE3E8 +.global gItemStickyDoesntWorkText +gItemStickyDoesntWorkText: @ 80FE3E8 @ replacing .incbin "baserom.gba", 0xFE3E8, 0x24 .4byte gUnknown_80FE3C0 diff --git a/data/data_8106A4C.s b/data/data_8106A4C.s index 83d1727ed..db7062101 100644 --- a/data/data_8106A4C.s +++ b/data/data_8106A4C.s @@ -72,43 +72,43 @@ gUnknown_8106B8C: @ 8106B8C .byte 0x68, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global gUnknown_8106BB0 -gUnknown_8106BB0: @ 8106BB0 + .global gTeamFormat +gTeamFormat: @ 8106BB0 .string "$t\0" .align 2,0 @ Red Heart Symbols - .global gUnknown_8106BB4 -gUnknown_8106BB4: @ 8106BB4 + .global gHeartRedTiny +gHeartRedTiny: @ 8106BB4 .byte 0x87, 0x46, 0x00, 0x00 - .global gUnknown_8106BB8 -gUnknown_8106BB8: @ 8106BB8 + .global gHeartRedSmall +gHeartRedSmall: @ 8106BB8 .byte 0x87, 0x47, 0x00, 0x00 - .global gUnknown_8106BBC -gUnknown_8106BBC: @ 8106BBC + .global gHeartRedMedium +gHeartRedMedium: @ 8106BBC .byte 0x87, 0x48, 0x00, 0x00 - .global gUnknown_8106BC0 -gUnknown_8106BC0: @ 8106BC0 + .global gHeartRedLarge +gHeartRedLarge: @ 8106BC0 .byte 0x87, 0x49, 0x00, 0x00 @ Yellow Heart Symbols - .global gUnknown_8106BC4 -gUnknown_8106BC4: @ 8106BC4 + .global gHeartYellowTiny +gHeartYellowTiny: @ 8106BC4 .byte 0x87, 0x4A, 0x00, 0x00 - .global gUnknown_8106BC8 -gUnknown_8106BC8: @ 8106BC8 + .global gHeartYellowSmall +gHeartYellowSmall: @ 8106BC8 .byte 0x87, 0x4B, 0x00, 0x00 - .global gUnknown_8106BCC -gUnknown_8106BCC: @ 8106BCC + .global gHeartYellowMedium +gHeartYellowMedium: @ 8106BCC .byte 0x87, 0x4C, 0x00, 0x00 - .global gUnknown_8106BD0 -gUnknown_8106BD0: @ 8106BD0 + .global gHeartYellowLarge +gHeartYellowLarge: @ 8106BD0 .byte 0x87, 0x4D, 0x00, 0x00 .global gUnknown_8106BD4 diff --git a/data/data_8107010.s b/data/data_8107010.s index 655dbca6a..827ee4a6b 100644 --- a/data/data_8107010.s +++ b/data/data_8107010.s @@ -92,12 +92,12 @@ gUnknown_8107178: @ 8107178 @ sub_8080B30 - sub_808217C .string "pksdir0\0" -.global gUnknown_81071D4 -gUnknown_81071D4: @ 81071D4 +.global gYayoiSan +gYayoiSan: @ 81071D4 .byte 0x82, 0xe2, 0x82, 0xe6, 0x82, 0xa2, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00 -.global gUnknown_81071E0 -gUnknown_81071E0: @ 81071E0 +.global gMisakiSan +gMisakiSan: @ 81071E0 .byte 0x82, 0xdd, 0x82, 0xb3, 0x82, 0xab, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00 @ ??? .string "pksdir0\0" @@ -304,8 +304,8 @@ gUnknown_810768C: @ 810768C .string "lvmp%03d\0" .align 2,0 -.global gUnknown_8107698 -gUnknown_8107698: @ 8107698 +.global gShadowSpriteSizeFlags_8107698 +gShadowSpriteSizeFlags_8107698: @ 8107698 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 @@ -1432,13 +1432,13 @@ gUnknown_81097A4: @ 81097A4 .string "%s{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0" .align 2, 0 -.global gUnknown_81097B0 -gUnknown_81097B0: @ 81097B0 +.global gPowersOfTen +gPowersOfTen: @ 81097B0 @ replacing .incbin "baserom.gba", 0x001097b0, 0x14 .byte 0xa0, 0x86, 0x01, 0x00, 0x10, 0x27, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 -.global gUnknown_81097C4 -gUnknown_81097C4: @ 81097C4 +.global gHighDigits +gHighDigits: @ 81097C4 .byte 0x83 .global gUnknown_81097C5 diff --git a/data/data_8115F5C.s b/data/data_8115F5C.s index 11a3f8f14..a78b372ca 100644 --- a/data/data_8115F5C.s +++ b/data/data_8115F5C.s @@ -94,12 +94,12 @@ gUndefineText: @ 811616C .string "{COLOR_1 RED_2}undefine{END_COLOR_TEXT_1}\0" .align 2,0 -.global gUnknown_811617C -gUnknown_811617C: @ 811617C +.global gSpeechBubbleChar +gSpeechBubbleChar: @ 811617C .byte 0x87, 0x45, 0x00, 0x00 -.global gUnknown_8116180 -gUnknown_8116180: @ 8116180 +.global gFormattedSpeechBubble +gFormattedSpeechBubble: @ 8116180 .string "{COLOR_1 YELLOW_5}{SPEECH_BUBBLE}{END_COLOR_TEXT_1}\0" .global gUnknown_8116188 @@ -336,15 +336,15 @@ gUnknown_811642C: @ 811642C .string "pksdir0\0" .align 2,0 -.global gUnknown_8116478 -gUnknown_8116478: @ 8116478 +.global gZeroPos_8116478 +gZeroPos_8116478: @ 8116478 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .string "pksdir0\0" .align 2,0 -.global gUnknown_8116488 -gUnknown_8116488: @ 8116488 +.global gGroundScriptTriggerCallbacks +gGroundScriptTriggerCallbacks: @ 8116488 .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -974,8 +974,8 @@ gUnknown_8117354: @ 8117354 .byte 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x02, 0xb0, 0x04, 0x01, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00 .4byte sub_80A5204 -.global gUnknown_811736C -gUnknown_811736C: @ 811736C +.global gGroundScriptNullCallbacks +gGroundScriptNullCallbacks: @ 811736C .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -1432,8 +1432,8 @@ gUnknown_8117ADC: @ 8117ADC .string "flag00c\0" .align 2, 0 -.global gUnknown_8117AE4 -gUnknown_8117AE4: @ 8117AE4 +.global gGroundObjectKinds +gGroundObjectKinds: @ 8117AE4 @ replacing .incbin "baserom.gba", 0x117AE4, 0x3A8 .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -1752,35 +1752,35 @@ gUnknown_8117EDC: @ 8117EDC .string "pksdir0\0" .align 2,0 -.global gUnknown_8117EFC -gUnknown_8117EFC: @ 8117EFC +.global gNullGroundScript +gNullGroundScript: @ 8117EFC .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .string "pksdir0\0" .align 2,0 -.global gUnknown_8117F10 -gUnknown_8117F10: @ 8117F10 +.global gGroundLivesCallbacks +gGroundLivesCallbacks: @ 8117F10 .byte 0x01, 0x00, 0x00, 0x00 -.4byte sub_80AB008 -.4byte sub_80AB010 -.4byte sub_80AB0E0 -.4byte sub_80AB10C -.4byte sub_80AB138 -.4byte sub_80AB20C -.4byte sub_80AB01C -.4byte sub_80AB0C8 -.4byte sub_80AB100 -.4byte sub_80AB12C -.4byte sub_80AB144 -.4byte sub_80AB184 +.4byte CallbackLivesGetIndex +.4byte CallbackLivesGetSize +.4byte CallbackLivesGetHitboxCenter +.4byte CallbackLivesGetPosHeightAndUnk +.4byte CallbackLivesGetDirection +.4byte CallbackLivesGetFlags +.4byte CallbackLivesSetHitboxPos +.4byte CallbackLivesSetPositionBounds +.4byte CallbackLivesMoveReal +.4byte CallbackLivesSetPosHeight +.4byte CallbackLivesSetDirection +.4byte CallbackLivesSetEventIndex .4byte nullsub_211 -.4byte sub_80AB194 -.4byte sub_80AB218 -.4byte sub_80AB228 -.4byte sub_80AB238 -.4byte sub_80AB248 -.4byte sub_80AB1C0 -.4byte sub_80AB1E4 +.4byte CallbackLivesSetUnk_80AB194 +.4byte CallbackLivesSetFlags +.4byte CallbackLivesClearFlags +.4byte CallbackLivesSpriteRelated_80AB238 +.4byte CallbackLivesMoveRelative +.4byte CallbackLivesSpriteRelatedCheck_80AB1C0 +.4byte CallbackLivesSpriteRelated_80AB1E4 .global gUnknown_8117F64 gUnknown_8117F64: @ 8117F64 @@ -1965,30 +1965,30 @@ gUnknown_811828C: @ 811828C .string "pksdir0\0" .align 2,0 -.global gUnknown_81182A0 -gUnknown_81182A0: @ 81182A0 +.global gGroundObjectCallbacks +gGroundObjectCallbacks: @ 81182A0 @ replacing .incbin "baserom.gba", 0x1182A0, 0x54 .byte 0x02, 0x00, 0x00, 0x00 -.4byte sub_80AC7E0 -.4byte sub_80AC7E8 -.4byte sub_80AC8B8 -.4byte sub_80AC8E4 -.4byte sub_80AC910 -.4byte sub_80ACA04 -.4byte sub_80AC7F4 -.4byte sub_80AC8A0 -.4byte sub_80AC8D8 -.4byte sub_80AC904 -.4byte sub_80AC91C -.4byte sub_80AC938 +.4byte CallbackObjectGetIndex +.4byte CallbackObjectGetSize +.4byte CallbackObjectGetHitboxCenter +.4byte CallbackObjectGetPosHeightAndUnk +.4byte CallbackObjectGetDirection +.4byte CallbackObjectGetFlags +.4byte CallbackObjectSetHitboxPos +.4byte CallbackObjectSetPositionBounds +.4byte CallbackObjectMoveReal +.4byte CallbackObjectSetPosHeight +.4byte CallbackObjectSetDirection +.4byte CallbackObjectSetEventIndex .byte 0x00, 0x00, 0x00, 0x00 -.4byte sub_80AC998 -.4byte sub_80ACA10 -.4byte sub_80ACA20 +.4byte CallbackObjectSetUnk_80AC998 +.4byte CallbackObjectSetFlags +.4byte CallbackObjectClearFlags .byte 0x00, 0x00, 0x00, 0x00 -.4byte sub_80ACA30 -.4byte sub_80AC9B8 -.4byte sub_80AC9DC +.4byte CallbackObjectMoveRelative +.4byte CallbackObjectSpriteRelatedCheck_80AC9B8 +.4byte CallbackObjectSpriteRelated_80AC9DC .global gUnknown_81182F4 gUnknown_81182F4: @ 81182F4 @@ -2098,30 +2098,30 @@ gUnknown_8118530: @ 8118530 .string "pksdir0\0" .align 2,0 -.global gUnknown_8118544 -gUnknown_8118544: @ 8118544 +.global gGroundEffectCallbacks +gGroundEffectCallbacks: @ 8118544 @ replacing .incbin "baserom.gba", 0x118544, 0xAE .byte 0x03, 0x00, 0x00, 0x00 -.4byte sub_80AD4B8 -.4byte sub_80AD4C0 -.4byte sub_80AD590 -.4byte sub_80AD5BC -.4byte sub_80AD5E8 -.4byte sub_80AD6DC -.4byte sub_80AD4CC -.4byte sub_80AD578 -.4byte sub_80AD5B0 -.4byte sub_80AD5DC -.4byte sub_80AD5F4 -.4byte sub_80AD610 +.4byte CallbackEffectGetIndex +.4byte CallbackEffectGetSize +.4byte CallbackEffectGetHitboxCenter +.4byte CallbackEffectGetPosHeightAndUnk +.4byte CallbackEffectGetDirection +.4byte CallbackEffectGetFlags +.4byte CallbackEffectSetHitboxPos +.4byte CallbackEffectSetPositionBounds +.4byte CallbackEffectMoveReal +.4byte CallbackEffectSetPosHeight +.4byte CallbackEffectSetDirection +.4byte CallbackEffectSetEventIndex .byte 0x00, 0x00, 0x00, 0x00 -.4byte sub_80AD670 -.4byte sub_80AD6E8 -.4byte sub_80AD6F8 +.4byte CallbackEffectSetUnk_80AD670 +.4byte CallbackEffectSetFlags +.4byte CallbackEffectClearFlags .byte 0x00, 0x00, 0x00, 0x00 -.4byte sub_80AD708 -.4byte sub_80AD690 -.4byte sub_80AD6B4 +.4byte CallbackEffectMoveRelative +.4byte CallbackEffectSpriteRelatedCheck_80AD690 +.4byte CallbackEffectSpriteRelated_80AD6B4 .byte 0xf6, 0x00, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .4byte gUnknown_81185D8 .byte 0xf4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -8852,8 +8852,8 @@ gUnknown_811E5F4: @ 811E5F4 .byte 0x01, 0x00, 0xf1, 0x00, 0x01, 0x00, 0xf2, 0x00, 0x01, 0x00, 0xf3, 0x00, 0x01, 0x00, 0xf4, 0x00 .byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00 -.global gUnknown_811E63C -gUnknown_811E63C: @ 811E63C +.global gGroundLivesTypeData_811E63C +gGroundLivesTypeData_811E63C: @ 811E63C @ replacing .incbin "baserom.gba", 0x11E63C, 0x6E4 .byte 0x01, 0x00, 0x00, 0x00 .4byte gUnknown_811ED14 @@ -9190,8 +9190,8 @@ gUnknown_811ED14: @ 811ED14 .byte 0x2d, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64 .byte 0x69, 0x72, 0x30, 0x00 -.global gUnknown_811ED20 -gUnknown_811ED20: @ 811ED20 +.global gGroundObjectTypes +gGroundObjectTypes: @ 811ED20 @ replacing .incbin "baserom.gba", 0x11ED20, 0x118 .byte 0x01, 0x00, 0x01, 0x01, 0x0e, 0x00, 0x01, 0x01, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 .byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x01, 0x04, 0x00, 0x00, 0x00 @@ -9212,8 +9212,8 @@ gUnknown_811ED20: @ 811ED20 .byte 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x02, 0x02, 0x0a, 0x00, 0x02, 0x02, 0x0e, 0x00, 0x02, 0x02 .byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00 -.global gFunctionScriptData -gFunctionScriptData: @ 811EE38 +.global gGroundEffectTypes +gGroundEffectTypes: @ 811EE38 @ replacing .incbin "baserom.gba", 0x11EE38, 0x103C0 .byte 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 @@ -9255,8 +9255,8 @@ gUnknown_811EF28: @ 811EF28 .byte 0xdf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.global gUnknown_811EF58 -gUnknown_811EF58: @ 811EF58 +.global gUnregisteredDialogScript +gUnregisteredDialogScript: @ 811EF58 .byte 0xf6, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .4byte gUnknown_811EEA4 .byte 0x32, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -10127,8 +10127,8 @@ gUnknown_8120BBC: @ 8120BBC .string "\0" .align 2, 0 -.global gUnknown_8120BDC -gUnknown_8120BDC: @ 8120BDC +.global gNextSaveFunc +gNextSaveFunc: @ 8120BDC .byte 0xf6, 0x00, 0x5b, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .4byte gUnknown_811EEA4 .byte 0xf2, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -15969,7 +15969,7 @@ gFunctionScriptTable: @ 812F1F8 .4byte gUnknown_811EF28 .byte 0x04, 0x00, 0x04, 0x00 .4byte gUnknown_8132320 -.4byte gUnknown_811EF58 +.4byte gUnregisteredDialogScript .byte 0x05, 0x00, 0x04, 0x00 .4byte gUnknown_8132308 .4byte gUnknown_811EFA8 @@ -16144,7 +16144,7 @@ gFunctionScriptTable: @ 812F1F8 .4byte gUnknown_8120B2C .byte 0x3f, 0x00, 0x07, 0x00 .4byte gUnknown_8131ED8 -.4byte gUnknown_8120BDC +.4byte gNextSaveFunc .byte 0x40, 0x00, 0x07, 0x00 .4byte gUnknown_8131EC8 .4byte gUnknown_8120CDC diff --git a/data/data_8270000.s b/data/data_8270000.s index aed6a1bc5..fb475c2a1 100644 --- a/data/data_8270000.s +++ b/data/data_8270000.s @@ -480,7 +480,7 @@ gUnknown_8270000: @ 8270000 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 -.4byte gUnknown_203B4B8 + 0x4 +.4byte gCurrentGroundLink + 0x4 .byte 0x01, 0x00, 0x00, 0x00 .byte 0x43, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 diff --git a/data/data_code_2.s b/data/data_code_2.s index 2ee1800b3..049f72f74 100644 --- a/data/data_code_2.s +++ b/data/data_code_2.s @@ -2,8 +2,8 @@ .string "pksdir0\0" - .global gUnknown_80B690C -gUnknown_80B690C: @ 80B690C + .global gBaseKindTable +gBaseKindTable: @ 80B690C .byte 0x00, 0x00, 0x00, 0x00 .byte 0x19, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00 @@ -39,8 +39,8 @@ gUnknown_80B690C: @ 80B690C .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global gUnknown_80B6994 -gUnknown_80B6994: @ 80B6994 + .global gTalkKindTable +gTalkKindTable: @ 80B6994 .byte 0x01, 0x00, 0x00, 0x00 .byte 0x07, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00 diff --git a/include/code_80130A8.h b/include/code_80130A8.h index 9ba37aea6..30c0441ac 100644 --- a/include/code_80130A8.h +++ b/include/code_80130A8.h @@ -11,7 +11,7 @@ extern void sub_8013F84(void); extern void sub_80140B4(UnkTextStruct2 *); extern void sub_80140DC(void); extern void sub_8014114(void); -extern void sub_80141B4(const u8 *, u32, OpenedFile **, u16); +extern void xxx_info_box_80141B4(const u8 *, u32, OpenedFile **, u16); extern void sub_8014248(const u8 *, u32, u32, const MenuItem *, void *, u32, u32, OpenedFile **, u32); extern s32 sub_80144A4(s32 *); extern void sub_80151C0(u32, u8 *); diff --git a/include/code_805D8C8.h b/include/code_805D8C8.h index 7a4d93f87..dd2fb228e 100644 --- a/include/code_805D8C8.h +++ b/include/code_805D8C8.h @@ -7,7 +7,7 @@ void CloseAllSpriteFiles(void); void sub_8068768(void); void sub_80687AC(void); -OpenedFile *sub_80687D0(s16 species); -void sub_8068838(s16 id, bool32); +OpenedFile *GetSpriteData(s16 species); +void LoadPokemonSprite(s16 id, bool32); #endif // GUARD_CODE_805D8C8_H \ No newline at end of file diff --git a/include/code_80972F4.h b/include/code_80972F4.h index 676343396..9a5e1aca2 100644 --- a/include/code_80972F4.h +++ b/include/code_80972F4.h @@ -24,6 +24,6 @@ const u8 *sub_80975DC(u32); // These two are definitely bool8 but can't get them to match with it yet //bool8 sub_8097384(s16); -//bool8 sub_80973F4(s16); +//bool8 RescueScenarioConquered(s16); #endif // GUARD_CODE_80972F4_H diff --git a/include/code_80A26CC.h b/include/code_80A26CC.h index 6d3c4e7a1..6b263a77f 100644 --- a/include/code_80A26CC.h +++ b/include/code_80A26CC.h @@ -25,9 +25,9 @@ void sub_80A2598(s16, s16); u32 sub_80A25AC(u16); #if !defined(NONMATCHING) && defined(GROUND_SCRIPT_INCOMPLETE_DECLARATIONS) // Workaround for ExecuteScriptCommand relying on s32 behavior of arguments -const DungeonInfo *sub_80A2608(s32 index); +const DungeonInfo *GetDungeonInfo_80A2608(s32 index); #else -const DungeonInfo *sub_80A2608(s16 index); +const DungeonInfo *GetDungeonInfo_80A2608(s16 index); #endif const DungeonInfo *sub_80A2620(s16 index); s16 sub_80A2654(s16 index); diff --git a/include/dungeon_random.h b/include/dungeon_random.h index 48adf47e7..5e3c5b6db 100644 --- a/include/dungeon_random.h +++ b/include/dungeon_random.h @@ -2,7 +2,7 @@ #define GUARD_DUNGEON_RANDOM_H void sub_808408C(u32 param_1); -u32 sub_80840A4(void); +u32 YetAnotherRandom24(void); void InitDungeonRNG(u32 value); s32 DungeonRand16Bit(void); s32 DungeonRandInt(s32 cap); diff --git a/include/event_flag.h b/include/event_flag.h index 03e6f0af0..0fdfe4fe6 100644 --- a/include/event_flag.h +++ b/include/event_flag.h @@ -8,17 +8,17 @@ struct UnkEventStruct /* 0x4 */ u8 *unk4; }; -void sub_8001B88(s32 param_1,u32 *param_2,u32 *param_3); +void GetScriptVarScenario(s32 param_1,u32 *param_2,u32 *param_3); void ScenarioCalc(s16 param_1, s32 param_2, s32 param_3); -bool8 sub_8001CC4(s16 param_1, u32 param_2, s32 param_3); -bool8 sub_8001D08(s16 param_1, u32 param_2, s32 param_3); -bool8 sub_8001D44(s16 param_1, u32 param_2, s32 param_3); +bool8 ScriptVarScenarioBefore(s16 param_1, u32 param_2, s32 param_3); +bool8 ScriptVarScenarioEqual(s16 param_1, u32 param_2, s32 param_3); +bool8 ScriptVarScenarioAfter(s16 param_1, u32 param_2, s32 param_3); void sub_8001D88(void); u32 _FlagCalc(s32 param_1, s32 param_2, u32 operation); u8 _FlagJudge(s32 param_1, s32 param_2, u32 operation); u32 FlagCalc(s32 r0, s32 r1, u32 operation); -void sub_800226C(u32 param_1, s16 param_2, s32 param_3, u32 operation); -void sub_80022A0(u32 param_1, s16 param_2, s16 param_3, u32 operation); +void UpdateScriptVarWithImmediate(u32 param_1, s16 param_2, s32 param_3, u32 operation); +void UpdateScriptVarWithVar(u32 param_1, s16 param_2, s16 param_3, u32 operation); u8 FlagJudge(s32 r0, s32 r1, u32 operation); u8 sub_80022F8(u32 param_1, s16 param_2, s32 param_3, u32 operation); u8 sub_8002318(u32 param_1, s16 param_2, s16 param_3, u32 operation); @@ -33,7 +33,7 @@ void sub_8002758(s32 r0); u8 sub_800276C(void); // event_flag.s -extern void sub_80015C0(u32, u32); -extern u32 sub_8001658(u32, u32); +extern void ClearScriptVarArray(u32, u32); +extern u32 GetScriptVarValue(u32, u32); #endif // GUARD_EVENT_FLAG_H diff --git a/include/friend_area.h b/include/friend_area.h index ffc3d7d7a..5e6144a49 100644 --- a/include/friend_area.h +++ b/include/friend_area.h @@ -37,7 +37,7 @@ u8 sub_80923D4(s32 target); void sub_8092404(u8, u16 *, bool8, bool8); void sub_809249C(u8 friendArea, bool8 clear); void sub_8092558(u8 *buffer, u8 index); -void sub_8092578(u8 *buffer, u8 index, bool8 printPrice); +void WriteFriendAreaName(u8 *buffer, u8 index, bool8 printPrice); void sub_8092638(u8 friendArea, unkStruct_8092638 *, bool8 checkLeader, bool8 checkDungeon); void sub_80926F8(u8, unkStruct_8092638 *, u8); diff --git a/include/ground_map.h b/include/ground_map.h index d8045059d..8f48d1354 100644 --- a/include/ground_map.h +++ b/include/ground_map.h @@ -7,7 +7,7 @@ typedef struct unkStruct_3001B70 u8 fill0[0x55C - 0x0]; } unkStruct_3001B70; -extern unkStruct_3001B70 *gUnknown_3001B70; +extern unkStruct_3001B70 *gGroundMapDungeon_3001B70; void GroundMap_Reset(void); diff --git a/include/ground_map_1.h b/include/ground_map_1.h index abcda7e96..505dd1749 100644 --- a/include/ground_map_1.h +++ b/include/ground_map_1.h @@ -5,7 +5,7 @@ void GroundMap_ExecuteEnter(s16); void GroundMap_ExecuteEvent(s16 scriptIndex, u32); void GroundMap_ExecuteStation(s16, s16, s8, u32); -bool8 sub_80A4D2C(s16); +bool8 GroundMapNotifyAll(s16); bool8 sub_80A4D48(s16 index); // ground_map_1.s diff --git a/include/ground_script.h b/include/ground_script.h index 0caa645cc..5a70a1d9f 100644 --- a/include/ground_script.h +++ b/include/ground_script.h @@ -140,14 +140,14 @@ extern FunctionScript gFunctionScriptTable[]; #include "debug.h" void InitScriptData(ScriptData *a0); -u8 sub_809D8EC(Action *param_1, s16 param_2); -void sub_809D648(Action *action); -void sub_809D710(Action *param_1, ScriptInfoSmall *script, s16 index); -bool8 sub_809DA08(Action *param_1, s16 index, u32 param_3); -bool8 InitActionScriptData(Action *param_1, const DebugLocation *unused); +u8 GroundScriptCheckLockCondition(Action *param_1, s16 param_2); +void InitAction2(Action *action); +void GetFunctionScript(Action *param_1, ScriptInfoSmall *script, s16 index); +bool8 GroundScriptLockCond(Action *param_1, s16 index, u32 param_3); +bool8 ActionResetScriptData(Action *param_1, const DebugLocation *unused); bool8 GroundScript_ExecutePP(Action *, s32 *, ScriptInfoSmall *, const DebugLocation *unused); -ScriptCommand *sub_80A242C(Action *action, s32 r1); -ScriptCommand *sub_80A2460(Action *action, s32 r1); +ScriptCommand *FindLabel(Action *action, s32 r1); +ScriptCommand *ResolveJump(Action *action, s32 r1); void InitActionWithParams(Action *action, const CallbackData *callbacks, void *parent, s16 group, s8 sector); #endif // GUARD_GROUND_SCRIPT_H diff --git a/include/items.h b/include/items.h index 6b5818f73..0ef9d1b67 100644 --- a/include/items.h +++ b/include/items.h @@ -80,7 +80,7 @@ s32 SaveTeamInventory(u8 *, u32 size); -s32 sub_8090FEC(s32, u8 *strbuf, u8); +s32 WriteHighDecimal(s32, u8 *strbuf, u8); u32 sub_80913E0(Item *slot, u32, struct subStruct_203B240 **); // This macro doesn't do anything, it creates unused variables for the purpose of tricking the compiler and matching the asm. diff --git a/include/pokemon.h b/include/pokemon.h index 9318ae572..11f21723e 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -95,7 +95,7 @@ extern u32 sub_808D1DC(PokemonStruct1*); extern PokemonStruct1 *sub_808D378(void); extern PokemonStruct1 *sub_808D3BC(void); extern PokemonStruct1 *sub_808D3F8(void); -extern s32 sub_808D544(u32); +extern s32 GetUnitSum_808D544(u32); extern s32 sub_808D580(s32 *); #endif // GUARD_POKEMON_H diff --git a/include/sprite.h b/include/sprite.h index 573edc194..92294cdc0 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -84,9 +84,9 @@ void sub_8004E8C(unkStruct_2039DB0 *); void sub_8005180(void); void sub_8005304(void); void sub_800533C(ax_pose **, UnkSpriteMem **, axdata1 *, u16 *, bool8); -void sub_80053AC(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, u32, bool8); -void sub_80053D0(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, u32, bool8); -void sub_800543C(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, bool8); -void sub_80054BC(struct axPokemon *); +void AxResInitFile_80053AC(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, u32, bool8); +void AxResInit_80053D0(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, u32, bool8); +void AxResInitUnorientedFile_800543C(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, bool8); +void RunAxAnimationFrame_80054BC(struct axPokemon *); #endif // GUARD_SPRITE_H \ No newline at end of file diff --git a/include/structs/struct_sub80095e4.h b/include/structs/struct_sub80095e4.h index 9a6a19285..a4f71df5a 100644 --- a/include/structs/struct_sub80095e4.h +++ b/include/structs/struct_sub80095e4.h @@ -39,7 +39,7 @@ typedef struct struct_Sub80095E4_2 (ptr).unk3C[(ptr).unk34].unk10 = a0 + 2; \ \ ResetUnusedInputStruct(); \ - sub_800641C((ptr).unk3C, TRUE, TRUE); \ + xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE); \ } #define SUB_80095E4_CALL(ptr) \ @@ -58,7 +58,7 @@ typedef struct struct_Sub80095E4_2 (ptr).unk3C[(ptr).unk34].unk10 = newE; \ \ ResetUnusedInputStruct(); \ - sub_800641C((ptr).unk3C, TRUE, TRUE); \ + xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE); \ } // sub_802BF30 and sub_802C328 use a different function call, and 24 instead of 12 diff --git a/include/text1.h b/include/text1.h index fa1e70186..c2e068b62 100644 --- a/include/text1.h +++ b/include/text1.h @@ -5,14 +5,14 @@ extern UnkTextStruct1 gUnknown_2027370[4]; extern UnkTextStruct2 gUnknown_202AFC0[4]; -extern u32 gUnknown_202B030; +extern u32 gTextShadowMask; extern u16 gUnknown_202B038[4][32][32]; // dimensions unknown... but usage points to these dimensions void LoadCharmaps(void); void SelectCharmap(u32); -u32 xxx_update_some_bg_tiles(u32 a0); +u32 UpdateFadeInTile(u32 a0); u32 sub_80063B0(void); -void sub_800641C(UnkTextStruct2 *a0, bool8 a1, bool8 a2); +void xxx_call_save_unk_text_struct_800641C(UnkTextStruct2 *a0, bool8 a1, bool8 a2); #endif // GUARD_TEXT1_H \ No newline at end of file diff --git a/include/text2.h b/include/text2.h index 0fc5c0e64..bfd1d698c 100644 --- a/include/text2.h +++ b/include/text2.h @@ -31,7 +31,7 @@ struct unkStruct_80B8848 u32 xxx_call_draw_char(s32, s32, u32, u32, u32); -void sub_8006518(UnkTextStruct2 *); +void RestoreUnkTextStruct_8006518(UnkTextStruct2 *); void sub_8006554(UnkTextStruct1 *, u32 *, u32 *, u16 *, u32, const UnkTextStruct2 *, u8, u32, UnkTextStruct2_sub *, u8); void sub_80073B8(s32); void sub_80073E0(s32); @@ -47,7 +47,7 @@ extern void InitGraphics(void); extern void sub_800836C(u32, u8 *, u32); extern void sub_800898C(void); extern void sub_80089AC(const UnkTextStruct2 *, UnkTextStruct2_sub *); -extern void sub_8008C54(u32); +extern void CallPrepareTextbox_8008C54(u32); extern s32 sub_8008ED0(const u8 *); extern void sub_8009388(void); extern void PrintStringOnWindow(s32 x, u32 y, const u8 *str, u32 windowId, u32); diff --git a/src/adventure_log.c b/src/adventure_log.c index f7791a123..deef1abe0 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -27,12 +27,12 @@ bool8 CreateAdventureLogScreen(u32 kind) sAdventureLog = MemoryAlloc(sizeof(*sAdventureLog), 8); sAdventureLog->s0.unk34 = kind; sAdventureLog->s0.unk38 = &sAdventureLog->s0.unk3C[kind]; - sub_8006518(sAdventureLog->s0.unk3C); + RestoreUnkTextStruct_8006518(sAdventureLog->s0.unk3C); sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E2008; sAdventureLog->s0.unk38->unk14 = &sAdventureLog->unk9C; ResetUnusedInputStruct(); - sub_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE); sub_8013818(&sAdventureLog->s0.input, 0x20, 8, kind); sub_8032084(); DisplayAdventureLog(); @@ -68,7 +68,7 @@ void CleanAdventureLogScreen(void) if (sAdventureLog != NULL) { sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E1FF0; ResetUnusedInputStruct(); - sub_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE); MemoryFree(sAdventureLog); sAdventureLog = NULL; } @@ -92,7 +92,7 @@ static void DisplayAdventureLog(void) u8 temp; s32 v1, v2, v3, v4, v5, v6; - sub_8008C54(sAdventureLog->s0.unk34); + CallPrepareTextbox_8008C54(sAdventureLog->s0.unk34); sub_80073B8(sAdventureLog->s0.unk34); r4 = sAdventureLog->s0.input.unk1E * 8; r6 = r4; diff --git a/src/adventure_log_menu.c b/src/adventure_log_menu.c index dc103b024..d05661ddc 100644 --- a/src/adventure_log_menu.c +++ b/src/adventure_log_menu.c @@ -13,7 +13,7 @@ void CreateAdventureLogMenu(void) void CleanAdventureLogMenu(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); } u32 UpdateAdventureLogMenu(void) diff --git a/src/code.c b/src/code.c index 35602e813..2eb831642 100644 --- a/src/code.c +++ b/src/code.c @@ -36,7 +36,7 @@ void nullsub_3(s32 a0, s32 a1) /// TODO merge with event_flag ///////////////////////////////// -extern u8 gUnknown_2000A88[0x400]; +extern u8 gScriptVarBuffer[0x400]; struct unkStruct_80B7394 { @@ -49,13 +49,13 @@ struct unkStruct_80B7394 u8 *text; }; -extern struct unkStruct_80B7394 gUnknown_80B7394[]; -extern void sub_800199C(u32, s32, u32, s32); -extern void sub_80018D8(u32, u32, u32); +extern struct unkStruct_80B7394 gScriptVarInfo[]; +extern void SetScriptVarArrayValue(u32, s32, u32, s32); +extern void SetScriptVarValue(u32, u32, u32); extern void sub_80972F4(void); extern void nullsub_128(void); -void sub_800135C(void) +void ThouroughlyResetScriptVars(void) { s32 iVar1; s32 iVar3; @@ -64,19 +64,19 @@ void sub_800135C(void) for(iVar3 = 0; iVar3 < 0x400; iVar3++) { - gUnknown_2000A88[iVar3] = 0; + gScriptVarBuffer[iVar3] = 0; } for(iVar1 = 0; iVar1 < 0x51; iVar1 = (iVar1 + 1) * 0x10000 >> 0x10) { - puVar1 = &gUnknown_80B7394[iVar1]; + puVar1 = &gScriptVarInfo[iVar1]; if (((puVar1->unk0 != 0) && ((puVar1->unk0 != 8)))) { for (uVar2 = 0; uVar2 < puVar1->unk8; uVar2++) { - sub_800199C(0, iVar1, uVar2, puVar1->unkA); + SetScriptVarArrayValue(0, iVar1, uVar2, puVar1->unkA); } } } - sub_80015C0(0,1); + ClearScriptVarArray(0,1); ScenarioCalc(2,0,0); ScenarioCalc(3,0,0); ScenarioCalc(4,0,0); @@ -88,37 +88,37 @@ void sub_800135C(void) ScenarioCalc(10,0,0); ScenarioCalc(0xb,0,0); ScenarioCalc(0xc,0,0); - sub_80018D8(0,0xd,0xa2); - sub_80018D8(0,0xe,0); - sub_80018D8(0,0xf,0xa2); - sub_80018D8(0,0x10,-1); - sub_80018D8(0,0x11,0x24); - sub_80018D8(0,0x12,-1); - sub_80018D8(0,0x13,0); - sub_80018D8(0,0x14,-1); - sub_80018D8(0,0x16,0); - sub_80018D8(0,0x18,0); - sub_80018D8(0,0x19,0); - sub_80018D8(0,0x1b,-1); - sub_80018D8(0,0x1c,0); - sub_80018D8(0,0x1d,0); - sub_80018D8(0,0x1e,0); - sub_80018D8(0,0x1f,0); - sub_80015C0(0,0x24); - sub_80018D8(0,0x25,0); - sub_80018D8(0,0x26,0); - sub_80018D8(0,0x27,0); - sub_80018D8(0,0x28,0); - sub_80018D8(0,0x29,0); - sub_80018D8(0,0x2a,0); - sub_80015C0(0,0x2b); - sub_80015C0(0,0x2c); - sub_80015C0(0,0x2d); - sub_80015C0(0,0x2e); - sub_80015C0(0,0x2f); - sub_80015C0(0,0x30); - sub_80015C0(0,0x31); - sub_80015C0(0,0x41); + SetScriptVarValue(0,0xd,0xa2); + SetScriptVarValue(0,0xe,0); + SetScriptVarValue(0,0xf,0xa2); + SetScriptVarValue(0,0x10,-1); + SetScriptVarValue(0,0x11,0x24); + SetScriptVarValue(0,0x12,-1); + SetScriptVarValue(0,0x13,0); + SetScriptVarValue(0,0x14,-1); + SetScriptVarValue(0,0x16,0); + SetScriptVarValue(0,0x18,0); + SetScriptVarValue(0,0x19,0); + SetScriptVarValue(0,0x1b,-1); + SetScriptVarValue(0,0x1c,0); + SetScriptVarValue(0,0x1d,0); + SetScriptVarValue(0,0x1e,0); + SetScriptVarValue(0,0x1f,0); + ClearScriptVarArray(0,0x24); + SetScriptVarValue(0,0x25,0); + SetScriptVarValue(0,0x26,0); + SetScriptVarValue(0,0x27,0); + SetScriptVarValue(0,0x28,0); + SetScriptVarValue(0,0x29,0); + SetScriptVarValue(0,0x2a,0); + ClearScriptVarArray(0,0x2b); + ClearScriptVarArray(0,0x2c); + ClearScriptVarArray(0,0x2d); + ClearScriptVarArray(0,0x2e); + ClearScriptVarArray(0,0x2f); + ClearScriptVarArray(0,0x30); + ClearScriptVarArray(0,0x31); + ClearScriptVarArray(0,0x41); sub_80972F4(); } diff --git a/src/code_2.c b/src/code_2.c index 9c511cb77..2d2ae2fd2 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -34,7 +34,7 @@ extern void NDS_LoadOverlay_GroundMain(void); extern void sub_8014144(void); extern void sub_800DAAC(void); -extern void sub_800135C(void); +extern void ThouroughlyResetScriptVars(void); extern void xxx_script_related_8001334(u32); extern void LoadTitleScreen(void); extern void sub_80095CC(u32, u32); @@ -84,22 +84,22 @@ void GameLoop(void) SetSavingIconCoords(NULL); tmp = 0; if (ReadSaveFromPak(&tmp)) - sub_800135C(); + ThouroughlyResetScriptVars(); xxx_script_related_8001334(14); xxx_script_related_8001334(15); - sub_80015C0(0, 57); + ClearScriptVarArray(0, 57); xxx_script_related_8001334(16); - if (sub_8001658(0, 57) == 0) + if (GetScriptVarValue(0, 57) == 0) xxx_script_related_8001334(17); while (1) { gUnknown_203B03C = 0; // ??? sub_800A8F8(2); ResetSprites(TRUE); - xxx_update_some_bg_tiles(0); + UpdateFadeInTile(0); InitFontPalette(); sub_800CDA8(2); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); gUnknown_2026E4E = 0x1000; LoadTitleScreen(); SetBG2RegOffsets(0, 0); diff --git a/src/code_800558C.c b/src/code_800558C.c index 0d0ba2f41..4116a165a 100644 --- a/src/code_800558C.c +++ b/src/code_800558C.c @@ -40,7 +40,7 @@ void DoAxFrame_800558C(struct axPokemon *a0, s32 spriteX, s32 spriteY, u32 a3, u return; if (a0->axdata.sub1.poseId < 0) - sub_80054BC(a0); + RunAxAnimationFrame_80054BC(a0); if (!(a0->axdata.flags >> 15)) return; diff --git a/src/code_8009804.c b/src/code_8009804.c index b41d19e61..b57403083 100644 --- a/src/code_8009804.c +++ b/src/code_8009804.c @@ -8,7 +8,7 @@ extern const u8 gUnknown_80B88CC[]; extern const struct FileArchive gSystemFileArchive; // 8300500 -extern struct unkStruct_202D038 gUnknown_202D038[8]; +extern struct unkStruct_202D038 gFontPalette[8]; extern u8 gUnknown_202D238[4]; extern s32 gUnknown_202D23C; extern struct unkStruct_202D240 gUnknown_202D240[8]; @@ -23,12 +23,12 @@ void InitFontPalette(void) u32 *ptr; fontpalFile = OpenFileAndGetFileDataPtr(gUnknown_80B88CC, &gSystemFileArchive); // fontpal - CpuCopy(gUnknown_202D038, fontpalFile->data, sizeof(gUnknown_202D038)); + CpuCopy(gFontPalette, fontpalFile->data, sizeof(gFontPalette)); if (sub_80063B0() == 1) - ptr = &gUnknown_202D038[0].unk0[0]; + ptr = &gFontPalette[0].unk0[0]; else - ptr = &gUnknown_202D038[1].unk0[0]; + ptr = &gFontPalette[1].unk0[0]; for (i = 0; i < 16; ptr++, i++) SetBGPaletteBufferColorArray(i + 240, (u8 *)ptr); @@ -131,7 +131,7 @@ void sub_80099F0(u32 a0) s32 i; for (i = 0; i < 8; i++) - gUnknown_202D038[i].unk0[1] = a0; + gFontPalette[i].unk0[1] = a0; } UNUSED static void sub_8009A10(u32 *a0) diff --git a/src/code_80140DC.c b/src/code_80140DC.c index 2b2e65c5c..1f31a7d65 100644 --- a/src/code_80140DC.c +++ b/src/code_80140DC.c @@ -91,7 +91,7 @@ void sub_801416C(s32 param_1,s32 param_2) gUnknown_202E73C = (param_2 < 0 ) ? 0 : param_2; } -void sub_80141B4(const u8 *text, u32 param_2, OpenedFile **file, u16 param_4) +void xxx_info_box_80141B4(const u8 *text, u32 param_2, OpenedFile **file, u16 param_4) { sub_8014248(text, param_2, -1, NULL, NULL, 3, 0, file, param_4); } diff --git a/src/code_8015080.c b/src/code_8015080.c index ee03d78d7..f023a5fd7 100644 --- a/src/code_8015080.c +++ b/src/code_8015080.c @@ -62,7 +62,7 @@ bool8 sub_8015080(u8 *buffer, const MenuItem *menuItems) gUnknown_203B1F8->unk54[2] = gUnknown_80DAFA0; sub_8012CAC(&gUnknown_203B1F8->unk54[2], menuItems); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B1F8->unk54, 1, 1); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B1F8->unk54, 1, 1); sub_80073B8(0); xxx_format_string(buffer, gUnknown_203B1F8->buffer, gUnknown_203B1F8->buffer + 0x400, 0); PrintStringOnWindow(4, 4, gUnknown_203B1F8->buffer, 0, 0); diff --git a/src/code_801602C.c b/src/code_801602C.c index c1c7dae6f..c3510f8a0 100644 --- a/src/code_801602C.c +++ b/src/code_801602C.c @@ -29,7 +29,7 @@ static void sub_801629C(void); u32 CreateConfirmNameMenu(u32 mode, u8 *name) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B200 = MemoryAlloc(sizeof(struct unkStruct_203B200), 8); sUnknown_203B200->unk0 = mode; @@ -113,10 +113,10 @@ static void sub_8016110(void) break; case CONFIRM_NAME_MENU_TOO_LONG: - sub_80141B4(sNameTooLong, 0, 0, 0x121); + xxx_info_box_80141B4(sNameTooLong, 0, 0, 0x121); break; case CONFIRM_NAME_MENU_EMPTY: - sub_80141B4(sEnterAName, 0, 0, 0x121); + xxx_info_box_80141B4(sEnterAName, 0, 0, 0x121); break; default: break; diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c index 16c743a34..a6442ec16 100644 --- a/src/code_801AFA4.c +++ b/src/code_801AFA4.c @@ -99,10 +99,10 @@ static void sub_801B080(void) gTeamInventoryRef->teamItems[sUnknown_203B22C->teamItemIndex].id = ITEM_TM_USED_TM; } PlaySound(312); - sub_80141B4(sFmtLearnedTheMove, 0, 0, 0x121); + xxx_info_box_80141B4(sFmtLearnedTheMove, 0, 0, 0x121); break; case 3: - sub_80141B4(sFmtNoOneCanLearnThisMove, 0, 0, 0x121); + xxx_info_box_80141B4(sFmtNoOneCanLearnThisMove, 0, 0, 0x121); break; default: case 4: diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c index 097076b00..b70cde784 100644 --- a/src/code_801B3C0.c +++ b/src/code_801B3C0.c @@ -31,7 +31,7 @@ bool8 sub_801B3C0(Item *item) sUnknown_203B230->unk24 = 0; sub_80140B4(sUnknown_203B230->unk28); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B230->unk28, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B230->unk28, TRUE, TRUE); sub_801B46C(0); return TRUE; } @@ -75,12 +75,12 @@ static void sub_801B480(void) switch (sUnknown_203B230->state) { case 0: - sub_8008C54(sUnknown_203B230->unk24); + CallPrepareTextbox_8008C54(sUnknown_203B230->unk24); sUnknown_203B230->unkC = sub_80913E0(&sUnknown_203B230->item, sUnknown_203B230->unk24, sUnknown_203B230->unk10); sUnknown_203B230->unk20 = 0; break; case 1: - sub_8008C54(sUnknown_203B230->unk24); + CallPrepareTextbox_8008C54(sUnknown_203B230->unk24); sub_80073B8(sUnknown_203B230->unk24); preload = sUnknown_203B230->unk10[sUnknown_203B230->unk8]; strcpy(gAvailablePokemonNames, preload->pokeName); diff --git a/src/code_801B60C.c b/src/code_801B60C.c index 3870ba291..1f9f5d7ff 100644 --- a/src/code_801B60C.c +++ b/src/code_801B60C.c @@ -16,7 +16,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202DEA8[]; extern u8 gAvailablePokemonNames[]; // 202DF98 @@ -25,8 +25,8 @@ static EWRAM_DATA_2 unkStruct_203B234 *sUnknown_203B234 = {0}; #include "data/code_801B60C.h" // 80DBA58 // event_flag.s -extern u32 sub_8001784(u32, u32, u16); -extern void sub_800199C(u32, u32, u32, u32); +extern u32 GetScriptVarArrayValue(u32, u32, u16); +extern void SetScriptVarArrayValue(u32, u32, u32, u32); static void sub_801B748(u32); static void sub_801B760(void); @@ -63,7 +63,7 @@ bool8 sub_801B60C(u32 r0, u8 id, u8 quantity) sUnknown_203B234->unk14.unk4 = 0; sUnknown_203B234->unk14.unk8 = 1; PrintColoredPokeNameToBuffer(gAvailablePokemonNames, GetPlayerPokemonStruct(), COLOR_YELLOW); - sub_8090E14(gUnknown_202DE58, &sUnknown_203B234->unk10, &sUnknown_203B234->unk14); + sub_8090E14(gFormatItems, &sUnknown_203B234->unk10, &sUnknown_203B234->unk14); sub_801B748(0); return TRUE; } @@ -132,26 +132,26 @@ static void sub_801B760(void) case 13: case 14: case 15: - sub_8006518(sUnknown_203B234->unkF4); + RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4); for (i = 0; i < 4; i++) sUnknown_203B234->unkF4[i] = sUnknown_80DBA58; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B234->unkF4, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE); break; case 10: - sub_8006518(sUnknown_203B234->unkF4); + RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4); sub_801BB5C(); sUnknown_203B234->unkF4[2] = sUnknown_80DBA70; sub_8012CAC(&sUnknown_203B234->unkF4[2], sUnknown_203B234->unkCC); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B234->unkF4, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE); break; case 12: - sub_8006518(sUnknown_203B234->unkF4); + RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4); sUnknown_203B234->unkF4[1] = sUnknown_80DBA88; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B234->unkF4, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE); break; } } @@ -163,24 +163,24 @@ static void sub_801B874(void) if (sUnknown_203B234->unk10.id == ITEM_WEAVILE_FIG) { sUnknown_203B234->fallbackState = 16; - if (sub_8001784(0, 71, 1)) { + if (GetScriptVarArrayValue(0, 71, 1)) { AddToTeamMoney(1000); sub_801B748(4); } else { - sub_800199C(0, 71, 1, 1); + SetScriptVarArrayValue(0, 71, 1, 1); sub_801B748(3); } } else if (sUnknown_203B234->unk10.id == ITEM_MIME_JR_FIG) { sUnknown_203B234->fallbackState = 16; - if (sub_8001784(0, 71, 0)) { + if (GetScriptVarArrayValue(0, 71, 0)) { AddToTeamMoney(1000); sub_801B748(4); } else { - sub_800199C(0, 71, 0, 1); + SetScriptVarArrayValue(0, 71, 0, 1); sub_801B748(3); } } @@ -214,24 +214,24 @@ store: } break; case 1: - if (sub_808D544(0) < 2) - sub_80141B4(sFmtReceivedThePromised, 0, 0, 0x101); + if (GetUnitSum_808D544(0) < 2) + xxx_info_box_80141B4(sFmtReceivedThePromised, 0, 0, 0x101); else - sub_80141B4(sFmtTeamReceivedThePromised, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtTeamReceivedThePromised, 0, 0, 0x101); break; case 2: - sub_80141B4(sFmtTeamAlsoReceived, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtTeamAlsoReceived, 0, 0, 0x101); break; case 3: PlaySound(212); - sub_80141B4(sFmtReceivedStatue, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtReceivedStatue, 0, 0, 0x101); break; case 4: - sub_80141B4(sFmtReceive1000Instead, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtReceive1000Instead, 0, 0, 0x101); break; case 5: sUnknown_203B234->fallbackState = 16; - sub_80141B4(sFmtFullSoSentToStorage, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtFullSoSentToStorage, 0, 0, 0x101); break; case 6: sub_801BB20(); @@ -262,15 +262,15 @@ store: break; case 13: sUnknown_203B234->fallbackState = 16; - sub_80141B4(sFmtThrownAway, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtThrownAway, 0, 0, 0x101); break; case 14: sUnknown_203B234->fallbackState = 16; - sub_80141B4(sFmtPutInStorageForReceive, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtPutInStorageForReceive, 0, 0, 0x101); break; case 15: sUnknown_203B234->fallbackState = 16; - sub_80141B4(sFmtDiscardedForReceive, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtDiscardedForReceive, 0, 0, 0x101); break; case 16: break; diff --git a/src/code_801C8C4.c b/src/code_801C8C4.c index 98f26013e..0d18fccef 100644 --- a/src/code_801C8C4.c +++ b/src/code_801C8C4.c @@ -31,7 +31,7 @@ bool8 sub_801C8C4(s32 a0, s32 a1, UnkTextStruct2_sub *a2, u32 a3) sub_801CF94(); sUnknown_203B244->unk4B4.s0.unk34 = a1; sUnknown_203B244->unk4B4.s0.unk38 = &sUnknown_203B244->unk4B4.s0.unk3C[a1]; - sub_8006518(sUnknown_203B244->unk4B4.s0.unk3C); + RestoreUnkTextStruct_8006518(sUnknown_203B244->unk4B4.s0.unk3C); sUnknown_203B244->unk4B4.s0.unk3C[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE54; sUnknown_203B244->unk4B4.s0.unk38->unk14 = &sUnknown_203B244->unk4B4.unk9C; @@ -40,7 +40,7 @@ bool8 sub_801C8C4(s32 a0, s32 a1, UnkTextStruct2_sub *a2, u32 a3) sub_8012D08(sUnknown_203B244->unk4B4.s0.unk38, a3); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE); sub_8013818(&sUnknown_203B244->unk4B4.s0.input, sub_801CE58(), a3, a1); if (sUnknown_203B248 == sUnknown_203B244->unk0) { @@ -112,7 +112,7 @@ u8 sub_801CB24(void) void sub_801CB5C(bool8 a0) { ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B244->unk4B4.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, FALSE, FALSE); sUnknown_203B244->unk4B4.s0.input.unk22 = sub_801CE58(); sub_8013984(&sUnknown_203B244->unk4B4.s0.input); sub_801CC38(); @@ -130,7 +130,7 @@ void sub_801CBB8(void) sUnknown_203B24E = sUnknown_203B244->unk4B4.s0.input.unk1E; sUnknown_203B244->unk4B4.s0.unk3C[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE3C; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE); MemoryFree(sUnknown_203B244); sUnknown_203B244 = NULL; } @@ -154,7 +154,7 @@ void sub_801CCD8(void) s32 index; u8 buffer[80]; - sub_8008C54(sUnknown_203B244->unk4B4.s0.unk34); + CallPrepareTextbox_8008C54(sUnknown_203B244->unk4B4.s0.unk34); sub_80073B8(sUnknown_203B244->unk4B4.s0.unk34); PrintStringOnWindow(10, 0, sStorage, sUnknown_203B244->unk4B4.s0.unk34, 0); sub_8012BC4(sUnknown_203B244->unk4B4.unk9C.f2 * 8 + 4, 0, sUnknown_203B244->unk4B4.s0.input.unk1E + 1, 2, 7, sUnknown_203B244->unk4B4.s0.unk34); diff --git a/src/code_801D014.c b/src/code_801D014.c index a3bf3e693..b8325af05 100644 --- a/src/code_801D014.c +++ b/src/code_801D014.c @@ -64,7 +64,7 @@ bool8 sub_801D014(PokemonStruct1 *a0) struct unk_203B250 *preload; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B250 = MemoryAlloc(sizeof(struct unk_203B250), 8); sUnknown_203B250->menuAction = sUnknown_203B254; @@ -191,7 +191,7 @@ static void sub_801D220(void) { s32 i; - sub_8006518(sUnknown_203B250->unkB8); + RestoreUnkTextStruct_8006518(sUnknown_203B250->unkB8); switch (sUnknown_203B250->state) { case 0: @@ -239,7 +239,7 @@ static void sub_801D220(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B250->unkB8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B250->unkB8, TRUE, TRUE); } static void sub_801D3A8(void) @@ -584,11 +584,11 @@ static void sub_801D894(void) xxx_format_string(location, buffer, (u8 *)(&preload_string + 1), 0); location_length = sub_8008ED0(buffer); x_coord = (128 - location_length) / 2; // Centers the location name - sub_8008C54(1); + CallPrepareTextbox_8008C54(1); sub_80073B8(1); PrintStringOnWindow(x_coord, 4, buffer, 1, 0); sub_80073E0(1); - sub_8008C54(2); + CallPrepareTextbox_8008C54(2); sub_80073B8(2); LoadTeamRankBadge(2, 8, 6); diff --git a/src/code_801D9E4.c b/src/code_801D9E4.c index 4c413fd8e..7637cb31f 100644 --- a/src/code_801D9E4.c +++ b/src/code_801D9E4.c @@ -25,11 +25,11 @@ bool8 sub_801D9E4(void) sUnknown_203B258 = MemoryAlloc(sizeof(*sUnknown_203B258), 8); sUnknown_203B258->s0.unk34 = 3; sUnknown_203B258->s0.unk38 = &sUnknown_203B258->s0.unk3C[3]; - sub_8006518(sUnknown_203B258->s0.unk3C); + RestoreUnkTextStruct_8006518(sUnknown_203B258->s0.unk3C); sUnknown_203B258->s0.unk3C[sUnknown_203B258->s0.unk34] = sUnknown_80DBF88; sUnknown_203B258->s0.unk38->unk14 = &sUnknown_203B258->unk9C; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE); sub_8013818(&sUnknown_203B258->s0.input, 229, 10, sUnknown_203B258->s0.unk34); sub_801DB54(); sub_801DBD4(); @@ -83,7 +83,7 @@ void sub_801DB0C(void) if (sUnknown_203B258 != NULL) { sUnknown_203B258->s0.unk3C[sUnknown_203B258->s0.unk34] = sUnknown_80DBF70; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE); MemoryFree(sUnknown_203B258); sUnknown_203B258 = NULL; } @@ -97,7 +97,7 @@ static void sub_801DB54(void) sUnknown_203B258->unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE); SUB_80095E4_CALL(sUnknown_203B258->s0); } @@ -110,7 +110,7 @@ static void sub_801DBD4(void) s16 index; int counter; - sub_8008C54(sUnknown_203B258->s0.unk34); + CallPrepareTextbox_8008C54(sUnknown_203B258->s0.unk34); sub_80073B8(sUnknown_203B258->s0.unk34); PrintStringOnWindow(10, 0, sField, sUnknown_203B258->s0.unk34, 0); // Field diff --git a/src/code_801EE10.c b/src/code_801EE10.c index 2eef47063..a29cb0ba4 100644 --- a/src/code_801EE10.c +++ b/src/code_801EE10.c @@ -85,7 +85,7 @@ u8 sub_801EE10(u32 param_1, s16 species, Move *moves, u32 param_4, const u8 *tex if (iVar8 < four) { iVar8 = 4; } - sub_8006518(gUnknown_203B270->unk58); + RestoreUnkTextStruct_8006518(gUnknown_203B270->unk58); gUnknown_203B270->unk50 = param_6; gUnknown_203B270->unk58[param_6] = gUnknown_80DC25C; if (gUnknown_203B270->text != NULL) { @@ -94,7 +94,7 @@ u8 sub_801EE10(u32 param_1, s16 species, Move *moves, u32 param_4, const u8 *tex } sub_8012D08(&gUnknown_203B270->unk58[gUnknown_203B270->unk50],iVar8); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B270->unk58, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE); sub_8013818(&gUnknown_203B270->input,iVar5,iVar5,param_6); sub_8013780(&gUnknown_203B270->input,0); sub_801F280(1); @@ -251,7 +251,7 @@ void sub_801F1B0(bool8 param_1, bool8 param_2) if(!gUnknown_203B270->unk4) gUnknown_203B270->unk4 = param_2; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B270->unk58, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE); gUnknown_203B270->input.unk22 = sub_801F3F8(); sub_8013984(&gUnknown_203B270->input); gUnknown_203B270->input.menuIndex = sub_8092F4C(gUnknown_203B270->moves, gUnknown_203B270->input.menuIndex); @@ -270,7 +270,7 @@ void sub_801F214(void) gUnknown_203B270->unk58[gUnknown_203B270->unk54] = gUnknown_80DC240; } ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B270->unk58, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE); MemoryFree(gUnknown_203B270); gUnknown_203B270 = NULL; } diff --git a/src/code_801F428.c b/src/code_801F428.c index df0394bef..ef5188e52 100644 --- a/src/code_801F428.c +++ b/src/code_801F428.c @@ -56,7 +56,7 @@ bool8 sub_801F428(s16 index, s32 param_2) gUnknown_203B274->unk4 = &gUnknown_203B274->unk8; gUnknown_203B274->s348.s0.unk34 = param_2; gUnknown_203B274->s348.s0.unk38 = &gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34]; - sub_8006518(gUnknown_203B274->s348.s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B274->s348.s0.unk3C); gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2C4; gUnknown_203B274->s348.s0.unk38->unk14 = &gUnknown_203B274->s348.unk9C; gUnknown_203B274->s348.unk9C.f0 = 1; @@ -64,7 +64,7 @@ bool8 sub_801F428(s16 index, s32 param_2) gUnknown_203B274->s348.unk9C.f2 = 0xC; gUnknown_203B274->s348.unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_203B274->s348.s0.input, sub_801F7E4(), 4, param_2); sub_801F690(); sub_801F700(); @@ -111,7 +111,7 @@ u16 sub_801F5B4(void) void sub_801F5F0(bool8 r0) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B274->s348.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, FALSE, FALSE); sub_8013984(&gUnknown_203B274->s348.s0.input); sub_801F690(); sub_801F700(); @@ -125,7 +125,7 @@ void sub_801F63C(void) { gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2AC; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B274); gUnknown_203B274 = NULL; } @@ -143,7 +143,7 @@ void sub_801F700(void) u8 buffer2 [48]; u8 buffer1 [128]; - sub_8008C54(gUnknown_203B274->s348.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B274->s348.s0.unk34); sub_80073B8(gUnknown_203B274->s348.s0.unk34); sprintfStatic(buffer1,gUnknown_80DC2DC,gUnknown_203B274->s348.s0.input.unk1E + 1,gUnknown_203B274->s348.s0.input.unk20); // Moves Page: %d/%d PrintStringOnWindow(0x10,0,buffer1,gUnknown_203B274->s348.s0.unk34,0); diff --git a/src/code_801F808.c b/src/code_801F808.c index 50425293e..b33b90946 100644 --- a/src/code_801F808.c +++ b/src/code_801F808.c @@ -61,7 +61,7 @@ bool8 sub_801F808(u16 *moveIDs) gUnknown_203B278->unk60 = gUnknown_203B278->unk64; sub_80140B4(gUnknown_203B278->unk64); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE); gUnknown_203B278->moveIDs = moveIDs; for(index = 4; index > 1; index--) @@ -98,7 +98,7 @@ void sub_801F8D0(void) { gUnknown_203B278->unk64[gUnknown_203B278->unk5C] = sUnknown_80DC2F8; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE); MemoryFree(gUnknown_203B278); gUnknown_203B278 = NULL; } @@ -123,11 +123,11 @@ void sub_801F930(void) gUnknown_203B278->unkC4.f2 = 0x10; gUnknown_203B278->unkC4.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE); break; case 1: ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE); break; default: break; @@ -140,13 +140,13 @@ void sub_801F9A4(void) switch (gUnknown_203B278->state) { case 0: - sub_8008C54(gUnknown_203B278->unk5C); + CallPrepareTextbox_8008C54(gUnknown_203B278->unk5C); gUnknown_203B278->selectedMoveID = gUnknown_203B278->moveIDs[gUnknown_203B278->unk28.unk1E]; gUnknown_203B278->unk10 = unk_MoveIDPrintMoveDescription(gUnknown_203B278->unk28.unk1E,gUnknown_203B278->selectedMoveID,gUnknown_203B278->unk5C,gUnknown_203B278->unk14); gUnknown_203B278->unk24 = 0; break; case 1: - sub_8008C54(gUnknown_203B278->unk5C); + CallPrepareTextbox_8008C54(gUnknown_203B278->unk5C); sub_80073B8(gUnknown_203B278->unk5C); name = &(gUnknown_203B278->unk14[gUnknown_203B278->unkC]->pokeName); strcpy(gAvailablePokemonNames, *name); diff --git a/src/code_80227B8.c b/src/code_80227B8.c index adee36a85..5f7d577f9 100644 --- a/src/code_80227B8.c +++ b/src/code_80227B8.c @@ -17,7 +17,7 @@ #include "text2.h" extern u8 gUnknown_202DEA8[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gAvailablePokemonNames[]; // 202DF98 static EWRAM_DATA_2 unkStruct_203B294 *sUnknown_203B294 = {0}; @@ -38,7 +38,7 @@ static void sub_8023120(void); bool8 sub_80227B8(PokemonStruct1 *pkmn) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B294 = MemoryAlloc(sizeof(unkStruct_203B294), 8); sUnknown_203B294->menuAction = 0; @@ -113,7 +113,7 @@ static void sub_802293C(void) { s32 i; - sub_8006518(sUnknown_203B294->unk148); + RestoreUnkTextStruct_8006518(sUnknown_203B294->unk148); switch (sUnknown_203B294->state) { case 2: @@ -134,7 +134,7 @@ static void sub_802293C(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B294->unk148, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B294->unk148, TRUE, TRUE); } static void sub_8022A10(void) @@ -166,19 +166,19 @@ static void sub_8022A10(void) sub_801B3C0(&sUnknown_203B294->item); break; case 5: - sub_80141B4(sDoesNotAppearHungry, 0, 0, 0x301); + xxx_info_box_80141B4(sDoesNotAppearHungry, 0, 0, 0x301); break; case 6: - sub_80141B4(sFmtGummiBigFav, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtGummiBigFav, 0, 0, 0x101); break; case 7: - sub_80141B4(sFmtGummiFav, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtGummiFav, 0, 0, 0x101); break; case 8: - sub_80141B4(sFmtGummiOkay, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtGummiOkay, 0, 0, 0x101); break; case 9: - sub_80141B4(sFmtGummiSatisfied, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtGummiSatisfied, 0, 0, 0x101); break; case 10: do { @@ -203,7 +203,7 @@ static void sub_8022A10(void) sUnknown_203B294->fallbackState = 10; strcpy(gUnknown_202DEA8, GetIQSkillName(sUnknown_203B294->unk40)); PlaySound(203); - sub_80141B4(sFmtIQHelpedLearn, 0, 0, 0x101); + xxx_info_box_80141B4(sFmtIQHelpedLearn, 0, 0, 0x101); sUnknown_203B294->unk40++; break; } @@ -238,35 +238,35 @@ static void sub_8022A10(void) } break; case 12: - sub_80141B4(sFmtPlusEverything, 0, 0, 0x301); + xxx_info_box_80141B4(sFmtPlusEverything, 0, 0, 0x301); break; case 13: - sub_80141B4(sFmtPlusAtk, 0, 0, 0x301); + xxx_info_box_80141B4(sFmtPlusAtk, 0, 0, 0x301); break; case 14: - sub_80141B4(sFmtPlusSpAtk, 0, 0, 0x301); + xxx_info_box_80141B4(sFmtPlusSpAtk, 0, 0, 0x301); break; case 15: - sub_80141B4(sFmtPlusDef, 0, 0, 0x301); + xxx_info_box_80141B4(sFmtPlusDef, 0, 0, 0x301); break; case 16: - sub_80141B4(sFmtPlusSpDef, 0, 0, 0x301); + xxx_info_box_80141B4(sFmtPlusSpDef, 0, 0, 0x301); break; case 17: sUnknown_203B294->fallbackState = 22; - sub_80141B4(sNoGummis, 0, 0, 0x301); + xxx_info_box_80141B4(sNoGummis, 0, 0, 0x301); break; case 18: sUnknown_203B294->fallbackState = 22; - sub_80141B4(sNoItem, 0, 0, 0x301); + xxx_info_box_80141B4(sNoItem, 0, 0, 0x301); break; case 19: sUnknown_203B294->fallbackState = 22; - sub_80141B4(sGummiGone, 0, 0, 0x301); + xxx_info_box_80141B4(sGummiGone, 0, 0, 0x301); break; case 20: sUnknown_203B294->fallbackState = 22; - sub_80141B4(sItemGone, 0, 0, 0x301); + xxx_info_box_80141B4(sItemGone, 0, 0, 0x301); break; case 21: sub_801AFA4(sUnknown_203B294->itemIndex); @@ -375,7 +375,7 @@ static void sub_8022EF4(void) sUnknown_203B294->unk40 = 1; boostAmount = sUnknown_203B294->gummi.boostAmount; - sub_8090E14(gUnknown_202DE58, &gTeamInventoryRef->teamItems[sUnknown_203B294->itemIndex], NULL); + sub_8090E14(gFormatItems, &gTeamInventoryRef->teamItems[sUnknown_203B294->itemIndex], NULL); if (boostAmount != -1) ShiftItemsDownFrom(sUnknown_203B294->itemIndex); diff --git a/src/code_8023144.c b/src/code_8023144.c index 9b4348548..8a697e16e 100644 --- a/src/code_8023144.c +++ b/src/code_8023144.c @@ -45,7 +45,7 @@ bool8 sub_8023144(s32 a0, s32 index, UnkTextStruct2_sub *sub, u32 a3) gUnknown_3001B5C->s35C.s0.unk34 = index; gUnknown_3001B5C->s35C.s0.unk38 = &gUnknown_3001B5C->s35C.s0.unk3C[index]; - sub_8006518(gUnknown_3001B5C->s35C.s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_3001B5C->s35C.s0.unk3C); gUnknown_3001B5C->s35C.s0.unk3C[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC91C; gUnknown_3001B5C->s35C.s0.unk38->unk14 = &gUnknown_3001B5C->s35C.unk9C; @@ -55,7 +55,7 @@ bool8 sub_8023144(s32 a0, s32 index, UnkTextStruct2_sub *sub, u32 a3) sub_8012D08(gUnknown_3001B5C->s35C.s0.unk38, a3); ResetUnusedInputStruct(); - sub_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_3001B5C->s35C.s0.input, sub_80236A4(), a3, index); gUnknown_3001B5C->s35C.s0.input.menuIndex = gUnknown_203B29C; gUnknown_3001B5C->s35C.s0.input.unk1E = gUnknown_203B29E; @@ -109,7 +109,7 @@ s16 sub_802331C(void) void sub_8023354(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_3001B5C->s35C.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, FALSE, FALSE); sub_8013984(&gUnknown_3001B5C->s35C.s0.input); sub_8023420(); sub_80234BC(); @@ -126,7 +126,7 @@ void sub_80233A0(void) gUnknown_203B29E = gUnknown_3001B5C->s35C.s0.input.unk1E; gUnknown_3001B5C->s35C.s0.unk3C[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC904; ResetUnusedInputStruct(); - sub_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_3001B5C); gUnknown_3001B5C = NULL; } @@ -155,7 +155,7 @@ static void sub_80234BC(void) u8 buffer1[100]; unkStruct_8092638 auStack_2c; - sub_8008C54(gUnknown_3001B5C->s35C.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_3001B5C->s35C.s0.unk34); sub_80073B8(gUnknown_3001B5C->s35C.s0.unk34); PrintStringOnWindow(10, 0, sPokemon, gUnknown_3001B5C->s35C.s0.unk34, 0); diff --git a/src/code_8024458.c b/src/code_8024458.c index 39cd432c9..7a20fbf8a 100644 --- a/src/code_8024458.c +++ b/src/code_8024458.c @@ -28,7 +28,7 @@ bool8 sub_8024458(s16 speciesNum, s32 a1) sUnknown_203B2AC->speciesNum = speciesNum_s32; sUnknown_203B2AC->unkE0 = a1; sUnknown_203B2AC->unkE4 = &sUnknown_203B2AC->unkE8[a1]; - sub_8006518(sUnknown_203B2AC->unkE8); + RestoreUnkTextStruct_8006518(sUnknown_203B2AC->unkE8); sUnknown_203B2AC->unkE8[sUnknown_203B2AC->unkE0] = sUnknown_80DC9C8; sUnknown_203B2AC->unkE4->unk14 = &sUnknown_203B2AC->unk148; sUnknown_203B2AC->unk148.f2 = 10; @@ -67,7 +67,7 @@ void sub_802453C(void) if (sUnknown_203B2AC != NULL) { sUnknown_203B2AC->unkE8[sUnknown_203B2AC->unkE0] = sUnknown_80DC9B0; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE); MemoryFree(sUnknown_203B2AC); sUnknown_203B2AC = NULL; } @@ -79,7 +79,7 @@ static void sub_8024588(void) sUnknown_203B2AC->unk148.f1 = sUnknown_203B2AC->input.unk1E; sUnknown_203B2AC->unk148.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE); } static void sub_80245D0(void) diff --git a/src/code_802DB28.c b/src/code_802DB28.c index fb6f2b3ac..04579969a 100644 --- a/src/code_802DB28.c +++ b/src/code_802DB28.c @@ -13,7 +13,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202E1C8[]; extern u8 gUnknown_202E5D8[]; @@ -37,7 +37,7 @@ bool8 sub_802DB28(u8 jobSlotIndex, u8 dungeon) return FALSE; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B2FC = MemoryAlloc(sizeof(struct unkStruct_203B2FC), 8); sUnknown_203B2FC->jobSlotIndex = jobSlotIndex; @@ -97,7 +97,7 @@ static void sub_802DC40(void) { s32 i; - sub_8006518(sUnknown_203B2FC->unk48); + RestoreUnkTextStruct_8006518(sUnknown_203B2FC->unk48); switch (sUnknown_203B2FC->state) { case 0: @@ -108,7 +108,7 @@ static void sub_802DC40(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2FC->unk48, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2FC->unk48, TRUE, TRUE); } static void sub_802DC9C(void) @@ -125,7 +125,7 @@ static void sub_802DC9C(void) speciesText = GetMonSpecies(sUnknown_203B2FC->jobInfo->targetSpecies); strcpy(gUnknown_202E1C8 - 480, speciesText); UnlockExclusivePokemon(sUnknown_203B2FC->jobInfo->clientSpecies); - BufferItemName(gUnknown_202DE58, sUnknown_203B2FC->jobInfo->targetItem, NULL); + BufferItemName(gFormatItems, sUnknown_203B2FC->jobInfo->targetItem, NULL); sUnknown_203B2FC->fallbackState = 6; switch (sUnknown_203B2FC->jobInfo->missionType) { @@ -150,16 +150,16 @@ static void sub_802DC9C(void) } break; case 1: - sub_80141B4(sThanksForRescuingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D); + xxx_info_box_80141B4(sThanksForRescuingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D); break; case 2: - sub_80141B4(sThanksForRescuingThem, 0, &sUnknown_203B2FC->faceFile, 0x10D); + xxx_info_box_80141B4(sThanksForRescuingThem, 0, &sUnknown_203B2FC->faceFile, 0x10D); break; case 3: - sub_80141B4(sThanksForEscortingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D); + xxx_info_box_80141B4(sThanksForEscortingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D); break; case 5: - sub_80141B4(sThanksForDelivering, 0, &sUnknown_203B2FC->faceFile, 0x10D); + xxx_info_box_80141B4(sThanksForDelivering, 0, &sUnknown_203B2FC->faceFile, 0x10D); break; case 4: index = FindItemInInventory(sUnknown_203B2FC->jobInfo->targetItem); @@ -167,7 +167,7 @@ static void sub_802DC9C(void) ShiftItemsDownFrom(index); FillInventoryGaps(); } - sub_80141B4(sThanksForGetting, 0, &sUnknown_203B2FC->faceFile, 0x10D); + xxx_info_box_80141B4(sThanksForGetting, 0, &sUnknown_203B2FC->faceFile, 0x10D); break; case 6: sub_802F204(&sUnknown_203B2FC->unk8, 1); diff --git a/src/code_802DE84.c b/src/code_802DE84.c index d9a059d51..4b6481677 100644 --- a/src/code_802DE84.c +++ b/src/code_802DE84.c @@ -24,7 +24,7 @@ bool8 sub_802DE84(unkStruct_802C39C *mail) sub_801317C(&sUnknown_203B300->unk0); sUnknown_203B300->unk10 = sUnknown_203B300->mail->unk0[0]; sUnknown_203B300->unk14 = &sUnknown_203B300->unk18[sUnknown_203B300->unk10]; - sub_8006518(sUnknown_203B300->unk18); + RestoreUnkTextStruct_8006518(sUnknown_203B300->unk18); sUnknown_203B300->unk18[sUnknown_203B300->unk10] = sUnknown_80E0264; sub_802DF14(); return TRUE; @@ -55,7 +55,7 @@ void sub_802DF24(void) if (sUnknown_203B300 != NULL) { sUnknown_203B300->unk18[sUnknown_203B300->unk10] = sUnknown_80E0248; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B300->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B300->unk18, TRUE, TRUE); MemoryFree(sUnknown_203B300); sUnknown_203B300 = NULL; } @@ -64,7 +64,7 @@ void sub_802DF24(void) static void sub_802DF6C(void) { ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B300->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B300->unk18, TRUE, TRUE); } static void sub_802DF88(void) diff --git a/src/code_8031D70.c b/src/code_8031D70.c index c2697f4b6..3eac74889 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -60,7 +60,7 @@ bool8 sub_8031D70(u32 mailIndex, s32 param_2) sub_801317C(&gUnknown_203B334->unk4); gUnknown_203B334->unk10 = param_2; gUnknown_203B334->unk14 = &gUnknown_203B334->unk18[param_2]; - sub_8006518(gUnknown_203B334->unk18); + RestoreUnkTextStruct_8006518(gUnknown_203B334->unk18); gUnknown_203B334->unk18[gUnknown_203B334->unk10] = gUnknown_80E1FC4; sub_8031E00(); return TRUE; @@ -93,7 +93,7 @@ void sub_8031E10(void) { gUnknown_203B334->unk18[gUnknown_203B334->unk10] = gUnknown_80E1FA8; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B334->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B334->unk18, TRUE, TRUE); MemoryFree(gUnknown_203B334); gUnknown_203B334 = NULL; } @@ -102,7 +102,7 @@ void sub_8031E10(void) void sub_8031E58(void) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B334->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B334->unk18, TRUE, TRUE); } void DrawSOSPasswordScreen(void) diff --git a/src/code_8048480.c b/src/code_8048480.c index 38d98a24f..8dfd6c681 100644 --- a/src/code_8048480.c +++ b/src/code_8048480.c @@ -26,7 +26,7 @@ #include "structs/str_position.h" extern u8 gAvailablePokemonNames[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern s16 gTypeGummiIQBoost[NUM_TYPES][NUMBER_OF_GUMMIS]; @@ -60,7 +60,7 @@ extern s16 gUnknown_80F4E74[]; extern u8 *gUnknown_80FDBB8[]; extern u8 *gUnknown_80FE458[]; -extern u8 *gUnknown_80FE3E8[]; +extern u8 *gItemStickyDoesntWorkText[]; extern u8 *gUnknown_80FEAE8[]; extern u8 *gUnknown_80FDBA0[]; extern u8 *gUnknown_80FE434[]; @@ -73,16 +73,16 @@ extern u8 *gUnknown_80FD644[]; extern u8 *gUnknown_80FD648[]; extern u8 *gUnknown_80FD6E8[]; extern u8 *gPtrCantUseInDungeonMessage[]; -extern u8 *gUnknown_80FE3E8[]; +extern u8 *gItemStickyDoesntWorkText[]; extern u8 *gPtrMusicBoxPlayedCrumbledMessage[]; extern u8 *gPtrWishStoneCrumbledMessage[]; extern u8 *gPtrIcePartCrumbledMessage[]; extern u8 *gPtrRockPartCrumbledMessage[]; extern u8 *gPtrSteelPartCrumbledMessage[]; extern u8 *gUnknown_80FDCA4[]; -extern u8 *gUnknown_80FE3E8[]; +extern u8 *gItemStickyDoesntWorkText[]; extern u8 *gUnknown_80FECA0[]; -extern u8 *gUnknown_80FE3E8[]; +extern u8 *gItemStickyDoesntWorkText[]; extern u8 *gUnknown_80F9BD8[]; #include "data/code_8048480.h" @@ -226,7 +226,7 @@ void sub_80479B8(char param_1, char param_2, u8 param_3, Entity *pokemon, Entity return; } PlaySoundEffect(0x14d); - sub_8045BF8(gUnknown_202DE58,item); + sub_8045BF8(gFormatItems,item); SetMessageArgument(gAvailablePokemonNames,target,0); sub_80522F4(pokemon,target,*gUnknown_80FDBB8); // $m0 caught the $i0 info->heldItem = *item; @@ -240,8 +240,8 @@ void sub_80479B8(char param_1, char param_2, u8 param_3, Entity *pokemon, Entity } } if ((item->flags & ITEM_FLAG_STICKY)) { - sub_8045BF8(gUnknown_202DE58,item); - sub_80522F4(pokemon,target,*gUnknown_80FE3E8); + sub_8045BF8(gFormatItems,item); + sub_80522F4(pokemon,target,*gItemStickyDoesntWorkText); if (param_1 != '\0') { sub_806F370(pokemon,target,gUnknown_80F4FAE,1,&uStack_24,0,0x217,0,0,0); sub_8071DA4(pokemon); @@ -820,7 +820,7 @@ bool8 sub_8048950(Entity *param_1,Item *item) moveID = GetItemMoveID(item->id); if ((item->flags & ITEM_FLAG_STICKY)) { - PrintFieldMessage(0,*gUnknown_80FE3E8,1); + PrintFieldMessage(0,*gItemStickyDoesntWorkText,1); return FALSE; } else if (IsHMItem(item->id)) { @@ -871,7 +871,7 @@ bool8 sub_8048A68(Entity *param_1,Item *item) PokemonStruct2 *pokemon; if ((item->flags & ITEM_FLAG_STICKY)) { - PrintFieldMessage(0,*gUnknown_80FE3E8,1); + PrintFieldMessage(0,*gItemStickyDoesntWorkText,1); return FALSE; } else @@ -947,7 +947,7 @@ bool32 sub_8048B9C(Entity *entity,Item *param_2) entityInfo = entity->info; actionPointer = &(entityInfo->action); if ((param_2->flags & ITEM_FLAG_STICKY)) { - PrintFieldMessage(0,*gUnknown_80FE3E8,1); + PrintFieldMessage(0,*gItemStickyDoesntWorkText,1); return FALSE; } else @@ -1039,8 +1039,8 @@ bool8 sub_8048D50(Entity * pokemon, Item *item) entityInfo = pokemon->info; if ((item->flags & ITEM_FLAG_STICKY) != 0) { - sub_8045BF8(gUnknown_202DE58, item); - SendMessage(pokemon,*gUnknown_80FE3E8); + sub_8045BF8(gFormatItems, item); + SendMessage(pokemon,*gItemStickyDoesntWorkText); return FALSE; } else diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c index 58d138bcb..e9621b758 100644 --- a/src/code_8057824_1.c +++ b/src/code_8057824_1.c @@ -30,7 +30,7 @@ extern u32 gUnknown_202EDC8; extern u8 gUnknown_202E038[0x50]; extern u8 gAvailablePokemonNames[0x58]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern const s16 gUnknown_80F57CA; extern const s16 gUnknown_80F57D2; @@ -3610,7 +3610,7 @@ void JirachiWish(void) PlaySoundEffect(0xd4); LeaderEntity = GetLeader(); SetMessageArgument(gAvailablePokemonNames,LeaderEntity,0); - sub_8092578(gUnknown_202DE58,friendArea,FALSE); + WriteFriendAreaName(gFormatItems,friendArea,FALSE); // Obtained the friend area! DisplayDungeonDialogue(gUnknown_8105B68); } diff --git a/src/code_805D8C8.c b/src/code_805D8C8.c index 77f3ce9fb..26b8ea822 100644 --- a/src/code_805D8C8.c +++ b/src/code_805D8C8.c @@ -11,8 +11,8 @@ extern const u8 gUnknown_8106EA0[]; // ax%03d // ??? extern s32 sprintf(char *, const char *, ...); -static void sub_8068884(void); -static void sub_80688B0(void); +static void EnsureCastformLoaded(void); +static void EnsureDeoxysLoaded(void); void sub_8068768(void) { @@ -23,7 +23,7 @@ void sub_8068768(void) entity = gDungeon->allPokemon[i]; if (entity != NULL && EntityExists(entity)) - sub_8068838(entity->info->apparentID, FALSE); + LoadPokemonSprite(entity->info->apparentID, FALSE); } } @@ -33,13 +33,13 @@ void sub_80687AC(void) gDungeon->unk37F4 = 10; } -OpenedFile *sub_80687D0(s16 species) +OpenedFile *GetSpriteData(s16 species) { s32 species32 = species; return gDungeon->sprites[species32]; } -static void sub_80687EC(s32 _id) +static void EnsureSpriteLoaded(s32 _id) { u8 name [12]; s32 id = (s16)_id; @@ -50,34 +50,34 @@ static void sub_80687EC(s32 _id) } } -void sub_8068838(s16 id, bool32 a1) +void LoadPokemonSprite(s16 id, bool32 a1) { s32 id_s32 = id; bool8 param_2 = a1; if (!param_2 && (id_s32 == MONSTER_DEOXYS_NORMAL || id_s32 == MONSTER_DEOXYS_ATTACK || id_s32 == MONSTER_DEOXYS_DEFENSE || id_s32 == MONSTER_DEOXYS_SPEED)) { - sub_80688B0(); + EnsureDeoxysLoaded(); } else { - sub_80687EC(id_s32); + EnsureSpriteLoaded(id_s32); // >= MONSTER_CASTFORM && <= MONSTER_CASTFORM_RAINY if ((u16)(id_s32 - MONSTER_CASTFORM) < 4) - sub_8068884(); + EnsureCastformLoaded(); } } -static void sub_8068884(void) +static void EnsureCastformLoaded(void) { - sub_80687EC(MONSTER_CASTFORM); - sub_80687EC(MONSTER_CASTFORM_SNOWY); - sub_80687EC(MONSTER_CASTFORM_SUNNY); - sub_80687EC(MONSTER_CASTFORM_RAINY); + EnsureSpriteLoaded(MONSTER_CASTFORM); + EnsureSpriteLoaded(MONSTER_CASTFORM_SNOWY); + EnsureSpriteLoaded(MONSTER_CASTFORM_SUNNY); + EnsureSpriteLoaded(MONSTER_CASTFORM_RAINY); } -static void sub_80688B0(void) +static void EnsureDeoxysLoaded(void) { - sub_80687EC(gDungeon->unk3800); + EnsureSpriteLoaded(gDungeon->unk3800); } void CloseAllSpriteFiles(void) diff --git a/src/code_805D8C8_1.c b/src/code_805D8C8_1.c index d60d7dd75..4c878d732 100644 --- a/src/code_805D8C8_1.c +++ b/src/code_805D8C8_1.c @@ -4384,15 +4384,15 @@ bool8 sub_8060E38(Entity *a0) bool32 sub_8069D18(Position *a0, Entity *a1); -extern const u8 gUnknown_8106BB0[]; -extern const u8 gUnknown_8106BB4[]; -extern const u8 gUnknown_8106BB8[]; -extern const u8 gUnknown_8106BBC[]; -extern const u8 gUnknown_8106BC0[]; -extern const u8 gUnknown_8106BC4[]; -extern const u8 gUnknown_8106BC8[]; -extern const u8 gUnknown_8106BCC[]; -extern const u8 gUnknown_8106BD0[]; +extern const u8 gTeamFormat[]; +extern const u8 gHeartRedTiny[]; +extern const u8 gHeartRedSmall[]; +extern const u8 gHeartRedMedium[]; +extern const u8 gHeartRedLarge[]; +extern const u8 gHeartYellowTiny[]; +extern const u8 gHeartYellowSmall[]; +extern const u8 gHeartYellowMedium[]; +extern const u8 gHeartYellowLarge[]; extern const u8 gUnknown_8106BD4[]; extern const u8 gUnknown_8106BE0[]; extern const u8 gUnknown_8106BEC[]; @@ -4466,7 +4466,7 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo sub_80137B0(&gUnknown_202EE10, 0); sub_80073B8(0); if (r10) { - PrintFormatStringOnWindow(0xC, 0, gUnknown_8106BB0, 0, 0); + PrintFormatStringOnWindow(0xC, 0, gTeamFormat, 0, 0); } // Print hp/max hp @@ -4483,30 +4483,30 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo sub_8070968(gAvailablePokemonNames, monInfo, color); if (sub_806A538(gRecruitedPokemonRef->pokemon2[monInfo->teamIndex].unkA)) { if (monInfo->HP <= monInfo->maxHPStat / 4) { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BB4); + strcpy(gAvailablePokemonNames + 0x50, gHeartRedTiny); } else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 2) { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BB8); + strcpy(gAvailablePokemonNames + 0x50, gHeartRedSmall); } else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 3) { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BBC); + strcpy(gAvailablePokemonNames + 0x50, gHeartRedMedium); } else { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BC0); + strcpy(gAvailablePokemonNames + 0x50, gHeartRedLarge); } } else { if (monInfo->HP <= monInfo->maxHPStat / 4) { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BC4); + strcpy(gAvailablePokemonNames + 0x50, gHeartYellowTiny); } else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 2) { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BC8); + strcpy(gAvailablePokemonNames + 0x50, gHeartYellowSmall); } else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 3) { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BCC); + strcpy(gAvailablePokemonNames + 0x50, gHeartYellowMedium); } else { - strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BD0); + strcpy(gAvailablePokemonNames + 0x50, gHeartYellowLarge); } } diff --git a/src/code_8066D04.c b/src/code_8066D04.c index bc2b918ee..b9bfc7fea 100644 --- a/src/code_8066D04.c +++ b/src/code_8066D04.c @@ -7,16 +7,16 @@ #include "dungeon_util.h" #include "items.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202DEA8[]; extern u8 gAvailablePokemonNames[]; extern u8 gUnknown_202DFE8[]; extern u8 *gUnknown_80F8BE0[]; -extern u8 *gUnknown_80F8C40[]; -extern u8 *gUnknown_80F8C44[]; -extern u8 *gUnknown_80F8C7C[]; -extern u8 *gUnknown_80F8CA8[]; +extern u8 *gItemStickyCannotMove1[]; +extern u8 *gItemStickyCannotMove2[]; +extern u8 *gItemStickyCannotEquip[]; +extern u8 *gMonTookAndReturnedItem[]; extern u8 *gUnknown_80F8CE4[]; extern u8 *gUnknown_80F8CE8[]; extern u8 *gUnknown_80F8D04[]; @@ -57,14 +57,14 @@ void HandleSetItemAction(Entity *param_1, bool8 param_2) itemPtr = &gTeamInventoryRef->teamItems[index]; if (((itemPtr->flags & ITEM_FLAG_EXISTS)) && ((itemPtr->flags & ITEM_FLAG_SET))) { if ((itemPtr->flags & ITEM_FLAG_STICKY)) { - sub_8045BF8(gUnknown_202DE58,itemPtr); - SendMessage(param_1,*gUnknown_80F8C7C); + sub_8045BF8(gFormatItems,itemPtr); + SendMessage(param_1,*gItemStickyCannotEquip); return; } itemPtr->flags &= ~(ITEM_FLAG_SET); } } - sub_8045BF8(gUnknown_202DE58,item); + sub_8045BF8(gFormatItems,item); PlaySoundEffect(0x133); if (param_2 != 0) { if ((item->flags & ITEM_FLAG_STICKY)) { @@ -82,7 +82,7 @@ void HandleSetItemAction(Entity *param_1, bool8 param_2) } item->flags |= ITEM_FLAG_SET; if (((item->flags & ITEM_FLAG_STICKY)) && (param_2 != 0)) { - sub_8045BF8(gUnknown_202DE58,item); + sub_8045BF8(gFormatItems,item); SendMessage(param_1,*gUnknown_80F8BE0); } } @@ -98,12 +98,12 @@ void HandleUnsetItemAction(Entity *entity,bool8 enableMessage) item = &gTeamInventoryRef->teamItems[index]; if (((item->flags & ITEM_FLAG_EXISTS)) && ((item->flags & ITEM_FLAG_SET))) { if ((item->flags & ITEM_FLAG_STICKY)) { - sub_8045BF8(gUnknown_202DE58,item); - SendMessage(entity,*gUnknown_80F8C7C); + sub_8045BF8(gFormatItems,item); + SendMessage(entity,*gItemStickyCannotEquip); return; } item->flags &= ~(ITEM_FLAG_SET); - sub_8045BF8(gUnknown_202DE58,item); + sub_8045BF8(gFormatItems,item); PlaySoundEffect(0x133); if (enableMessage) { SendMessage(entity,*gUnknown_80F8D20); @@ -136,7 +136,7 @@ void HandleGiveItemAction(Entity *param_1) if ((!bVar3) && ((item->flags & (ITEM_FLAG_STICKY | ITEM_FLAG_SET)) == (ITEM_FLAG_STICKY | ITEM_FLAG_SET))) { sub_8045BF8(gUnknown_202DEA8,item); - SendMessage(param_1,*gUnknown_80F8C44); + SendMessage(param_1,*gItemStickyCannotMove2); } else { @@ -144,7 +144,7 @@ void HandleGiveItemAction(Entity *param_1) if (((info2->heldItem).flags & ITEM_FLAG_EXISTS)) { if (((info2->heldItem).flags & ITEM_FLAG_STICKY)) { sub_8045BF8(gUnknown_202DEA8,&info2->heldItem); - SendMessage(param_1,*gUnknown_80F8C40); + SendMessage(param_1,*gItemStickyCannotMove1); return; } item1 = (info2->heldItem); @@ -159,10 +159,10 @@ void HandleGiveItemAction(Entity *param_1) AddItemToInventory(&item1); } info2->heldItem = item2; - sub_8045BF8(gUnknown_202DE58,&item2); - sub_8045BF8(gUnknown_202DE58 + 0x50,&item1); + sub_8045BF8(gFormatItems,&item2); + sub_8045BF8(gFormatItems + 0x50,&item1); PlaySoundEffect(0x14d); - SendMessage(param_1,*gUnknown_80F8CA8); + SendMessage(param_1,*gMonTookAndReturnedItem); if ((item2.flags & ITEM_FLAG_STICKY)) { SendMessage(param_1,*gUnknown_80F8BE0); } @@ -172,7 +172,7 @@ void HandleGiveItemAction(Entity *param_1) item3.flags &= ~(ITEM_FLAG_SET); sub_8044DF0(param_1, 0, 101); info2->heldItem = item3; - sub_8045BF8(gUnknown_202DE58,&item3); + sub_8045BF8(gFormatItems,&item3); PlaySoundEffect(0x14d); SendMessage(param_1,*gUnknown_80F8D44); if ((item3.flags & ITEM_FLAG_STICKY)) { @@ -209,14 +209,14 @@ void HandleTakeItemAction(Entity *param_1) else { if ((heldItem->flags & ITEM_FLAG_STICKY)) { - sub_8045BF8(gUnknown_202DE58,heldItem); + sub_8045BF8(gFormatItems,heldItem); SendMessage(param_1,*gUnknown_80F8BE0); } else { item = *heldItem; item.flags &= ~(ITEM_FLAG_SET); - sub_8045BF8(gUnknown_202DE58,&item); + sub_8045BF8(gFormatItems,&item); SetMessageArgument(gAvailablePokemonNames,entity,0); heldItem->id = ITEM_NOTHING; heldItem->quantity = 0; @@ -252,19 +252,19 @@ void sub_8066BD4(Entity *param_1) item = sub_8044D90(param_1,1,0x1565); if (heldItem->flags & ITEM_FLAG_STICKY) { - sub_8045BF8(gUnknown_202DE58,heldItem); + sub_8045BF8(gFormatItems,heldItem); SendMessage(param_1,*gUnknown_80F8BE0); } else if ((item->flags & (ITEM_FLAG_STICKY | ITEM_FLAG_SET)) == (ITEM_FLAG_STICKY | ITEM_FLAG_SET)) { - sub_8045BF8(gUnknown_202DE58,item); + sub_8045BF8(gFormatItems,item); SendMessage(param_1,*gUnknown_80F8BE0); } else { heldItem->flags &= ~(ITEM_FLAG_SET); item->flags &= ~(ITEM_FLAG_SET); - sub_8045BF8(gUnknown_202DE58,heldItem); - sub_8045BF8(gUnknown_202DE58 + 0x50,item); + sub_8045BF8(gFormatItems,heldItem); + sub_8045BF8(gFormatItems + 0x50,item); SetMessageArgument(gUnknown_202DFE8,entity,0); temp = info->heldItem; info->heldItem = *item; @@ -304,7 +304,7 @@ void HandlePlaceItemAction(Entity *param_1) info = entity->info; item = sub_8044D90(entity,0,4); - sub_8045BF8(gUnknown_202DE58,item); + sub_8045BF8(gFormatItems,item); if (info->action.unk4[0].actionUseIndex == 0x80) { SendMessage(entity,*gUnknown_80F8DE0); } @@ -321,7 +321,7 @@ void HandlePlaceItemAction(Entity *param_1) if(((tile->terrainType & (TERRAIN_TYPE_NORMAL | TERRAIN_TYPE_SECONDARY)) == TERRAIN_TYPE_NORMAL) && (tile->object == NULL)) { item->flags &= ~(ITEM_FLAG_SET); - sub_8045BF8(gUnknown_202DE58,item); + sub_8045BF8(gFormatItems,item); if (sub_80460F8(&entity->pos,item,1) == 0) { _message: SendMessage(entity,*gUnknown_80F8E04); diff --git a/src/code_8069E0C.c b/src/code_8069E0C.c index 29b0ea2cb..796087c73 100644 --- a/src/code_8069E0C.c +++ b/src/code_8069E0C.c @@ -29,7 +29,7 @@ struct unkStruct_80F520C extern struct unkStruct_80F520C gUnknown_80F520C[]; extern u8 gAvailablePokemonNames[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_80F51E4[]; extern u8 *gUnknown_80FCC7C[]; extern u8 *gUnknown_80FCCAC[]; @@ -193,7 +193,7 @@ _0806A068: iVar6->isColorChanged = TRUE; SetMessageArgument(gAvailablePokemonNames,target,0); __src = GetUnformattedTypeString(iVar6->types[0]); - strcpy(gUnknown_202DE58,__src); + strcpy(gFormatItems,__src); sub_80522F4(pokemon,target,*gUnknown_80FCCAC); sub_8042968(target); } @@ -218,7 +218,7 @@ void sub_806A120(Entity * pokemon, Entity * target, Move* move) sub_8041BBC(target); SetMessageArgument(gAvailablePokemonNames,target,0); typeString = GetUnformattedTypeString(uVar2_u32); - strcpy(gUnknown_202DE58,typeString); + strcpy(gFormatItems,typeString); sub_80522F4(pokemon,target,*gUnknown_80FDCC8); } } diff --git a/src/code_806CD90.c b/src/code_806CD90.c index 317d12ba3..747e81a6e 100644 --- a/src/code_806CD90.c +++ b/src/code_806CD90.c @@ -69,9 +69,9 @@ void sub_806CCB4(Entity *entity, u8 a1) sVar1 = entity->unk68; if (info->waitingStruct.waitingStatus != STATUS_DECOY && !flag) - sub_80053AC(&entity->spriteInfo, entity->sprite, entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); + AxResInitFile_80053AC(&entity->spriteInfo, entity->sprite, entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); else - sub_80053AC(&entity->spriteInfo, sub_80687D0(MONSTER_DECOY), entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); + AxResInitFile_80053AC(&entity->spriteInfo, GetSpriteData(MONSTER_DECOY), entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); entity->unk6E = 0; } diff --git a/src/code_8072B78.c b/src/code_8072B78.c index 20a08d93d..bae673058 100644 --- a/src/code_8072B78.c +++ b/src/code_8072B78.c @@ -113,7 +113,7 @@ void sub_8072B78(Entity *pokemon, Entity *target, s16 id) entityInfo = target->info; SetMessageArgument_2(gAvailablePokemonNames,entityInfo,0); CopyCyanMonsterNametoBuffer(gAvailablePokemonNames + 0x50,id_s32); - file = sub_80687D0(id_s32); + file = GetSpriteData(id_s32); fu(entityInfo, id_s32); GetPokemonLevelData(&levelData,id_s32,entityInfo->level); entityInfo->exp = levelData.expRequired; diff --git a/src/code_8072F3C.c b/src/code_8072F3C.c index 2584f96e1..15b0cf9e7 100644 --- a/src/code_8072F3C.c +++ b/src/code_8072F3C.c @@ -75,7 +75,7 @@ u32 sub_802F73C(u32 r0, UnkTextStruct2_sub *r1, u32 r2, u8 r3) gUnknown_203B314->unkB8 = r3; gUnknown_203B314->sBC.s0.unk34 = r0; gUnknown_203B314->sBC.s0.unk38 = &gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34]; - sub_8006518(gUnknown_203B314->sBC.s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B314->sBC.s0.unk3C); if (r3 != 0) gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E072C; @@ -89,7 +89,7 @@ u32 sub_802F73C(u32 r0, UnkTextStruct2_sub *r1, u32 r2, u8 r3) sub_8012D08(gUnknown_203B314->sBC.s0.unk38, r2); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_203B314->sBC.s0.input, sub_802FBF4(), r2, r0); sub_802F9C0(); sub_802FA50(); @@ -169,7 +169,7 @@ void sub_802F974(void) { gUnknown_203B314->sBC.s0.unk3C[gUnknown_203B314->sBC.s0.unk34] = gUnknown_80E06FC; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B314->sBC.s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B314); gUnknown_203B314 = NULL; } @@ -194,7 +194,7 @@ void sub_802FA50(void) int index; int counter; - sub_8008C54(gUnknown_203B314->sBC.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B314->sBC.s0.unk34); sub_80073B8(gUnknown_203B314->sBC.s0.unk34); PrintStringOnWindow(10,0,gUnknown_80E0744,gUnknown_203B314->sBC.s0.unk34,0); sub_8012BC4(gUnknown_203B314->sBC.unk9C.f2 * 8 + 4,0,gUnknown_203B314->sBC.s0.input.unk1E + 1,2,7,gUnknown_203B314->sBC.s0.unk34); diff --git a/src/code_8073CF0.c b/src/code_8073CF0.c index ed8af85c4..4831eabe6 100644 --- a/src/code_8073CF0.c +++ b/src/code_8073CF0.c @@ -67,16 +67,16 @@ extern void sub_807EC28(bool8); extern s32 gUnknown_202F378; extern u8 gUnknown_202F32D; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202DFE8[]; extern u8 gAvailablePokemonNames[]; -extern const u8 *gUnknown_80F8F88; -extern const u8 *gUnknown_80F9054; -extern const u8 *gUnknown_80F9018; -extern const u8 *gUnknown_80F9050; -extern const u8 *gUnknown_80F8F54; -extern const u8 *gUnknown_80F8FAC; +extern const u8 *gMonTerrifiedCouldntPickUpItem; +extern const u8 *gMonPickedUpItem; +extern const u8 *gMonPickedUpItem2; +extern const u8 *gMonPickedUpItemToolbox; +extern const u8 *gMonSteppedOnItem; +extern const u8 *gMonCouldntPickUpItem; extern const u8 *gUnknown_80FD594; extern const u8 *gUnknown_80FD5B8; extern const u8 *gUnknown_80FD5DC; @@ -159,9 +159,9 @@ void sub_8073D14(Entity *entity) return; if (ShouldMonsterRunAwayAndShowEffect(entity, TRUE)) { - sub_8045BF8(gUnknown_202DE58, groundItem); + sub_8045BF8(gFormatItems, groundItem); SetMessageArgument(gAvailablePokemonNames, entity, 0); - sub_805239C(entity, gUnknown_80F8F88); + sub_805239C(entity, gMonTerrifiedCouldntPickUpItem); } else if (!_entityInfo->isNotTeamMember && GetItemCategory(groundItem->id) == CATEGORY_POKE) { // Why check the same thing again? @@ -172,9 +172,9 @@ void sub_8073D14(Entity *entity) PlaySoundEffect(0x14C); } AddToTeamMoney(GetMoneyValue(groundItem)); - sub_8045BF8(gUnknown_202DE58, groundItem); + sub_8045BF8(gFormatItems, groundItem); sub_80461C8(&entity->pos, 1); - sub_805239C(entity, gUnknown_80F9054); + sub_805239C(entity, gMonPickedUpItem); } else { s32 i, nItems, newInventoryId; @@ -234,13 +234,13 @@ void sub_8073D14(Entity *entity) if (groundItem->flags & ITEM_FLAG_STICKY) carriedItems[newInventoryId]->flags |= ITEM_FLAG_STICKY; - sub_8045BF8(gUnknown_202DE58, groundItem); + sub_8045BF8(gFormatItems, groundItem); sub_80461C8(&entity->pos, 1); PlaySoundEffect(0x14A); if (inventoryIds[newInventoryId] <= -1) - sub_805239C(entity, gUnknown_80F9018); + sub_805239C(entity, gMonPickedUpItem2); else - sub_805239C(entity, gUnknown_80F9050); + sub_805239C(entity, gMonPickedUpItemToolbox); return; } @@ -252,8 +252,8 @@ void sub_8073D14(Entity *entity) } if (i == nItems) { - sub_8045BF8(gUnknown_202DE58, groundItem); - sub_805239C(entity, gUnknown_80F8F54); + sub_8045BF8(gFormatItems, groundItem); + sub_805239C(entity, gMonSteppedOnItem); } else { if (_entityInfo->isNotTeamMember) { @@ -265,18 +265,18 @@ void sub_8073D14(Entity *entity) if (inventoryIds[i] <= -1) { _entityInfo->heldItem = *groundItem; - sub_8045BF8(gUnknown_202DE58, groundItem); + sub_8045BF8(gFormatItems, groundItem); sub_80461C8(&entity->pos, 1); - sub_805239C(entity, gUnknown_80F9018); + sub_805239C(entity, gMonPickedUpItem2); } else if (AddItemToInventory(groundItem)) { SetMessageArgument(gAvailablePokemonNames, entity, 0); - sub_805239C(entity, gUnknown_80F8FAC); + sub_805239C(entity, gMonCouldntPickUpItem); } else { - sub_8045BF8(gUnknown_202DE58, groundItem); + sub_8045BF8(gFormatItems, groundItem); sub_80461C8(&entity->pos, 1); - sub_805239C(entity, gUnknown_80F9050); + sub_805239C(entity, gMonPickedUpItemToolbox); } } } diff --git a/src/code_8077274_1.c b/src/code_8077274_1.c index bd7ba939a..b5c4c6af7 100644 --- a/src/code_8077274_1.c +++ b/src/code_8077274_1.c @@ -267,7 +267,7 @@ void TransformStatusTarget(Entity * pokemon, Entity * target) apparentID = apparentID_s16; if (apparentID != entityInfo->apparentID && sub_806AA0C(apparentID, 1)) { - sprite = sub_80687D0(apparentID); + sprite = GetSpriteData(apparentID); if (sprite != NULL) break; } @@ -1504,7 +1504,7 @@ void SendTransformEndMessage(Entity * pokemon, Entity *target) break; case STATUS_TRANSFORMED: entityInfo->apparentID = sub_8069F54(target, entityInfo->id); - target->sprite = sub_80687D0(entityInfo->apparentID); + target->sprite = GetSpriteData(entityInfo->apparentID); uVar3 = sub_806CEBC(target); sub_806CCB4(target,uVar3); SendMessage(target,*gUnknown_80FAB6C); diff --git a/src/code_8083288.c b/src/code_8083288.c index 41cec5f07..a96740a08 100644 --- a/src/code_8083288.c +++ b/src/code_8083288.c @@ -32,7 +32,7 @@ void sub_8082B40(void) entity = gDungeon->allPokemon[index]; if (EntityExists(entity)) { info = entity->info; - entity->sprite = sub_80687D0(info->apparentID); + entity->sprite = GetSpriteData(info->apparentID); sub_806CCB4(entity,sub_806CEBC(entity)); pos = entity->pos; AddPokemonDungeonSprite(info->unk98,info->apparentID,&pos,3); diff --git a/src/code_809447C.c b/src/code_809447C.c index 58d0e6cc6..090a080ff 100644 --- a/src/code_809447C.c +++ b/src/code_809447C.c @@ -15,7 +15,7 @@ struct unkStruct_8113080 u8 *text; }; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gAvailablePokemonNames[]; extern s32 gFormatData_202DE30[2]; @@ -61,7 +61,7 @@ static void sub_80944BC(s16 moveID, u8 *buffer) // Needed this cast/variable to match moveID_u16 = moveID_s32; sub_8092AA8(&move, moveID_u16); - sub_80928C0(gUnknown_202DE58, &move, NULL); + sub_80928C0(gFormatItems, &move, NULL); xxx_format_string(*gUnknown_811383C, buffer, buffer + 200, 0); // $m0's $i0 } else { strncpy(buffer, gUnknown_8113080[moveID - 0x1F4].text, 200); @@ -160,10 +160,10 @@ void sub_8094558(u32 param_1,u8 *param_2,unkDungeonGlobal_unk1CE98_sub *param_3) y += 0x10; item = &(param_3->heldItem); if ((param_3->heldItem.flags & ITEM_FLAG_EXISTS)) { - sub_8090E14(gUnknown_202DE58,item,0); + sub_8090E14(gFormatItems,item,0); } else { - strcpy(gUnknown_202DE58,*gUnknown_81139B8); + strcpy(gFormatItems,*gUnknown_81139B8); } PrintFormatStringOnWindow(4,y,*gUnknown_81139CC,param_1,0); sub_80073E0(param_1); diff --git a/src/code_80958E8.c b/src/code_80958E8.c index 960e0cd43..941bba263 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -808,7 +808,7 @@ bool8 sub_80961D8(void) gUnknown_203B490->unk328 = flag; } floor = 0x38; - if(sub_8001D08(0xA, 0x31, 0x1)) + if(ScriptVarScenarioEqual(0xA, 0x31, 0x1)) { if(!gUnknown_203B490->PKMNNewsReceived[0x35]) if(!sub_8096E80(0x35)) floor = 0x35; diff --git a/src/code_80972F4.c b/src/code_80972F4.c index ef7d202d7..4a86853df 100644 --- a/src/code_80972F4.c +++ b/src/code_80972F4.c @@ -10,16 +10,16 @@ ALIGNED(4) const u8 gDummyScenarioText[] = _("{COLOR_1 YELLOW_3}Scenario try dummy{END_COLOR_TEXT_1}"); ALIGNED(4) const u8 gBlankMission[] = _("{COLOR_1 RED_2}???{END_COLOR_TEXT_1}"); -extern void sub_800199C(u8, u8, u16, s32); -extern u32 sub_8001784(u32, u32, u16); +extern void SetScriptVarArrayValue(u8, u8, u16, s32); +extern u32 GetScriptVarArrayValue(u32, u32, u16); extern void GeneratePelipperJobs(void); -extern void sub_80018D8(u8, u8, u32); +extern void SetScriptVarValue(u8, u8, u32); void sub_80972F4(void) { - sub_80015C0(0, 0x2B); - sub_80015C0(0, 0x2C); - sub_80015C0(0, 0x2D); + ClearScriptVarArray(0, 0x2B); + ClearScriptVarArray(0, 0x2C); + ClearScriptVarArray(0, 0x2D); } void nullsub_128(void) @@ -36,7 +36,7 @@ s32 sub_8097318(s16 param_1) iVar1 = 0; } else { - iVar1 = sub_8001784(0,0x2b,param_1_s32); + iVar1 = GetScriptVarArrayValue(0,0x2b,param_1_s32); if (iVar1 != 0) { iVar1 = 1; } @@ -55,7 +55,7 @@ void sub_809733C(short param_1,u32 param_2) if (uVar2 != 0xd) { uVar2_u16 = uVar2; - if ((((sub_8001784(0,0x2c,uVar2_u16) == 0) && (sub_800199C(0,0x2b,uVar2_u16,param_2_u8), param_2_u8 != '\0')))){ + if ((((GetScriptVarArrayValue(0,0x2c,uVar2_u16) == 0) && (SetScriptVarArrayValue(0,0x2b,uVar2_u16,param_2_u8), param_2_u8 != '\0')))){ switch(uVar2) { case 0xE: @@ -76,7 +76,7 @@ bool32 sub_8097384(s16 param_1) val = FALSE; else { // May not need the & 0xFFFF if the 3rd param is s16 - val = sub_8001784(0, 44, param_1 & 0xFFFF); + val = GetScriptVarArrayValue(0, 44, param_1 & 0xFFFF); if (val != 0) val = TRUE; } @@ -93,16 +93,16 @@ void sub_80973A8(s16 param_1,u32 param_2) if (param_1_s32 != 0xd) { if (param_2_u32 != 0) { sVar1 = sub_80A26B8(param_1); - sub_800199C(0,0x2b,param_1_s32,0); + SetScriptVarArrayValue(0,0x2b,param_1_s32,0); if (sVar1 != -1) { - sub_80018D8(0,0x12,sVar1); + SetScriptVarValue(0,0x12,sVar1); } } - sub_800199C(0,0x2c,param_1_s32,param_2_u32); + SetScriptVarArrayValue(0,0x2c,param_1_s32,param_2_u32); } } -bool32 sub_80973F4(s16 param_1) +bool32 RescueScenarioConquered(s16 param_1) { bool32 val; @@ -110,7 +110,7 @@ bool32 sub_80973F4(s16 param_1) val = FALSE; else { // May not need the & 0xFFFF if the 3rd param is s16 - val = sub_8001784(0, 45, param_1 & 0xFFFF); + val = GetScriptVarArrayValue(0, 45, param_1 & 0xFFFF); if (val != 0) val = TRUE; } @@ -123,7 +123,7 @@ void sub_8097418(s16 index,bool32 param_2) int index_s32 = index; bool8 param_2_u8 = param_2; if (index_s32 != 0xd) { - if ((param_2_u8) && (sub_800199C(0,0x2c,index_s32,0), index_s32 < 0x1f)) { + if ((param_2_u8) && (SetScriptVarArrayValue(0,0x2c,index_s32,0), index_s32 < 0x1f)) { const MissionText *mt = &gStoryMissionText[index_s32]; if (mt->unk4 != 0xFF) { sub_8097FA8(mt->unk4); @@ -136,7 +136,7 @@ void sub_8097418(s16 index,bool32 param_2) } sub_8097FF8(); } - sub_800199C(0,0x2d,index_s32,param_2_u8); + SetScriptVarArrayValue(0,0x2d,index_s32,param_2_u8); } } @@ -179,8 +179,8 @@ const u8 *GetCurrentMissionText(s16 index) void sub_80974E8(void) { - sub_80015C0(0, 0x2E); - sub_80015C0(0, 0x2F); + ClearScriptVarArray(0, 0x2E); + ClearScriptVarArray(0, 0x2F); } void nullsub_208(void) diff --git a/src/code_8097504.c b/src/code_8097504.c index 2c4256629..4395a09e8 100644 --- a/src/code_8097504.c +++ b/src/code_8097504.c @@ -9,9 +9,9 @@ ALIGNED(4) const char gMeetNinetalesText[] = "Meet Ninetales."; ALIGNED(4) const char gAvoidCaptureText[] = "Avoid capture."; ALIGNED(4) const char gFinalScenarioText[] = _("Defeat the final Pokémon."); -extern void sub_800199C(u8, u8, u16, s32); -extern u32 sub_8001784(u32, u32, u16); -extern void sub_80018D8(u8, u8, u32); +extern void SetScriptVarArrayValue(u8, u8, u16, s32); +extern u32 GetScriptVarArrayValue(u32, u32, u16); +extern void SetScriptVarValue(u8, u8, u32); bool8 sub_8097504(s16 mazeIndex) { @@ -77,7 +77,7 @@ bool32 IsMazeCompleted(s16 mazeIndex) { bool32 mazeCompletion; - mazeCompletion = sub_8001784(0, 0x2e, mazeIndex); + mazeCompletion = GetScriptVarArrayValue(0, 0x2e, mazeIndex); if (mazeCompletion) { mazeCompletion = TRUE; } @@ -87,7 +87,7 @@ bool32 IsMazeCompleted(s16 mazeIndex) void sub_80975A8(s16 param_1,u8 param_2) { u16 param_1_u16 = param_1; - sub_800199C(0,0x2e,param_1_u16,param_2); + SetScriptVarArrayValue(0,0x2e,param_1_u16,param_2); } const u8 *sub_80975C4(s16 index) @@ -100,7 +100,7 @@ const u8 *sub_80975DC(u32 r0) // TODO: slight hack but matches r0 <<= 16; if((0xffe90000 + r0) >> 16 < 2) - if(sub_8001D08(0x3, 0xE, -1)) + if(ScriptVarScenarioEqual(0x3, 0xE, -1)) return gMeetNinetalesText; else return gAvoidCaptureText; @@ -121,9 +121,9 @@ bool8 HasCompletedAllMazes(void) bool8 sub_8097640(void) { - if(sub_8001784(0, 0x2E, 0x1F) == 0 && HasCompletedAllMazes()) + if(GetScriptVarArrayValue(0, 0x2E, 0x1F) == 0 && HasCompletedAllMazes()) { - sub_800199C(0, 0x2E, 0x1F, 1); + SetScriptVarArrayValue(0, 0x2E, 0x1F, 1); return TRUE; } else diff --git a/src/code_809A560.c b/src/code_809A560.c index 2f888f47a..7e6e04c2f 100644 --- a/src/code_809A560.c +++ b/src/code_809A560.c @@ -11,15 +11,15 @@ extern u8 gInvalidityText[]; extern u8 gAvailablePokemonNames[]; extern u8 gPlayerName[]; -extern u8 sub_809B2B8(u32 *, u32, u32, u32); -extern u32 sub_809B40C(u32 *); +extern u8 ScriptPrintText_809B2B8(u32 *, u32, u32, u32); +extern u32 IsTextboxOpen_809B40C(u32 *); extern void sub_801416C(s32, s32); extern void sub_80095CC(u32, u32); extern void sub_8009408(u32, u32); -extern void sub_809B294(void); +extern void ResetTextbox_809B294(void); extern void sub_8014144(void); -u32 sub_809A680(u32 param_1, u32 param_2); +u32 xxx_script_textboxes_809A680(u32 param_1, u32 param_2); void sub_809A62C(void); void sub_809A7EC(void); void sub_809A83C(s16 index); @@ -35,9 +35,9 @@ void sub_809A560(void) gUnknown_20399DC = 0; gUnknown_20399DE = 0; sub_80095CC(0,0x14); - sub_800641C(0,1,1); + xxx_call_save_unk_text_struct_800641C(0,1,1); sub_8009408(0,0x14); - sub_809B294(); + ResetTextbox_809B294(); gUnknown_3001B64->unk414 = 0; gUnknown_3001B64->unk418 = 0; gUnknown_3001B64->unk41C = 0; @@ -72,31 +72,31 @@ void sub_809A62C(void) sub_809A83C(index); } gUnknown_3001B64->unk414 = 0; - sub_809A680(0, 1); + xxx_script_textboxes_809A680(0, 1); } -u32 sub_809A680(u32 param_1, u32 param_2) +u32 xxx_script_textboxes_809A680(u32 param_1, u32 param_2) { switch(param_1) { case 0: - sub_809B294(); - sub_800641C(0,1,1); + ResetTextbox_809B294(); + xxx_call_save_unk_text_struct_800641C(0,1,1); break; case 1: - sub_809B294(); + ResetTextbox_809B294(); break; case 2: - sub_809B294(); + ResetTextbox_809B294(); break; case 3: - sub_809B294(); + ResetTextbox_809B294(); break; case 4: - sub_809B294(); + ResetTextbox_809B294(); break; default: - sub_809B294(); - sub_800641C(0,1,1); + ResetTextbox_809B294(); + xxx_call_save_unk_text_struct_800641C(0,1,1); } gUnknown_3001B64->unk0 = param_1; return 1; @@ -133,9 +133,9 @@ void sub_809A738(s32 param_1, s32 param_2) sub_801416C(param_1, param_2); } -u8 sub_809A750(void) +u8 IsTextboxOpen_809A750(void) { - return sub_809B40C(&gUnknown_3001B64->unkC); + return IsTextboxOpen_809B40C(&gUnknown_3001B64->unkC); } u32 sub_809A768(void) @@ -148,12 +148,12 @@ u8 ScriptPrintNullTextbox(void) switch(gUnknown_3001B64->unk0) { case 3: - return sub_809B2B8(&gUnknown_3001B64->unkC,4,-1,0); + return ScriptPrintText_809B2B8(&gUnknown_3001B64->unkC,4,-1,0); case 1: case 2: - return sub_809B2B8(&gUnknown_3001B64->unkC,0x84,-1,0); + return ScriptPrintText_809B2B8(&gUnknown_3001B64->unkC,0x84,-1,0); default: - sub_809A680(0, 1); + xxx_script_textboxes_809A680(0, 1); return 0; } } @@ -165,9 +165,9 @@ u8 ScriptPrintEmptyTextbox(void) case 3: case 1: case 2: - return sub_809B2B8(&gUnknown_3001B64->unkC,4,-1,0); + return ScriptPrintText_809B2B8(&gUnknown_3001B64->unkC,4,-1,0); default: - sub_809A680(0, 1); + xxx_script_textboxes_809A680(0, 1); return 0; } } diff --git a/src/code_809A560_1.c b/src/code_809A560_1.c index b1f25b8a8..64983c394 100644 --- a/src/code_809A560_1.c +++ b/src/code_809A560_1.c @@ -75,7 +75,7 @@ void sub_809C478(void) sub_8035758(); - sub_8001B88(3, &temp, &temp1); + GetScriptVarScenario(3, &temp, &temp1); sub_80993C0(0); } @@ -154,15 +154,15 @@ void sub_809C550(void) switch(ret) { case 1: - if(sub_8001CC4(4, 0x1D, 0x3)) + if(ScriptVarScenarioBefore(4, 0x1D, 0x3)) val = 1; break; case 2: - if(sub_8001CC4(4, 0x1F, 0x2)) + if(ScriptVarScenarioBefore(4, 0x1F, 0x2)) val = 2; break; case 3: - if(sub_8001CC4(0xB, 0x33, 0x8)) + if(ScriptVarScenarioBefore(0xB, 0x33, 0x8)) val = 3; break; } diff --git a/src/code_809C5C4.c b/src/code_809C5C4.c index f7909d54c..cb9792c6d 100644 --- a/src/code_809C5C4.c +++ b/src/code_809C5C4.c @@ -51,8 +51,8 @@ void nullsub_116(); // Event_flag.h u8 sub_8002658(s16); -s16 sub_8001658(u32, u32); -extern void sub_80015C0(u32, u32); +s16 GetScriptVarValue(u32, u32); +extern void ClearScriptVarArray(u32, u32); void sub_809C5C4(void) { @@ -276,7 +276,7 @@ void sub_809C770(s16 param_1, s16 param_2) break; case 0: default: - iVar5 = sub_8001658(0,0x13); + iVar5 = GetScriptVarValue(0,0x13); break; } @@ -417,11 +417,11 @@ void sub_809CB74(void) { void sub_809CB8C(void) { - sub_80015C0(0, 0x3B); - sub_80015C0(0, 0x3D); + ClearScriptVarArray(0, 0x3B); + ClearScriptVarArray(0, 0x3D); } -bool8 sub_809CBA4(u8 item) +bool8 HasItemInInventory(u8 item) { if(FindItemInInventory(item) >= 0) return TRUE; diff --git a/src/code_809D148.c b/src/code_809D148.c index 57f7f0788..40766ab76 100644 --- a/src/code_809D148.c +++ b/src/code_809D148.c @@ -104,13 +104,13 @@ void nullsub_119(void) { } -extern const struct unkStruct_809D158 gUnknown_8116478; +extern const struct unkStruct_809D158 gZeroPos_8116478; void sub_809D0BC(void) { - gUnknown_20399E8.unk3C = gUnknown_8116478; + gUnknown_20399E8.unk3C = gZeroPos_8116478; gUnknown_20399E8.unk44 = 0; - sub_809D158(0, &gUnknown_8116478); + sub_809D158(0, &gZeroPos_8116478); gUnknown_20399E8.unk8 = 0; gUnknown_20399E8.unkC = 0; gUnknown_20399E8.unk10 = 0; @@ -389,10 +389,10 @@ void sub_809D490(void) extern s16 gCurrentMap; extern s16 gUnknown_2039A32; extern s16 gUnknown_2039A34; -extern u8 gUnknown_2039A36; -extern u8 gUnknown_2039A38[]; -extern u8 gUnknown_2039AC0[]; -extern u32 gUnknown_2039B48[]; +extern u8 gAnyScriptLocked; +extern u8 gScriptLocks[]; +extern u8 gScriptLockConds[]; +extern u32 gUnlockBranchLabels[]; void sub_809D4B0(void) { @@ -401,11 +401,11 @@ void sub_809D4B0(void) gCurrentMap = -1; gUnknown_2039A32 = -1; gUnknown_2039A34 = -1; - gUnknown_2039A36 = 0; + gAnyScriptLocked = 0; for (i = 0; i < 0x81; i++) { - gUnknown_2039A38[i] = 0; - gUnknown_2039AC0[i] = 0; - gUnknown_2039B48[i] = 0; + gScriptLocks[i] = 0; + gScriptLockConds[i] = 0; + gUnlockBranchLabels[i] = 0; } } diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c index 845da9f3c..d25431df4 100644 --- a/src/code_80A26CC.c +++ b/src/code_80A26CC.c @@ -12,7 +12,7 @@ extern const u8 *gUnknown_8117000[]; // code_80972F4.h (read comment) extern bool8 sub_8097384(s16); -extern bool8 sub_80973F4(s16); +extern bool8 RescueScenarioConquered(s16); // code_8098BDC.s extern void sub_809AB4C(s32, s32); @@ -74,11 +74,11 @@ u32 sub_80A25AC(u16 param_1) return 19; if (param_1 != 1) return param_1; - sub_8001658(0, 40); + GetScriptVarValue(0, 40); return 1; } -const DungeonInfo *sub_80A2608(s16 index) +const DungeonInfo *GetDungeonInfo_80A2608(s16 index) { return &gUnknown_81168A8[index]; } @@ -99,7 +99,7 @@ s16 sub_80A2654(s16 index) { const DungeonInfo *temp; - temp = sub_80A2608(index); + temp = GetDungeonInfo_80A2608(index); return temp->unkE; } @@ -153,7 +153,7 @@ UNUSED static s16 sub_80A26D8(u8 index) for (i = 0; i < 83; i++) { counter2 = i; - temp = sub_80A2608(counter2); + temp = GetDungeonInfo_80A2608(counter2); if (temp->unk11 != 0) { if (temp->dungeonIndex == index) @@ -169,7 +169,7 @@ u8 sub_80A270C(s16 index) s32 index_s32; index_s32 = index; // forcing a shift before addressing - temp = sub_80A2608(gUnknown_8116F9A[index_s32]); + temp = GetDungeonInfo_80A2608(gUnknown_8116F9A[index_s32]); return temp->dungeonIndex; } @@ -178,7 +178,7 @@ u8 sub_80A2728(s16 index) const DungeonInfo *temp; s16 temp_number = 55 + index; - temp = sub_80A2608(temp_number); + temp = GetDungeonInfo_80A2608(temp_number); return temp->dungeonIndex; } @@ -186,7 +186,7 @@ u8 sub_80A2740(s32 index) { const DungeonInfo *temp; - temp = sub_80A2608(index); + temp = GetDungeonInfo_80A2608(index); return temp->dungeonIndex; } @@ -211,12 +211,12 @@ s16 sub_80A2750(s16 r0) if ((u16)(r0 - 55) <= 24) return 4; - temp = sub_80A2608(temp_2); + temp = GetDungeonInfo_80A2608(temp_2); if (temp->unkE == -1) return 1; if (sub_80023E4(5)) return 1; - if (!sub_80973F4(temp->unkE)) + if (!RescueScenarioConquered(temp->unkE)) return 1; if (!sub_80023E4(1)) return 1; @@ -242,7 +242,7 @@ bool8 sub_80A27CC(s16 r0) return TRUE; if (!sub_80023E4(1)) return FALSE; - if (!sub_80973F4(temp)) + if (!RescueScenarioConquered(temp)) return FALSE; return TRUE; } @@ -263,7 +263,7 @@ bool8 sub_80A2824(u8 index) if (temp->dungeonIndex == index) { if (sub_8097384(i)) return TRUE; - if (sub_80973F4(i)) + if (RescueScenarioConquered(i)) return TRUE; } } @@ -290,7 +290,7 @@ UNUSED static bool8 sub_80A28B4(s16 r0) temp = sub_80A2620(r0); if (temp->unk0 != -1) { - if (!sub_8097384(r0) && !sub_80973F4(r0)) + if (!sub_8097384(r0) && !RescueScenarioConquered(r0)) return FALSE; else return TRUE; @@ -311,7 +311,7 @@ bool8 sub_80A28F0(u8 index) if (temp->dungeonIndex == index) { if (sub_8097384(counter)) return TRUE; - if (sub_80973F4(counter)) + if (RescueScenarioConquered(counter)) return TRUE; } } @@ -386,7 +386,7 @@ s32 sub_80A29B0(u8 *param_1) for (index = 0; index < 46; index++) { iVar3 = sub_80A2620(index); - if (iVar3->unk11 != 0 && sub_80973F4(index)) + if (iVar3->unk11 != 0 && RescueScenarioConquered(index)) local_68[iVar3->dungeonIndex] = 1; } } @@ -428,7 +428,7 @@ UNUSED static s32 sub_80A2A5C(u8 *param_1) for (index = 0; index < 46; index++) { iVar3 = sub_80A2620(index); - if (iVar3->unk11 != 0 && (sub_8097384(index) || sub_80973F4(index))) + if (iVar3->unk11 != 0 && (sub_8097384(index) || RescueScenarioConquered(index))) local_58[iVar3->dungeonIndex] = 1; } } @@ -460,5 +460,5 @@ const u8 *sub_80A2B18(s16 param_1) UNUSED static const u8 *sub_80A2B28(u16 r0) { - return sub_80A2B18(sub_8001658(0, 17)); + return sub_80A2B18(GetScriptVarValue(0, 17)); } diff --git a/src/code_80A7714.c b/src/code_80A7714.c index 26bd4e14a..6430d6339 100644 --- a/src/code_80A7714.c +++ b/src/code_80A7714.c @@ -4,11 +4,11 @@ extern void sub_80A68A0(u32); extern void sub_80A7094(struct axPokemon *, u32, u32, u32); extern void sub_80A7310(struct axPokemon *, u32, u32, u32); -extern void sub_80A7784(); +extern void ResetCurrentScriptFile(); static EWRAM_DATA s16 sUnknown_2039DE0 = {0}; -extern const u32 gUnknown_8117EFC; +extern const u32 gNullGroundScript; extern const u32 *gMapScriptTable[]; // 811E2F8 void sub_80A7714(u32 a0) @@ -32,23 +32,23 @@ void sub_80A7754(void) sUnknown_2039DE0 = -1; } -void sub_80A7764(s16 a0) +void SetCurrentScriptFile(s16 a0) { s32 temp = a0; - sub_80A7784(); + ResetCurrentScriptFile(); if (temp != -1) sUnknown_2039DE0 = temp; } -void sub_80A7784(void) +void ResetCurrentScriptFile(void) { if (sUnknown_2039DE0 != -1) sUnknown_2039DE0 = -1; } -bool8 sub_80A77A0(s16 a0) +bool8 ChangeScriptFile(s16 a0) { s32 temp; s32 temp2; @@ -56,19 +56,19 @@ bool8 sub_80A77A0(s16 a0) temp2 = temp; if (sUnknown_2039DE0 != temp) { if (temp < 0) - sub_80A7784(); + ResetCurrentScriptFile(); else - sub_80A7764(temp2); + SetCurrentScriptFile(temp2); return TRUE; } return FALSE; } // TODO review this later -const u32 *sub_80A77D0(s16 a0) +const u32 *GetGroundScript(s16 a0) { if (a0 != -1) return gMapScriptTable[a0]; else - return &gUnknown_8117EFC; + return &gNullGroundScript; } diff --git a/src/credits1.c b/src/credits1.c index 80122ee5c..c4bd18fa3 100644 --- a/src/credits1.c +++ b/src/credits1.c @@ -36,7 +36,7 @@ bool8 DrawCredits(s32 creditsCategoryIndex, s32 param_2) sCredits1Work->unk0[0] = gUnknown_80E4A28; ResetUnusedInputStruct(); - sub_800641C(&sCredits1Work->unk0[0], TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(&sCredits1Work->unk0[0], TRUE, TRUE); sub_8099690(2); sub_80073B8(0); @@ -119,7 +119,7 @@ s32 sub_8035574(void) case 3: if (!sub_8099B94()) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sCredits1Work->unk60 = 4; } break; diff --git a/src/credits2.c b/src/credits2.c index 17ebcfb16..4e288e655 100644 --- a/src/credits2.c +++ b/src/credits2.c @@ -14,7 +14,7 @@ bool8 sub_8035678(void) sCredits2Work = MemoryAlloc(sizeof(Credits2Work), 8); sCredits2Work->state = 0; sCredits2Work->unk4 = 0; - sub_80015C0(0, 57); + ClearScriptVarArray(0, 57); return TRUE; } @@ -62,7 +62,7 @@ u32 sub_80356A0(void) return 3; // sub_809C478 clears the flash data when this is returned } - if (sub_8001658(0, 57) != 0) { + if (GetScriptVarValue(0, 57) != 0) { sCredits2Work->state = 3; return 2; } diff --git a/src/debug_menu1.c b/src/debug_menu1.c index d9e813d84..04de91a30 100644 --- a/src/debug_menu1.c +++ b/src/debug_menu1.c @@ -49,14 +49,14 @@ void CreateDebugMenu(void) sDebugMenu->unk140[i] = sUnknown_80E7D40; ResetUnusedInputStruct(); - sub_800641C(sDebugMenu->unk140, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sDebugMenu->unk140, TRUE, TRUE); SetDebugMenuItems(); } void DeleteDebugMenu(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); if (sDebugMenu != NULL) { MemoryFree(sDebugMenu); sDebugMenu = NULL; diff --git a/src/debug_menu2.c b/src/debug_menu2.c index 1416626ab..f80d476fd 100644 --- a/src/debug_menu2.c +++ b/src/debug_menu2.c @@ -34,7 +34,7 @@ static void sub_803A86C(void); UNUSED static bool8 sub_803A45C(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B3F0 = MemoryAlloc(sizeof(unkStruct_203B3F0), 8); sub_803A504(0); return TRUE; @@ -81,7 +81,7 @@ static void sub_803A51C(void) { s32 i; - sub_8006518(sUnknown_203B3F0->unkD8); + RestoreUnkTextStruct_8006518(sUnknown_203B3F0->unkD8); switch (sUnknown_203B3F0->state) { case 3: @@ -97,7 +97,7 @@ static void sub_803A51C(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B3F0->unkD8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B3F0->unkD8, TRUE, TRUE); } static void sub_803A5A0(void) @@ -139,7 +139,7 @@ static void sub_803A5A0(void) static void sub_803A690(void) { - sub_8008C54(sUnknown_203B3F0->unk9C.unk14); + CallPrepareTextbox_8008C54(sUnknown_203B3F0->unk9C.unk14); sub_80073B8(sUnknown_203B3F0->unk9C.unk14); PrintStringOnWindow(4, 0, sNumberPrompt, sUnknown_203B3F0->unk9C.unk14, 0); sub_8013C68(&sUnknown_203B3F0->unk9C); diff --git a/src/debug_menu3.c b/src/debug_menu3.c index eed12b882..503463c72 100644 --- a/src/debug_menu3.c +++ b/src/debug_menu3.c @@ -36,7 +36,7 @@ static bool8 sub_803ABC8(void); UNUSED static bool8 sub_803A888(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B3F4 = MemoryAlloc(sizeof(unkStruct_203B3F4), 8); sub_803A924(0); return TRUE; @@ -80,7 +80,7 @@ static void sub_803A93C(void) { s32 i; - sub_8006518(sUnknown_203B3F4->unk9C); + RestoreUnkTextStruct_8006518(sUnknown_203B3F4->unk9C); if (sUnknown_203B3F4->state == 2) sUnknown_203B3F4->unk9C[2] = sUnknown_80E7EA4; @@ -90,7 +90,7 @@ static void sub_803A93C(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B3F4->unk9C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B3F4->unk9C, TRUE, TRUE); } static void sub_803A9AC(void) diff --git a/src/debug_menu4.c b/src/debug_menu4.c index 59a4f3a31..f6bd80b13 100644 --- a/src/debug_menu4.c +++ b/src/debug_menu4.c @@ -83,7 +83,7 @@ static void sub_803ACE8(void) { s32 i; - sub_8006518(sUnknown_203B3F8->unkE0); + RestoreUnkTextStruct_8006518(sUnknown_203B3F8->unkE0); switch (sUnknown_203B3F8->state) { case 3: @@ -101,7 +101,7 @@ static void sub_803ACE8(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B3F8->unkE0, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B3F8->unkE0, TRUE, TRUE); } static void sub_803AD88(void) @@ -142,7 +142,7 @@ static void sub_803AD88(void) static void sub_803AE58(void) { - sub_8008C54(sUnknown_203B3F8->unk60.unk14); + CallPrepareTextbox_8008C54(sUnknown_203B3F8->unk60.unk14); sub_80073B8(sUnknown_203B3F8->unk60.unk14); PrintStringOnWindow(4, 0, sNumberPrompt, sUnknown_203B3F8->unk60.unk14, 0); sub_8013C68(&sUnknown_203B3F8->unk60); diff --git a/src/ds_menus.c b/src/ds_menus.c index f41be8597..d1d73243d 100644 --- a/src/ds_menus.c +++ b/src/ds_menus.c @@ -29,5 +29,5 @@ u32 UpdateWirelessCommsMenu(void) void CleanWirelessCommsMenu(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); } diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c index 441951a6f..d7eefec8c 100644 --- a/src/dungeon_ai_attack.c +++ b/src/dungeon_ai_attack.c @@ -39,13 +39,13 @@ const s16 gRegularAttackWeights[] = {100, 20, 30, 40, 50}; -extern const u8 *const gUnknown_80FE3E8[]; +extern const u8 *const gItemStickyDoesntWorkText[]; extern const u8 *const gPtrMysteriousPowerPreventedUseMessage[]; extern const u8 *const gUnknown_80FC6A8[]; extern const u8 *const gUnknown_80FC714[]; extern const u8 *const gUnknown_80FC718[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gAvailablePokemonNames[]; EWRAM_DATA bool8 gCanAttackInDirection[NUM_DIRECTIONS] = {0}; @@ -994,8 +994,8 @@ void HandleUseOrbAction(Entity *pokemon) IVar5 = *item; if (item->flags & ITEM_FLAG_STICKY) { - sub_8045BF8(gUnknown_202DE58, item); - SendMessage(pokemon, *gUnknown_80FE3E8); + sub_8045BF8(gFormatItems, item); + SendMessage(pokemon, *gItemStickyDoesntWorkText); return; } diff --git a/src/dungeon_random.c b/src/dungeon_random.c index 0705828f3..bb77e3e8f 100644 --- a/src/dungeon_random.c +++ b/src/dungeon_random.c @@ -9,7 +9,7 @@ void sub_808408C(u32 param_1) gUnknown_203B458 = (1 | param_1) & 0xffffff; } -u32 sub_80840A4(void) +u32 YetAnotherRandom24(void) { u32 r0; u32 r1; diff --git a/src/event_flag.c b/src/event_flag.c index 11734ce91..3528f0b1b 100644 --- a/src/event_flag.c +++ b/src/event_flag.c @@ -14,7 +14,7 @@ #include "pokemon.h" #include "pokemon_3.h" -extern u8 gUnknown_2000A88[0x400]; +extern u8 gScriptVarBuffer[0x400]; struct unkEventStruct { @@ -45,35 +45,35 @@ extern u8 gUnknown_80B7388[]; void FatalError(DebugLocation *, const char *, ...) __attribute__((noreturn)); extern bool8 HasCompletedAllMazes(void); -extern void sub_800160C(struct UnkEventStruct *r0, u32 r1, u32 r2); +extern void GetScriptVarRef(struct UnkEventStruct *r0, u32 r1, u32 r2); extern u8 sub_8002658(s16); -extern void sub_80018D8(u32, u32, u32); +extern void SetScriptVarValue(u32, u32, u32); extern void sub_809733C(u32, u32); extern void sub_80973A8(u32, u32); -extern void sub_800199C(u32, s32, u32, s32); -extern s32 sub_8001784(u32, s32, u16); +extern void SetScriptVarArrayValue(u32, s32, u32, s32); +extern s32 GetScriptVarArrayValue(u32, s32, u16); // code_80972F4.h (read comment) -extern bool8 sub_80973F4(s16); +extern bool8 RescueScenarioConquered(s16); -u8 *sub_8001A74(s16 param_1) +u8 *GetScriptVarPointer(s16 param_1) { struct UnkEventStruct local_1c; - sub_800160C(&local_1c,0,param_1); + GetScriptVarRef(&local_1c,0,param_1); return local_1c.unk4; } -s16 sub_8001A90(s16 param_1) +s16 GetScriptVarArrayLength(s16 param_1) { struct UnkEventStruct local_1c; - sub_800160C(&local_1c,0,param_1); + GetScriptVarRef(&local_1c,0,param_1); return local_1c.unk0[4]; } -s32 sub_8001AB0(s32 param_1, s16 param_2) +s32 GetScriptVarArraySum(s32 param_1, s16 param_2) { s32 counter; s32 total; @@ -83,22 +83,22 @@ s32 sub_8001AB0(s32 param_1, s16 param_2) param_2_s32 = param_2; total = 0; - sub_800160C(&local_1c, 0, param_2_s32); + GetScriptVarRef(&local_1c, 0, param_2_s32); for(counter = 0; counter < local_1c.unk0[4]; counter++) { - total += sub_8001784(param_1, param_2_s32, counter); + total += GetScriptVarArrayValue(param_1, param_2_s32, counter); } return total; } -void sub_8001AF8(s16 param_1, u8 *param_2, s32 param_3) +void GetScriptVarString(s16 param_1, u8 *param_2, s32 param_3) { u8 *r1; s32 r2; u8 r0; struct UnkEventStruct local_10; - sub_800160C(&local_10,0,param_1); + GetScriptVarRef(&local_10,0,param_1); for (r1 = local_10.unk4, r2 = 0; r2 < param_3; r2++) { r0 = *r1; if (*r1++ == 0) break; @@ -108,14 +108,14 @@ void sub_8001AF8(s16 param_1, u8 *param_2, s32 param_3) *param_2 = 0; } -void sub_8001B34(s16 param_1,u32 param_2,s32 param_3) +void ScriptVarStringPopFirstChar(s16 param_1,u32 param_2,s32 param_3) { u8 *r1; s32 r2; u8 r0; struct UnkEventStruct local_10; - sub_800160C(&local_10,0,param_1); + GetScriptVarRef(&local_10,0,param_1); for (r1 = local_10.unk4, r2 = 0; r2 < param_3; r1++, r2++) { r0 = *r1; if (*r1++ == 0) break; @@ -129,10 +129,10 @@ void sub_8001B34(s16 param_1,u32 param_2,s32 param_3) } } -void sub_8001B88(s32 param_1,u32 *param_2,u32 *param_3) +void GetScriptVarScenario(s32 param_1,u32 *param_2,u32 *param_3) { - *param_2 = sub_8001784(0, (s16)param_1, 0); - *param_3 = sub_8001784(0, (s16)param_1, 1); + *param_2 = GetScriptVarArrayValue(0, (s16)param_1, 0); + *param_3 = GetScriptVarArrayValue(0, (s16)param_1, 1); } void ScenarioCalc(s16 param_1,s32 param_2,s32 param_3) @@ -142,52 +142,52 @@ void ScenarioCalc(s16 param_1,s32 param_2,s32 param_3) u32 local_14; param_1_s32 = param_1; - sub_8001B88(param_1_s32,&local_18,&local_14); + GetScriptVarScenario(param_1_s32,&local_18,&local_14); Log(6,gUnknown_80B72CC,param_1_s32,local_18,local_14,param_2,param_3); // SCENARIO CALC [%3d] %4d %4d -> %4d %4d if ((param_1_s32 == 3) && ((param_2 != local_18 || (param_3 != local_14)))) { - sub_80018D8(0,0x19,0); + SetScriptVarValue(0,0x19,0); } - sub_800199C(0,param_1_s32,0,param_2); - sub_800199C(0,param_1_s32,1,param_3); + SetScriptVarArrayValue(0,param_1_s32,0,param_2); + SetScriptVarArrayValue(0,param_1_s32,1,param_3); switch(param_1_s32) { case 3: if (((u32)(param_2 - 1) < 0x1b)) { - if (sub_8001D44(3,8,-1)) { + if (ScriptVarScenarioAfter(3,8,-1)) { sub_80976F8(0); } - if (sub_8001D44(3,0xb,3)) { + if (ScriptVarScenarioAfter(3,0xb,3)) { sub_80976F8(1); } - if (sub_8001D44(3,0x11,0)) { + if (ScriptVarScenarioAfter(3,0x11,0)) { sub_80976F8(2); } } break; case 4: - if (sub_8001CC4(4,0x1f,0) == 0) { + if (ScriptVarScenarioBefore(4,0x1f,0) == 0) { sub_80976F8(4); } - if (sub_8001CC4(4,0x20,0) == 0) { + if (ScriptVarScenarioBefore(4,0x20,0) == 0) { sub_80976F8(5); } break; case 0xC: - if(sub_8001CC4(0xc,0x37,2) == 0) { + if(ScriptVarScenarioBefore(0xc,0x37,2) == 0) { sub_80976F8(3); } break; } } -bool8 sub_8001CC4(s16 param_1,u32 param_2,s32 param_3) +bool8 ScriptVarScenarioBefore(s16 param_1,u32 param_2,s32 param_3) { s32 uVar1; s32 iVar2; - uVar1 = sub_8001784(0,param_1,0); - iVar2 = sub_8001784(0,param_1,1); + uVar1 = GetScriptVarArrayValue(0,param_1,0); + iVar2 = GetScriptVarArrayValue(0,param_1,1); if ((uVar1 != 0x3a) && (uVar1 < param_2 || (param_3 >= 0 && (uVar1 == param_2) && (iVar2 < param_3)))) { return TRUE; @@ -197,13 +197,13 @@ bool8 sub_8001CC4(s16 param_1,u32 param_2,s32 param_3) } } -bool8 sub_8001D08(s16 param_1,u32 param_2,s32 param_3) +bool8 ScriptVarScenarioEqual(s16 param_1,u32 param_2,s32 param_3) { s32 uVar1; s32 iVar2; - uVar1 = sub_8001784(0, param_1, 0); - iVar2 = sub_8001784(0, param_1, 1); + uVar1 = GetScriptVarArrayValue(0, param_1, 0); + iVar2 = GetScriptVarArrayValue(0, param_1, 1); if (((uVar1 == param_2 && (((param_3 < 0) || (iVar2 == param_3)))))) { return TRUE; } @@ -212,13 +212,13 @@ bool8 sub_8001D08(s16 param_1,u32 param_2,s32 param_3) } } -bool8 sub_8001D44(s16 param_1,u32 param_2,s32 param_3) +bool8 ScriptVarScenarioAfter(s16 param_1,u32 param_2,s32 param_3) { s32 uVar1; s32 iVar2; - uVar1 = sub_8001784(0, param_1, 0); - iVar2 = sub_8001784(0, param_1, 1); + uVar1 = GetScriptVarArrayValue(0, param_1, 0); + iVar2 = GetScriptVarArrayValue(0, param_1, 1); if ((uVar1 != 0x3a) && ((uVar1 > param_2 || (((param_3 >= 0 && (uVar1 == param_2)) && (iVar2 > param_3)))))) { return TRUE; @@ -233,28 +233,28 @@ void sub_8001D88(void) u32 local_c; u32 auStack8; - sub_8001B88(3, &auStack8, &local_c); + GetScriptVarScenario(3, &auStack8, &local_c); if (auStack8 - 1 < 0x1b) { - if (sub_8001CC4(4,0x1f,0) != 0) { - if (sub_8001D44(3,0xf,7) != 0) { + if (ScriptVarScenarioBefore(4,0x1f,0) != 0) { + if (ScriptVarScenarioAfter(3,0xf,7) != 0) { ScenarioCalc(4,0x1f,0); sub_8097418(0xe,1); - sub_80018D8(0,0x28,2); + SetScriptVarValue(0,0x28,2); } else { - if ((sub_8001D08(4,0,0)) && (sub_8001D44(3,0xf,3))) { + if ((ScriptVarScenarioEqual(4,0,0)) && (ScriptVarScenarioAfter(3,0xf,3))) { ScenarioCalc(4,0x1d,1); } } } - if ((sub_8001D08(4,0x1f,0)) && (GetFriendAreaStatus(SKY_BLUE_PLAINS))) { + if ((ScriptVarScenarioEqual(4,0x1f,0)) && (GetFriendAreaStatus(SKY_BLUE_PLAINS))) { ScenarioCalc(4,0x1f,1); sub_809733C(0xf,1); } if (auStack8 > 0x11) { sub_80973A8(0x25,1); if (((FindItemInInventory(ITEM_HM_DIVE) != -1) || (gTeamInventoryRef->teamStorage[ITEM_HM_DIVE] != 0)) || - (sub_8001D44(5,0x21,3) != 0)) { + (ScriptVarScenarioAfter(5,0x21,3) != 0)) { sub_80973A8(0x22,1); } if (GetFriendAreaStatus(FURNACE_DESERT) != 0) { @@ -276,22 +276,22 @@ void sub_8001D88(void) if ((GetFriendAreaStatus(AGED_CHAMBER_AN)) && (GetFriendAreaStatus(AGED_CHAMBER_O_EXCLAIM))) { sub_80973A8(0x26,1); } - if (sub_8001D08(5,0,0)) { + if (ScriptVarScenarioEqual(5,0,0)) { ScenarioCalc(5,0x21,1); } if ((FindItemInInventory(ITEM_HM_SURF) != -1) || (gTeamInventoryRef->teamStorage[ITEM_HM_SURF] != 0)) { - if (sub_8001D08(7,0,0)) { + if (ScriptVarScenarioEqual(7,0,0)) { ScenarioCalc(7,0x26,1); } - if ((sub_8001D08(9,0,0)) && (GetFriendAreaStatus(SOUTHERN_ISLAND))) { + if ((ScriptVarScenarioEqual(9,0,0)) && (GetFriendAreaStatus(SOUTHERN_ISLAND))) { ScenarioCalc(9,0x2e,1); } } - if (!sub_8001CC4(9,0x30,0)) { - if ((sub_8001D08(5,0x22,0)) && HasRecruitedMon(MONSTER_ARTICUNO) && HasRecruitedMon(MONSTER_ZAPDOS) && HasRecruitedMon(MONSTER_MOLTRES)) { + if (!ScriptVarScenarioBefore(9,0x30,0)) { + if ((ScriptVarScenarioEqual(5,0x22,0)) && HasRecruitedMon(MONSTER_ARTICUNO) && HasRecruitedMon(MONSTER_ZAPDOS) && HasRecruitedMon(MONSTER_MOLTRES)) { ScenarioCalc(5,0x22,1); } - if (((sub_8001D08(0xb,0,0)) && (sub_8001D44(5,0x21,3) != 0)) && + if (((ScriptVarScenarioEqual(0xb,0,0)) && (ScriptVarScenarioAfter(5,0x21,3) != 0)) && (GetFriendAreaStatus(SKY_BLUE_PLAINS))) { ScenarioCalc(0xb,0x33,1); } @@ -302,19 +302,19 @@ void sub_8001D88(void) sub_80973A8(0x29,1); } } - if (!sub_8001CC4(5,0x22,0)) { - if (sub_8001D08(10,0,0)) { + if (!ScriptVarScenarioBefore(5,0x22,0)) { + if (ScriptVarScenarioEqual(10,0,0)) { ScenarioCalc(10,0x31,1); sub_809733C(0x1b,1); } - if ((sub_8001D08(0xc,0,0)) && (!sub_8001CC4(0xb,0x34,0))) { + if ((ScriptVarScenarioEqual(0xc,0,0)) && (!ScriptVarScenarioBefore(0xb,0x34,0))) { ScenarioCalc(0xc,0x35,1); } } - if ((sub_8001D08(6,0,0)) && (HasRecruitedMon(MONSTER_LUGIA))) { + if ((ScriptVarScenarioEqual(6,0,0)) && (HasRecruitedMon(MONSTER_LUGIA))) { ScenarioCalc(6,0x24,1); } - if ((sub_8001D08(8,0,0)) && (HasRecruitedMon(MONSTER_HO_OH))) { + if ((ScriptVarScenarioEqual(8,0,0)) && (HasRecruitedMon(MONSTER_HO_OH))) { ScenarioCalc(8,0x2c,1); } } @@ -388,17 +388,17 @@ u32 FlagCalc(s32 r0, s32 r1, u32 operation) return _FlagCalc(r0, r1, operation); } -void sub_800226C(u32 param_1, s16 param_2, s32 param_3, u32 operation) +void UpdateScriptVarWithImmediate(u32 param_1, s16 param_2, s32 param_3, u32 operation) { u32 uVar1; u32 uVar3; - uVar1 = sub_8001658(param_1,param_2); + uVar1 = GetScriptVarValue(param_1,param_2); uVar3 = _FlagCalc(uVar1,param_3,operation); - sub_80018D8(param_1,param_2,uVar3); + SetScriptVarValue(param_1,param_2,uVar3); } -void sub_80022A0(u32 param_1, s16 param_2, s16 param_3, u32 operation) +void UpdateScriptVarWithVar(u32 param_1, s16 param_2, s16 param_3, u32 operation) { s32 uVar1; s32 uVar2; @@ -408,10 +408,10 @@ void sub_80022A0(u32 param_1, s16 param_2, s16 param_3, u32 operation) s32 param_3_s32 = param_3; - uVar1 = sub_8001658(param_1,param_2_s32); - uVar2 = sub_8001658(param_1,param_3_s32); + uVar1 = GetScriptVarValue(param_1,param_2_s32); + uVar2 = GetScriptVarValue(param_1,param_3_s32); uVar3 = _FlagCalc(uVar1,uVar2,operation); - sub_80018D8(param_1,param_2_s32,uVar3); + SetScriptVarValue(param_1,param_2_s32,uVar3); } u8 FlagJudge(s32 r0, s32 r1, u32 operation) @@ -423,7 +423,7 @@ u8 sub_80022F8(u32 param_1, s16 param_2, s32 param_3, u32 operation) { s32 uVar1; - uVar1 = sub_8001658(param_1, param_2); + uVar1 = GetScriptVarValue(param_1, param_2); return _FlagJudge(uVar1,param_3,operation); } @@ -435,8 +435,8 @@ u8 sub_8002318(u32 param_1, s16 param_2, s16 param_3, u32 operation) s32 param_2_s32 = param_2; s32 param_3_s32 = param_3; - uVar1 = sub_8001658(param_1,param_2_s32); - uVar2 = sub_8001658(param_1,param_3_s32); + uVar1 = GetScriptVarValue(param_1,param_2_s32); + uVar2 = GetScriptVarValue(param_1,param_3_s32); return _FlagJudge(uVar1,uVar2,operation); } @@ -490,61 +490,61 @@ bool8 sub_80023E4(u32 param_1) { switch(param_1) { case 0: - return sub_8001D44(3,2,-1); + return ScriptVarScenarioAfter(3,2,-1); case 1: - return sub_8001D44(3,3,3); + return ScriptVarScenarioAfter(3,3,3); case 2: - return sub_8001D44(3,4,3); + return ScriptVarScenarioAfter(3,4,3); case 3: - return sub_8001D44(3,5,0); + return ScriptVarScenarioAfter(3,5,0); case 4: - return (sub_8001D44(3,0xb,0) && sub_8001CC4(3,0xd,0)); + return (ScriptVarScenarioAfter(3,0xb,0) && ScriptVarScenarioBefore(3,0xd,0)); case 5: - return (sub_8001D44(3,0xb,3) && sub_8001CC4(3,0xf,0)); + return (ScriptVarScenarioAfter(3,0xb,3) && ScriptVarScenarioBefore(3,0xf,0)); case 6: - return sub_8001D44(3,0x11,-1); + return ScriptVarScenarioAfter(3,0x11,-1); case 7: - return sub_8001D44(3,0x12,2); + return ScriptVarScenarioAfter(3,0x12,2); case 8: - return sub_8001D44(3,0x12,3); + return ScriptVarScenarioAfter(3,0x12,3); case 9: - return sub_8001D44(3,0x12,-1); + return ScriptVarScenarioAfter(3,0x12,-1); case 10: - return sub_8001D44(3,5,4); + return ScriptVarScenarioAfter(3,5,4); case 0xb: - return sub_8001D44(3,5,4); + return ScriptVarScenarioAfter(3,5,4); case 0xc: - return (!sub_8001D08(3,0xb,2) && !sub_8001D08(3,0xb,3)); + return (!ScriptVarScenarioEqual(3,0xb,2) && !ScriptVarScenarioEqual(3,0xb,3)); case 0xd: - return sub_8001D08(3,0x10,2); + return ScriptVarScenarioEqual(3,0x10,2); case 0xe: - return !sub_8001CC4(3,5,7); + return !ScriptVarScenarioBefore(3,5,7); case 0xf: - return !sub_8001CC4(3,0xf,0); + return !ScriptVarScenarioBefore(3,0xf,0); case 0x10: - return sub_8001D44(3,7,-1); + return ScriptVarScenarioAfter(3,7,-1); case 0x11: - return sub_8001D44(3,0xc,-1); + return ScriptVarScenarioAfter(3,0xc,-1); case 0x12: - return sub_8001D44(3,0xd,-1); + return ScriptVarScenarioAfter(3,0xd,-1); case 0x13: - return sub_8001D44(3,0xf,-1); + return ScriptVarScenarioAfter(3,0xf,-1); case 0x14: - return sub_8001D44(3,0x10,-1); + return ScriptVarScenarioAfter(3,0x10,-1); case 0x15: - return sub_8001D44(5,0x21,-1); + return ScriptVarScenarioAfter(5,0x21,-1); case 0x16: - return sub_8001D44(5,0x22,-1); + return ScriptVarScenarioAfter(5,0x22,-1); case 0x17: - return sub_8001D44(6,0x24,-1); + return ScriptVarScenarioAfter(6,0x24,-1); case 0x18: - return sub_8001D44(7,0x2a,-1); + return ScriptVarScenarioAfter(7,0x2a,-1); case 0x19: - return sub_8001D44(8,0x2c,-1); + return ScriptVarScenarioAfter(8,0x2c,-1); case 0x1a: - return sub_8001D44(10,0x31,-1); + return ScriptVarScenarioAfter(10,0x31,-1); case 0x1b: - return sub_80973F4(0x29); + return RescueScenarioConquered(0x29); case 0x1c: return GetRescueTeamRank() == LUCARIO_RANK; case 0x1d: @@ -604,15 +604,15 @@ void sub_80026E8(s16 r0) bool8 sub_8002700(void *r0) { - MemoryCopy8(r0, gUnknown_2000A88, 0x400); + MemoryCopy8(r0, gScriptVarBuffer, 0x400); return 1; } bool8 sub_8002718(u8 *r0) { struct UnkEventStruct temp; - sub_800160C(&temp, 0, 0); - MemoryCopy8(gUnknown_2000A88, r0, 0x400); + GetScriptVarRef(&temp, 0, 0); + MemoryCopy8(gScriptVarBuffer, r0, 0x400); if (temp.unk0[5] != *(u32 *)temp.unk4) return 0; return 1; @@ -620,7 +620,7 @@ bool8 sub_8002718(u8 *r0) void sub_8002758(s32 r0) { - sub_800226C(0, 0x1, r0, 0x9); + UpdateScriptVarWithImmediate(0, 0x1, r0, 0x9); } u8 sub_800276C(void) diff --git a/src/felicity_bank.c b/src/felicity_bank.c index 6077ca78d..07354d547 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -45,7 +45,7 @@ bool8 CreateFelicityBank(s32 mode) OpenedFile *faceFile; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sFelicityBankWork = MemoryAlloc(sizeof(FelicityBankWork), 8); sFelicityBankWork->menuAction = 0; sFelicityBankWork->mode = mode; @@ -123,7 +123,7 @@ static void sub_801645C(void) { s32 i; - sub_8006518(sFelicityBankWork->unkA8); + RestoreUnkTextStruct_8006518(sFelicityBankWork->unkA8); switch (sFelicityBankWork->currState) { case 2: @@ -132,7 +132,7 @@ static void sub_801645C(void) sFelicityBankWork->unkA8[2].unk0 = 0x80; sFelicityBankWork->unkA8[3] = sUnknown_80DB6F4; ResetUnusedInputStruct(); - sub_800641C(sFelicityBankWork->unkA8, TRUE, FALSE); + xxx_call_save_unk_text_struct_800641C(sFelicityBankWork->unkA8, TRUE, FALSE); break; case 8: case 11: @@ -141,14 +141,14 @@ static void sub_801645C(void) sFelicityBankWork->unkA8[3] = sUnknown_80DB6F4; sFelicityBankWork->unkA8[2] = sUnknown_80DB70C; ResetUnusedInputStruct(); - sub_800641C(sFelicityBankWork->unkA8, TRUE, FALSE); + xxx_call_save_unk_text_struct_800641C(sFelicityBankWork->unkA8, TRUE, FALSE); break; default: for (i = 0; i < 4; i++) sFelicityBankWork->unkA8[i] = sUnknown_80DB6DC; ResetUnusedInputStruct(); - sub_800641C(sFelicityBankWork->unkA8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sFelicityBankWork->unkA8, TRUE, TRUE); break; } } @@ -158,7 +158,7 @@ static void UpdateFelicityBankDialogue(void) switch (sFelicityBankWork->currState) { case 0: sFelicityBankWork->fallbackState = 1; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WELCOME], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WELCOME], 0, sFelicityBankWork->unkA4, 0x10D); break; case 1: CreateFelicityBankShopMenu(); @@ -174,33 +174,33 @@ static void UpdateFelicityBankDialogue(void) break; case 3: sFelicityBankWork->fallbackState = 1; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_HOW_IT_WORKS], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_HOW_IT_WORKS], 0, sFelicityBankWork->unkA4, 0x10D); break; case 4: sFelicityBankWork->fallbackState = 6; if (gTeamInventoryRef->teamSavings == 0) - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_BYE__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_BYE__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); else { gFormatData_202DE30 = gTeamInventoryRef->teamSavings; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_BYE__HAS_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_BYE__HAS_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); } break; case 5: sFelicityBankWork->fallbackState = 1; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_VERY_WELL], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_VERY_WELL], 0, sFelicityBankWork->unkA4, 0x10D); break; case 7: if (gTeamInventoryRef->teamMoney == 0) { sFelicityBankWork->fallbackState = 1; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); } else if (gTeamInventoryRef->teamSavings >= MAX_TEAM_SAVINGS) { sFelicityBankWork->fallbackState = 1; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__BANK_FULL], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__BANK_FULL], 0, sFelicityBankWork->unkA4, 0x10D); } else { sFelicityBankWork->fallbackState = 8; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__HOW_MUCH], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__HOW_MUCH], 0, sFelicityBankWork->unkA4, 0x10D); } break; case 8: @@ -221,21 +221,21 @@ static void UpdateFelicityBankDialogue(void) case 9: sFelicityBankWork->fallbackState = 1; gFormatData_202DE30 = sFelicityBankWork->chosenAmount; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__RECEIPT], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__RECEIPT], 0, sFelicityBankWork->unkA4, 0x10D); break; case 10: if (gTeamInventoryRef->teamMoney >= MAX_TEAM_MONEY) { sFelicityBankWork->fallbackState = 1; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__WALLET_FULL], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__WALLET_FULL], 0, sFelicityBankWork->unkA4, 0x10D); } else if (gTeamInventoryRef->teamSavings == 0) { sFelicityBankWork->fallbackState = 1; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D); } else { sFelicityBankWork->fallbackState = 11; gFormatData_202DE30 = gTeamInventoryRef->teamSavings; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__HOW_MUCH], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__HOW_MUCH], 0, sFelicityBankWork->unkA4, 0x10D); } break; case 11: @@ -259,7 +259,7 @@ static void UpdateFelicityBankDialogue(void) case 12: sFelicityBankWork->fallbackState = 1; gFormatData_202DE30 = sFelicityBankWork->chosenAmount; - sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__RECEIPT], 0, sFelicityBankWork->unkA4, 0x10D); + xxx_info_box_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__RECEIPT], 0, sFelicityBankWork->unkA4, 0x10D); break; } } @@ -388,7 +388,7 @@ static void sub_8016B24(void) static void sub_8016B48(u8 action) { - sub_8008C54(sFelicityBankWork->unk64.unk14); + CallPrepareTextbox_8008C54(sFelicityBankWork->unk64.unk14); sub_80073B8(sFelicityBankWork->unk64.unk14); if (action != FELICITY_BANK_ACTION_WITHDRAW) @@ -402,7 +402,7 @@ static void sub_8016B48(u8 action) static void CreateFelicityMoneySavingsHeader(u32 param_1) { - sub_8008C54(param_1); + CallPrepareTextbox_8008C54(param_1); sub_80073B8(param_1); PrintStringOnWindow(16, 4, sDisplayMoney, param_1, 0); sub_8012BC4(96, 4, gTeamInventoryRef->teamMoney, 5, 5, param_1); @@ -413,7 +413,7 @@ static void CreateFelicityMoneySavingsHeader(u32 param_1) void DrawTeamMoneyBox(u32 param_1) { - sub_8008C54(param_1); + CallPrepareTextbox_8008C54(param_1); sub_80073B8(param_1); PrintStringOnWindow(6, 0, sMoney, param_1, 0); sub_8012BC4(42, 12, gTeamInventoryRef->teamMoney, 5, 5, param_1); diff --git a/src/friend_area.c b/src/friend_area.c index 14ba10cbd..035f2a00c 100644 --- a/src/friend_area.c +++ b/src/friend_area.c @@ -217,13 +217,13 @@ void sub_8092558(u8 *buffer, u8 index) sprintfStatic(buffer, sUnknown_81098A4, sFriendAreaNames[index]); } -void sub_8092578(u8 *buffer, u8 index, bool8 printPrice) +void WriteFriendAreaName(u8 *buffer, u8 index, bool8 printPrice) { // I think this is when we buy the friend area from wigglytuff u8 priceBuffer[20]; if (printPrice) { - sub_8090FEC(sFriendAreaSettings[index].price, priceBuffer, 1); + WriteHighDecimal(sFriendAreaSettings[index].price, priceBuffer, 1); sprintfStatic(buffer, sUnknown_81098AC, sFriendAreaNames[index], 96, priceBuffer); } else diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 8a3731325..866bb0c56 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -51,7 +51,7 @@ extern void SetFriendAreaActionMenuState(u32); extern void PlaySound(u32); extern void sub_808D31C(PokemonStruct1 *); -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern bool8 sub_808D750(s16 index_); extern void sub_808ED00(void); @@ -143,7 +143,7 @@ void sub_802719C(void) { s32 index; - sub_8006518(sUnknown_203B2BC->unk180); + RestoreUnkTextStruct_8006518(sUnknown_203B2BC->unk180); switch(sUnknown_203B2BC->state) { case 3: @@ -165,7 +165,7 @@ void sub_802719C(void) break; } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2BC->unk180, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2BC->unk180, TRUE, TRUE); } void sub_8027274(void) @@ -228,11 +228,11 @@ void sub_8027274(void) break; case 6: sUnknown_203B2BC->fallbackState = FRIEND_AREA_ACTION_MENU_MAIN_2; - sub_80141B4(sReturnedToToolbox, 0, 0, 0x101); + xxx_info_box_80141B4(sReturnedToToolbox, 0, 0, 0x101); break; case 7: sUnknown_203B2BC->fallbackState = FRIEND_AREA_ACTION_MENU_MAIN_2; - sub_80141B4(sSentToStorage, 0, 0, 0x101); + xxx_info_box_80141B4(sSentToStorage, 0, 0, 0x101); break; } } @@ -695,14 +695,14 @@ void sub_8027D40(u32 r0, BulkItem *heldItem) Item slot; struct unkStruct_8090F58 a3; - sub_8008C54(r0); + CallPrepareTextbox_8008C54(r0); sub_80073B8(r0); HeldItemToSlot(&slot, heldItem); a3.unk0 = 0; a3.unk4 = 0; a3.unk8 = 1; slot.flags = ITEM_FLAG_EXISTS; - sub_8090E14(gUnknown_202DE58, &slot, &a3); + sub_8090E14(gFormatItems, &slot, &a3); PrintFormatStringOnWindow(4, 3, sItemBuffered, r0, 0); sub_80073E0(r0); } diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c index c8a67e77a..6bf16b407 100644 --- a/src/friend_list_menu.c +++ b/src/friend_list_menu.c @@ -26,7 +26,7 @@ #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202DEA8[]; extern u8 gAvailablePokemonNames[]; @@ -150,7 +150,7 @@ void sub_802544C(void) { s32 i; - sub_8006518(gUnknown_203B2B4->unk118); + RestoreUnkTextStruct_8006518(gUnknown_203B2B4->unk118); switch (gUnknown_203B2B4->state) { case 3: @@ -174,7 +174,7 @@ void sub_802544C(void) } ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B2B4->unk118, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B2B4->unk118, TRUE, TRUE); } void sub_8025518(void) @@ -186,7 +186,7 @@ void sub_8025518(void) { case 0: gUnknown_203B2B4->fallbackState = 1; - sub_80141B4(sVisitWhoPrompt,0,0,0x301); + xxx_info_box_80141B4(sVisitWhoPrompt,0,0,0x301); break; case 1: uVar3 = 4; @@ -229,20 +229,20 @@ void sub_8025518(void) break; case FRIEND_LIST_MENU_STATE_ITEM_GIVEN: gUnknown_203B2B4->fallbackState = 2; - sub_80141B4(sItemHandedOver,0,0,0x101); + xxx_info_box_80141B4(sItemHandedOver,0,0,0x101); break; case FRIEND_LIST_MENU_STATE_ITEM_EXCHANGE: gUnknown_203B2B4->fallbackState = 2; - sub_80141B4(sItemExchanged,0,0,0x101); + xxx_info_box_80141B4(sItemExchanged,0,0,0x101); break; case FRIEND_LIST_MENU_STATE_TAKE: gUnknown_203B2B4->fallbackState = 2; - sub_80141B4(sReturnedToToolbox,0,0,0x101); + xxx_info_box_80141B4(sReturnedToToolbox,0,0,0x101); break; case FRIEND_LIST_MENU_STATE_STANDBY: gUnknown_203B2B4->fallbackState = 1; PlaySound(0xcf); - sub_80141B4(sLeftOnStandby,0,0,0x101); + xxx_info_box_80141B4(sLeftOnStandby,0,0,0x101); break; case FRIEND_LIST_MENU_STATE_MOVES: unk_CopyMoves4To8(gUnknown_203B2B4->moves,gUnknown_203B2B4->pokeStruct->moves); @@ -637,14 +637,14 @@ void sub_8025E68(u32 r0, BulkItem *heldItem) Item item; struct unkStruct_8090F58 a3; - sub_8008C54(r0); + CallPrepareTextbox_8008C54(r0); sub_80073B8(r0); HeldItemToSlot(&item, heldItem); a3.unk0 = 0; a3.unk4 = 0; a3.unk8 = 1; item.flags = ITEM_FLAG_EXISTS; - sub_8090E14(gUnknown_202DE58, &item, &a3); + sub_8090E14(gFormatItems, &item, &a3); PrintFormatStringOnWindow(4, 3, sItemBuffered, r0, 0); sub_80073E0(r0); } diff --git a/src/friend_rescue.c b/src/friend_rescue.c index e173ba6a3..761bc40fe 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -328,7 +328,7 @@ u32 CreateFriendRescueMenu(void) int counter; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); gUnknown_203B33C = MemoryAlloc(sizeof(WonderMailStruct_203B33C), 8); MemoryFill8((u8 *) gUnknown_203B33C, 0, sizeof(WonderMailStruct_203B33C)); gUnknown_203B33C->unk530 = 0; @@ -796,44 +796,44 @@ void sub_8032828(void) } break; case 0x3C: - sub_80141B4(&gUnknown_80E276C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E276C[0], 0, 0, 0x101); break; case 0x3D: sub_8014248(&gUnknown_80E27A4[0], 0, 6, gUnknown_80E2458, NULL, 4, 0, NULL, 0x101); break; case 0x43: - sub_80141B4(&gUnknown_80E2814[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2814[0], 0, 0, 0x101); break; case 0x3E: - sub_80141B4(&gUnknown_80E2840[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2840[0], 0, 0, 0x101); break; case 0x3F: - sub_80141B4(&gUnknown_80E2874[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2874[0], 0, 0, 0x101); break; case 0x40: switch ((u32)gUnknown_203B33C->unk524) { case 0xB: case 0xD: case 0xE: - sub_80141B4(&gUnknown_80E2898[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2898[0], 0, 0, 0x101); break; case 0xC: break; } break; case 0x42: - sub_80141B4(&gUnknown_80E28D8[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E28D8[0], 0, 0, 0x101); break; case 0x30: - sub_80141B4(&gUnknown_80E2904[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2904[0], 0, 0, 0x101); break; case 0x31: - sub_80141B4(&gUnknown_80E296C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E296C[0], 0, 0, 0x101); break; case 0x32: if (sub_8030894() == 0) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80306A8(1, 0, NULL, 6); } break; @@ -847,33 +847,33 @@ void sub_8032828(void) case 0xB: case 0xD: case 0xE: - sub_80141B4(&gUnknown_80E29D0[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E29D0[0], 0, 0, 0x101); break; } break; case 0x38: - sub_80141B4(&gUnknown_80E2A0C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2A0C[0], 0, 0, 0x101); break; case 0x3A: - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8031D70(gUnknown_203B33C->unk218, 0); break; case 0x3B: - sub_80141B4(&gUnknown_80E2A1C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2A1C[0], 0, 0, 0x101); break; case 0x39: - sub_80141B4(&gUnknown_80E2A5C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2A5C[0], 0, 0, 0x101); break; case 0x2D: - sub_80141B4(&gUnknown_80E2A80[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2A80[0], 0, 0, 0x101); break; case 0x2F: - sub_80141B4(&gUnknown_80E2AA8[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2AA8[0], 0, 0, 0x101); break; case 0x2A: - sub_80141B4(&gUnknown_80E2AE4[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2AE4[0], 0, 0, 0x101); break; case 0x2B: #ifndef NONMATCHING @@ -889,31 +889,31 @@ void sub_8032828(void) #ifndef NONMATCHING gUnknown_80E2BE0[0] = gUnknown_80E2BE0[0]; #endif //NONMATCHING - sub_80141B4(&gUnknown_80E2B54[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2B54[0], 0, 0, 0x101); break; } break; case 0x2C: - sub_80141B4(&gUnknown_80E2A0C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2A0C[0], 0, 0, 0x101); break; case 0x23: - sub_80141B4(&gUnknown_80E2B90[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2B90[0], 0, 0, 0x101); break; case 0x21: sub_8014248(&gUnknown_80E2BE0[0], 0, 15, gUnknown_80E23A8, NULL, 4, 0, NULL, 0x101); break; case 0x25: - sub_80141B4(&gUnknown_80E2C48[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2C48[0], 0, 0, 0x101); break; case 0x26: if (sub_8023CE8() != 0) sub_8023C60(); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8023868(3, 0, 0, 9); break; case 0x27: - sub_8006518(gUnknown_203B33C->unk35C); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C); SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E2334, gUnknown_80E234C, TRUE, 0, FALSE); sub_8023DA4(); sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1); @@ -925,12 +925,12 @@ void sub_8032828(void) sub_8014248(&gUnknown_80E2CD4[0], 0, 6, gUnknown_80E22D0, NULL, 4, 0, NULL, 0x101); break; case 0x1C: - sub_80141B4(&gUnknown_80E2CE8[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2CE8[0], 0, 0, 0x101); break; case 0x1D: if (sub_8030894() == 0) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80306A8(4, 0, NULL, 6); } break; @@ -938,7 +938,7 @@ void sub_8032828(void) sub_8014248(&gUnknown_80E2D30[0], 0, 6, gUnknown_80E22B4, NULL, 4, 0, NULL, 0x101); break; case 0x22: - sub_80141B4(&gUnknown_80E2D60[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2D60[0], 0, 0, 0x101); break; case 0x5: sub_8014248(&gUnknown_80E2D7C[0], 0, 6, gUnknown_80E2290, NULL, 4, 0, NULL, 0x101); @@ -949,11 +949,11 @@ void sub_8032828(void) break; case 0xB: case 0x4D: - sub_80141B4(&gUnknown_80E2E54[0], 0, NULL, 0); + xxx_info_box_80141B4(&gUnknown_80E2E54[0], 0, NULL, 0); break; case 0xC: case 0x4E: - sub_80141B4(&gUnknown_80E2EB4[0], 0, NULL, 0); + xxx_info_box_80141B4(&gUnknown_80E2EB4[0], 0, NULL, 0); break; case 0x7: gUnknown_203B33C->status = 0; @@ -1028,23 +1028,23 @@ void sub_8032828(void) xxx_call_start_bg_music(); break; case 0x10: - sub_80141B4(&gUnknown_80E2F14[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2F14[0], 0, 0, 0x101); break; case 0x11: - sub_80141B4(&gUnknown_80E2F44[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2F44[0], 0, 0, 0x101); break; case 0x12: if (sub_8030894() != 0) break; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80306A8(1, 0, NULL, 6); break; case 0x15: sub_8014248(&gUnknown_80E2F78[0], 0, 6, gUnknown_80E2290, NULL, 4, 0, NULL, 0x101); break; case 0xF: - sub_80141B4(&gUnknown_80E2FA0[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2FA0[0], 0, 0, 0x101); break; case 0x16: switch ((u32)gUnknown_203B33C->unk524) { @@ -1053,30 +1053,30 @@ void sub_8032828(void) case 0xB: case 0xD: case 0xE: - sub_80141B4(&gUnknown_80E2FEC[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E2FEC[0], 0, 0, 0x101); break; } break; case 0x18: - sub_80141B4(&gUnknown_80E3030[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3030[0], 0, 0, 0x101); break; case 0x19: - sub_80141B4(&gUnknown_80E3078[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3078[0], 0, 0, 0x101); break; case 0x1A: - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80151C0(4, gUnknown_203B33C->passwordBuffer); break; case 0x5A: sub_8014248(&gUnknown_80E30A4[0], 0, 6, gUnknown_80E2458, NULL, 4, 0, NULL, 0x101); break; case 0x5B: - sub_80141B4(gUnknown_80E30D0, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E30D0, 0, 0, 0x101); break; case 0x5D: - sub_8006518(gUnknown_203B33C->unk35C); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C); SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, gUnknown_80E2408, TRUE, 0, FALSE); sub_803092C(); sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1); @@ -1084,7 +1084,7 @@ void sub_8032828(void) case 0x5F: if (sub_801D008() == NULL) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); { UnkTextStruct2_sub local_x = {3, 2}; sub_801C8C4(0, 1, &local_x, 9); @@ -1092,7 +1092,7 @@ void sub_8032828(void) } break; case 0x60: - sub_8006518(gUnknown_203B33C->unk35C); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C); SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E23F0, gUnknown_80E2408, TRUE, 0, FALSE); sub_801CCD8(); sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1); @@ -1126,38 +1126,38 @@ void sub_8032828(void) xxx_call_start_bg_music(); break; case 0x72: - sub_80141B4(gUnknown_80E311C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E311C, 0, 0, 0x101); break; case 0x73: - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80151C0(4, gUnknown_203B33C->passwordBuffer); break; case 0x66: - sub_80141B4(gUnknown_80E314C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E314C, 0, 0, 0x101); break; case 0x67: case 0x2E: - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8031D70(gUnknown_203B33C->unk218, 0); break; case 0x68: - sub_80141B4(gUnknown_80E317C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E317C, 0, 0, 0x101); break; case 0x6F: - sub_80141B4(gUnknown_80E319C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E319C, 0, 0, 0x101); break; case 0x70: // Yes we need duplicates in order to match :) - Kermalis - sub_80141B4(gUnknown_80E317C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E317C, 0, 0, 0x101); break; case 0x6C: - sub_80141B4(gUnknown_80E31D8, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E31D8, 0, 0, 0x101); break; case 0x50: - sub_80141B4(&gUnknown_80E31FC[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E31FC[0], 0, 0, 0x101); break; case 0x6D: switch ((u32)gUnknown_203B33C->unk524) { @@ -1166,7 +1166,7 @@ void sub_8032828(void) case 0xB: case 0xD: case 0xE: - sub_80141B4(&gUnknown_80E3220[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3220[0], 0, 0, 0x101); break; } break; @@ -1192,7 +1192,7 @@ void sub_8032828(void) case 0xD: case 0x62: nullsub_23(FALSE); - sub_80141B4(&gUnknown_80E2DD0[0], 0, NULL, 0); + xxx_info_box_80141B4(&gUnknown_80E2DD0[0], 0, NULL, 0); break; case 0x64: switch ((u32)gUnknown_203B33C->unk524) { @@ -1201,12 +1201,12 @@ void sub_8032828(void) case 0xB: case 0xD: case 0xE: - sub_80141B4(gUnknown_80E3248, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E3248, 0, 0, 0x101); break; } break; case 0x63: - sub_80141B4(gUnknown_80E3288, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E3288, 0, 0, 0x101); break; case 0x69: sub_8014248(&gUnknown_80E2D7C[0], 0, 6, gUnknown_80E2290, NULL, 4, 0, NULL, 0x101); @@ -1214,19 +1214,19 @@ void sub_8032828(void) case 0x59: sub_80922B4(buffer, GetPlayerPokemonStruct()->name, POKEMON_NAME_LENGTH); sprintfStatic(gUnknown_203B33C->unk424, gUnknown_80E32C4, buffer); - sub_80141B4(gUnknown_203B33C->unk424, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_203B33C->unk424, 0, 0, 0x101); break; case 0x58: sub_8014248(&gUnknown_80E331C[0], 0, 6, gUnknown_80E24D8, NULL, 4, 0, NULL, 0x101); break; case 0x75: - sub_80141B4(gUnknown_80E317C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E317C, 0, 0, 0x101); break; case 0x76: - sub_80141B4(gUnknown_80E2A0C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E2A0C, 0, 0, 0x101); break; case 0x57: - sub_80141B4(&gUnknown_80E3378[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3378[0], 0, 0, 0x101); break; case 0x56: sub_8014248(&gUnknown_80E339C[0], 0, 22, gUnknown_80E24B0, NULL, 4, 0, NULL, 0x101); @@ -1235,19 +1235,19 @@ void sub_8032828(void) sub_8014248(&gUnknown_80E33D8[0], 0, 21, gUnknown_80E2470, NULL, 4, 0, NULL, 0x101); break; case 0x53: - sub_80141B4(&gUnknown_80E3430[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3430[0], 0, 0, 0x101); break; case 0x54: sub_8014248(&gUnknown_80E34B0[0], 0, 6, gUnknown_80E2440, NULL, 4, 0, NULL, 0x101); break; case 0x46: - sub_80141B4(&gUnknown_80E34F0[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E34F0[0], 0, 0, 0x101); break; case 0x47: case 0x5C: if (sub_8030894() == 0) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80306A8(5, 0, 0, 6); } break; @@ -1255,7 +1255,7 @@ void sub_8032828(void) case 0x13: case 0x1E: case 0x33: - sub_8006518(gUnknown_203B33C->unk35C); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk35C); SetMenuItems(gUnknown_203B33C->unk21C, gUnknown_203B33C->unk35C, 3, &gUnknown_80E231C, gUnknown_80E234C, TRUE, 0, FALSE); sub_803092C(); sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1); @@ -1264,13 +1264,13 @@ void sub_8032828(void) sub_8014248(&gUnknown_80E352C[0], 0, 6, gUnknown_80E2290, NULL, 4, 0, NULL, 0x101); break; case 0x44: - sub_80141B4(&gUnknown_80E355C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E355C[0], 0, 0, 0x101); break; case 0x45: - sub_80141B4(&gUnknown_80E35AC[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E35AC[0], 0, 0, 0x101); break; case 0x51: - sub_80141B4(&gUnknown_80E35E8[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E35E8[0], 0, 0, 0x101); break; case 0x52: if (gUnknown_203B33C->unk40 == 6) @@ -1284,16 +1284,16 @@ void sub_8032828(void) case 0x7D: switch (gUnknown_203B33C->unk564) { case 0x23: - sub_80141B4(&gUnknown_80E3690[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3690[0], 0, 0, 0x101); break; case 0x24: - sub_80141B4(&gUnknown_80E3818[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3818[0], 0, 0, 0x101); break; case 0x25: - sub_80141B4(&gUnknown_80E3998[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3998[0], 0, 0, 0x101); break; case 0x26: - sub_80141B4(&gUnknown_80E3B1C[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3B1C[0], 0, 0, 0x101); break; } break; @@ -1303,19 +1303,19 @@ void sub_8032828(void) case 0x7B: switch (gUnknown_203B33C->unk564) { case 0x1E: - sub_80141B4(&gUnknown_80E3BF8[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3BF8[0], 0, 0, 0x101); break; case 0x1F: - sub_80141B4(&gUnknown_80E3DE4[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3DE4[0], 0, 0, 0x101); break; case 0x21: - sub_80141B4(&gUnknown_80E3E98[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E3E98[0], 0, 0, 0x101); break; case 0x20: - sub_80141B4(&gUnknown_80E4014[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E4014[0], 0, 0, 0x101); break; case 0x22: - sub_80141B4(&gUnknown_80E4130[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E4130[0], 0, 0, 0x101); break; } break; @@ -1325,10 +1325,10 @@ void sub_8032828(void) case 0x79: switch (gUnknown_203B33C->unk564) { case 0x1D: - sub_80141B4(&gUnknown_80E41DC[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E41DC[0], 0, 0, 0x101); break; case 0x1A: - sub_80141B4(&gUnknown_80E4314[0], 0, 0, 0x101); + xxx_info_box_80141B4(&gUnknown_80E4314[0], 0, 0, 0x101); break; } break; @@ -1350,48 +1350,48 @@ void PrintFriendRescueError(u32 status) case COMMS_GOOD: break; case COMMS_INCORRECT_NUM_SYSTEMS: - sub_80141B4(gUnknown_80E44A4, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E44A4, 0, 0, 0x101); break; case COMMS_NO_RESPONSE: - sub_80141B4(gUnknown_80E4500, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4500, 0, 0, 0x101); break; case COMMS_DIFFERENT_MODES: - sub_80141B4(gUnknown_80E4550, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4550, 0, 0, 0x101); break; case COMMS_NO_ROOM_STORAGE: - sub_80141B4(gUnknown_80E45B4, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E45B4, 0, 0, 0x101); break; case COMMS_DUPLICATE_MAIL: - sub_80141B4(gUnknown_80E460C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E460C, 0, 0, 0x101); break; case COMMS_MAIL_SENT_ALREADY: - sub_80141B4(gUnknown_80E4650, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4650, 0, 0, 0x101); break; case COMMS_NOT_ELIGIBLE_1: - sub_80141B4(gUnknown_80E468C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E468C, 0, 0, 0x101); break; case COMMS_FRIEND_NOT_ELIGIBLE: - sub_80141B4(gUnknown_80E46C8, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E46C8, 0, 0, 0x101); break; case COMMS_NOT_ELIGIBLE_2: - sub_80141B4(gUnknown_80E4704, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4704, 0, 0, 0x101); break; case COMMS_FRIEND_NOT_ELIGIBLE_2: - sub_80141B4(gUnknown_80E4744, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4744, 0, 0, 0x101); break; case 16: - sub_80141B4(gUnknown_80E4788, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4788, 0, 0, 0x101); break; case COMMS_NO_ROOM_MAIL: - sub_80141B4(gUnknown_80E47D8, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E47D8, 0, 0, 0x101); break; case 1: case 5: case 14: - sub_80141B4(gUnknown_80E4480, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4480, 0, 0, 0x101); break; case COMMS_NOT_READY: - sub_80141B4(gUnknown_80E482C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E482C, 0, 0, 0x101); break; } } @@ -1688,26 +1688,26 @@ void sub_8033DBC(void) SetFriendRescueMenuState(0x1B); break; case PASSWORD_ENTRY_NOT_SOS_MAIL: - sub_80141B4(gUnknown_80E48E8, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E48E8, 0, 0, 0x101); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR); break; case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL: - sub_80141B4(gUnknown_80E460C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E460C, 0, 0, 0x101); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR); break; case PASSWORD_ENTRY_SOS_MAIL_SUCCESS: sub_8095274(mail.unk10.unk10); mail.mailType = 2; sub_80951BC(&mail); - sub_80141B4(gUnknown_80E4928, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4928, 0, 0, 0x101); SetFriendRescueMenuState(0x16); break; case PASSWORD_ENTRY_NOT_AOK_MAIL: - sub_80141B4(gUnknown_80E4964, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4964, 0, 0, 0x101); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR); break; case PASSWORD_ENTRY_DUPLICATE_AOK_MAIL: - sub_80141B4(gUnknown_80E499C, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E499C, 0, 0, 0x101); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR); break; case PASSWORD_ENTRY_AOK_MAIL_SUCCESS: @@ -1727,7 +1727,7 @@ void sub_8033DBC(void) case 2: sub_80155F0(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN); break; default: @@ -1797,9 +1797,9 @@ void sub_8033FE4(void) case 4: gUnknown_203B33C->fallbackState = 0x1D; gUnknown_203B33C->unk218 = sub_80307EC(); - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(gUnknown_203B33C->unk218, 0); SetFriendRescueMenuState(0x1F); break; @@ -1822,9 +1822,9 @@ void sub_8034074(void) break; case 10: gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK; - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(gUnknown_203B33C->unk218, 0); SetFriendRescueMenuState(0x1F); break; @@ -1845,7 +1845,7 @@ void sub_8034130(void) case 3: sub_8030DE4(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); sub_803092C(); if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK) { @@ -1880,9 +1880,9 @@ void sub_803418C(void) case 4: gUnknown_203B33C->fallbackState = 0x26; gUnknown_203B33C->speciesNum = sub_8023B44(); - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8024458(gUnknown_203B33C->speciesNum, 0); SetFriendRescueMenuState(0x28); break; @@ -1905,9 +1905,9 @@ void sub_8034254(void) break; case 10: gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK; - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8024458(gUnknown_203B33C->speciesNum, 0); SetFriendRescueMenuState(0x28); break; @@ -1931,7 +1931,7 @@ void sub_8034310(void) case 3: sub_802453C(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); sub_8023B7C(1); if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK) { @@ -2049,7 +2049,7 @@ void sub_80344C0(void) case 3: sub_8031E10(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); SetFriendRescueMenuState(0x2F); break; case 1: @@ -2075,9 +2075,9 @@ void sub_8034500(void) case 4: gUnknown_203B33C->fallbackState = 0x32; gUnknown_203B33C->unk218 = sub_80307EC(); - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(gUnknown_203B33C->unk218, 0); SetFriendRescueMenuState(0x34); break; @@ -2100,9 +2100,9 @@ void sub_8034590(void) break; case 10: gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK; - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(gUnknown_203B33C->unk218, 0); SetFriendRescueMenuState(0x34); break; @@ -2123,7 +2123,7 @@ void sub_803464C(void) case 3: sub_8030DE4(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); sub_803092C(); if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK) { @@ -2196,7 +2196,7 @@ void sub_803473C(void) case 3: sub_8031E10(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); SetFriendRescueMenuState(0x3B); break; case 1: @@ -2325,7 +2325,7 @@ void sub_80348C4(void) case 0xB: case 0xD: case 0xE: - sub_80141B4(gUnknown_80E31FC, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E31FC, 0, 0, 0x101); SetFriendRescueMenuState(0x77); break; case 0xC: @@ -2355,7 +2355,7 @@ void sub_8034970(void) case 3: sub_8031E10(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); SetFriendRescueMenuState(0x68); break; case 1: @@ -2399,9 +2399,9 @@ void sub_80349E0(void) case 4: gUnknown_203B33C->fallbackState = 0x5C; gUnknown_203B33C->unk218 = sub_80307EC(); - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(gUnknown_203B33C->unk218, 0); SetFriendRescueMenuState(0x5E); break; @@ -2424,9 +2424,9 @@ void sub_8034A70(void) break; case 10: gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK; - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(gUnknown_203B33C->unk218, 0); SetFriendRescueMenuState(0x5E); break; @@ -2447,7 +2447,7 @@ void sub_8034B2C(void) case 3: sub_8030DE4(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); sub_803092C(); if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK) { @@ -2480,9 +2480,9 @@ void sub_8034B88(void) case 4: gUnknown_203B33C->fallbackState = 0x5F; gUnknown_203B33C->item.id = sub_801CB24(); - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_801B3C0(&gUnknown_203B33C->item); SetFriendRescueMenuState(0x61); break; @@ -2497,7 +2497,7 @@ void sub_8034C38(void) case 3: sub_801B450(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); sub_801CB5C(TRUE); if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK) { @@ -2529,9 +2529,9 @@ void sub_8034C98(void) break; case 10: gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK; - sub_8006518(gUnknown_203B33C->unk3BC); + RestoreUnkTextStruct_8006518(gUnknown_203B33C->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_801B3C0(&gUnknown_203B33C->item); SetFriendRescueMenuState(0x61); break; @@ -2572,11 +2572,11 @@ void sub_8034D74(void) SetFriendRescueMenuState(0x74); break; case PASSWORD_ENTRY_NOT_THANK_YOU_MAIL: - sub_80141B4(gUnknown_80E49C4, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E49C4, 0, 0, 0x101); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR_2); break; case PASSWORD_ENTRY_DUPLICATE_THANK_YOU_MAIL: - sub_80141B4(gUnknown_80E4704, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E4704, 0, 0, 0x101); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR_2); break; case PASSWORD_ENTRY_THANK_YOU_MAIL_SUCCESS: @@ -2595,7 +2595,7 @@ void sub_8034D74(void) case 2: sub_80155F0(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B33C->unk3BC, TRUE, TRUE); SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN); break; default: diff --git a/src/ground_link.c b/src/ground_link.c index c9a300e38..4854c9f58 100644 --- a/src/ground_link.c +++ b/src/ground_link.c @@ -13,27 +13,27 @@ struct unkStruct_203B4B8 u32 unk0; }; -EWRAM_DATA_2 struct unkStruct_203B4B8 gUnknown_203B4B8 = {0}; +EWRAM_DATA_2 struct unkStruct_203B4B8 gCurrentGroundLink = {0}; extern DebugLocation gUnknown_8118798; -extern struct unkStruct_80A77D0 *sub_80A77D0(s16 r0, DebugLocation *r1); +extern struct unkStruct_80A77D0 *GetGroundScript(s16 r0, DebugLocation *r1); void sub_80AD868(void) { - gUnknown_203B4B8.unk0 = 0; + gCurrentGroundLink.unk0 = 0; } void sub_80AD874(void) { - gUnknown_203B4B8.unk0 = 0; + gCurrentGroundLink.unk0 = 0; } void GroundLink_Select(s16 r0) { - gUnknown_203B4B8.unk0 = sub_80A77D0(r0, &gUnknown_8118798)->unk8; + gCurrentGroundLink.unk0 = GetGroundScript(r0, &gUnknown_8118798)->unk8; } -u32 sub_80AD8A0(s16 r0) +u32 GetCurrentGroundLink(s16 r0) { u32 a = r0; - return gUnknown_203B4B8.unk0 + a * 8; + return gCurrentGroundLink.unk0 + a * 8; } diff --git a/src/ground_main.c b/src/ground_main.c index a0c534c55..6ed44b2a4 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -15,7 +15,7 @@ EWRAM_DATA u32 gUnknown_20398B0 = {0}; EWRAM_DATA u32 gUnknown_20398B4 = {0}; EWRAM_DATA u8 gUnknown_20398B8 = {0}; EWRAM_DATA bool8 gUnknown_20398B9 = {0}; -EWRAM_DATA bool8 gUnknown_20398BA = {0}; +EWRAM_DATA bool8 gScriptMode = {0}; UNUSED EWRAM_DATA static u8 gUnknown_20398BB = {0}; EWRAM_DATA u16 gUnknown_20398BC = {0}; EWRAM_DATA u16 gUnknown_20398BE = {0}; @@ -48,10 +48,10 @@ extern void GroundLives_Action(); extern void GroundObject_Action(); extern void GroundEffect_Action(); -extern s32 sub_8001784(u8, u8, u8); +extern s32 GetScriptVarArrayValue(u8, u8, u8); extern void sub_809CB8C(); -extern void sub_80018D8(u8, u8, u32); -extern void sub_800199C(u8, u8, u8, s32); +extern void SetScriptVarValue(u8, u8, u32); +extern void SetScriptVarArrayValue(u8, u8, u8, s32); extern void sub_8098CC8(); extern void GeneratePelipperJobs(); extern void sub_80961B4(); @@ -93,26 +93,26 @@ void sub_8098BDC(void) void sub_8098C58(void) { s32 temp, temp2; - sub_80015C0(0, 54); - sub_80015C0(0, 57); + ClearScriptVarArray(0, 54); + ClearScriptVarArray(0, 57); sub_809CB8C(); sub_8001D88(); - if (sub_8001658(0, 42) != 0) { - temp = sub_8001658(0, 41); + if (GetScriptVarValue(0, 42) != 0) { + temp = GetScriptVarValue(0, 41); temp++; if (temp > 15) temp = 0; - sub_80018D8(0, 41, temp); - sub_80018D8(0, 42, 0); + SetScriptVarValue(0, 41, temp); + SetScriptVarValue(0, 42, 0); } - temp2 = sub_8001784(0, 66, 0); + temp2 = GetScriptVarArrayValue(0, 66, 0); if (temp2 <= 0) temp2 = 1; temp2--; - sub_800199C(0, 66, 0, temp2); + SetScriptVarArrayValue(0, 66, 0, temp2); sub_8098CC8(); } @@ -120,15 +120,15 @@ void sub_8098C58(void) void sub_8098CC8(void) { u32 temp; - if(sub_8001CC4(0x3, 0xB, 0)) + if(ScriptVarScenarioBefore(0x3, 0xB, 0)) { temp = 0; } - else if(sub_8001CC4(0x3, 0xF, 0)) + else if(ScriptVarScenarioBefore(0x3, 0xF, 0)) { temp = 1; } - else if(sub_8001CC4(0x3, 0x12, 0)) + else if(ScriptVarScenarioBefore(0x3, 0x12, 0)) { temp = 2; } @@ -271,19 +271,19 @@ bool8 sub_8098F88(void) return gUnknown_20398B9; } -bool8 sub_8098F94(void) +bool8 GetScriptMode(void) { - return gUnknown_20398BA; + return gScriptMode; } s16 sub_8098FA0(void) { - return sub_8001658(0, 0x11); + return GetScriptVarValue(0, 0x11); } const char *sub_8098FB4(void) { - return sub_80A2B18(sub_8001658(0, 0x11)); + return sub_80A2B18(GetScriptVarValue(0, 0x11)); } s16 sub_8098FCC(u32 unused) @@ -293,22 +293,22 @@ s16 sub_8098FCC(u32 unused) s32 iVar6; const DungeonInfo *iVar3; - iVar5 = (s16)sub_8001658(0,0x13); + iVar5 = (s16)GetScriptVarValue(0,0x13); iVar6 = iVar5; if (iVar5 == -1) return 0xC; if (iVar5 == 0x51) - iVar4 = (s16)sub_8001658(0,0x14); + iVar4 = (s16)GetScriptVarValue(0,0x14); else iVar4 = iVar6; - iVar3 = sub_80A2608(iVar4); + iVar3 = GetDungeonInfo_80A2608(iVar4); if (gUnknown_20398B4 == 9) { return iVar3->unk2; } switch((s16)(iVar3->unk4 - 0xb2)) { case 0: - if (sub_8001D44(3,2,-1) != 0) return 0xc; + if (ScriptVarScenarioAfter(3,2,-1) != 0) return 0xc; break; case 0xf: case 0x11: diff --git a/src/ground_map.c b/src/ground_map.c index f7cee1d59..eac40a478 100644 --- a/src/ground_map.c +++ b/src/ground_map.c @@ -7,9 +7,9 @@ #include "memory.h" IWRAM_DATA GroundMapAction *gGroundMapAction = {0}; -IWRAM_DATA unkStruct_3001B70 *gUnknown_3001B70 = {0}; +IWRAM_DATA unkStruct_3001B70 *gGroundMapDungeon_3001B70 = {0}; -extern const CallbackData gUnknown_811736C; +extern const CallbackData gGroundScriptNullCallbacks; extern const DebugLocation gUnknown_8117538[]; extern void InitActionWithParams(Action *action, const CallbackData *callbacks, void *parent, s16 group, s8 sector); @@ -21,7 +21,7 @@ void AllocGroundMapAction(void) { gGroundMapAction = MemoryAlloc(sizeof(GroundMapAction), 6); gGroundMapAction->groundMapId = -1; - InitActionWithParams(&gGroundMapAction->action, &gUnknown_811736C, 0, -1, -1); + InitActionWithParams(&gGroundMapAction->action, &gGroundScriptNullCallbacks, 0, -1, -1); sub_80A5E8C(0); GroundMap_Reset(); } @@ -30,21 +30,21 @@ void FreeGroundMapAction(void) { GroundMap_Reset(); sub_80A5EBC(); - sub_809D648((Action *)gGroundMapAction); + InitAction2((Action *)gGroundMapAction); MemoryFree(gGroundMapAction); gGroundMapAction = NULL; } void GroundMap_Reset(void) { - sub_80015C0(0, 0x37); - sub_80015C0(0, 0x38); - InitActionScriptData((Action *)gGroundMapAction, gUnknown_8117538); + ClearScriptVarArray(0, 0x37); + ClearScriptVarArray(0, 0x38); + ActionResetScriptData((Action *)gGroundMapAction, gUnknown_8117538); - if (gUnknown_3001B70 != NULL) { - sub_80A2D00(gUnknown_3001B70); - MemoryFree(gUnknown_3001B70); - gUnknown_3001B70 = NULL; + if (gGroundMapDungeon_3001B70 != NULL) { + sub_80A2D00(gGroundMapDungeon_3001B70); + MemoryFree(gGroundMapDungeon_3001B70); + gGroundMapDungeon_3001B70 = NULL; } sub_80A5EDC(0); @@ -54,14 +54,14 @@ void sub_80A4B38(void) { nullsub_121(); - if (gUnknown_3001B70 != NULL) - sub_80A2D68(gUnknown_3001B70); + if (gGroundMapDungeon_3001B70 != NULL) + sub_80A2D68(gGroundMapDungeon_3001B70); } void sub_80A4B54(void) { - if (gUnknown_3001B70 != NULL) - sub_80A2D88(gUnknown_3001B70); + if (gGroundMapDungeon_3001B70 != NULL) + sub_80A2D88(gGroundMapDungeon_3001B70); nullsub_122(); } diff --git a/src/ground_map_1.c b/src/ground_map_1.c index 32e050e52..e2286d293 100644 --- a/src/ground_map_1.c +++ b/src/ground_map_1.c @@ -16,9 +16,9 @@ extern const DebugLocation gUnknown_8117698; extern void GroundMap_GetStationScript(ScriptInfoSmall *, s16, u32, u32); extern u8 sub_809D678(void *); -extern bool8 sub_809D968(void *, s32); +extern bool8 GroundScriptNotify(void *, s32); -static void sub_80A4BE8(ScriptInfoSmall *script, s16 r1) +static void GroundMap_GetFirstStationScript(ScriptInfoSmall *script, s16 r1) { GroundMap_GetStationScript(script, r1, 0, 0); } @@ -33,7 +33,7 @@ void GroundMap_ExecuteEvent(s16 scriptIndex, u32 param_2) iVar2 = param_2; Log(0,gUnknown_8117594, index_s32, iVar2); // "GroundMap ExecuteEvent %3d %d - sub_809D710(NULL, &script, index_s32); + GetFunctionScript(NULL, &script, index_s32); if (iVar2 != 0) script.state = 5; @@ -69,7 +69,7 @@ void GroundMap_ExecuteEnter(s16 param_1) iVar1 = param_1; Log(0, gUnknown_8117650, iVar1); // GroundMap ExecuteEnter %3d - sub_80A4BE8(&script, iVar1); + GroundMap_GetFirstStationScript(&script, iVar1); script.state = 2; script.group = 0; script.sector = 0; @@ -81,10 +81,10 @@ UNUSED static u8 sub_80A4D14(void) return sub_809D678(&gGroundMapAction->action); } -bool8 sub_80A4D2C(s16 param_1) +bool8 GroundMapNotifyAll(s16 param_1) { s32 iVar1 = param_1; - return sub_809D968(&gGroundMapAction->action, iVar1); + return GroundScriptNotify(&gGroundMapAction->action, iVar1); } bool8 sub_80A4D48(s16 index) diff --git a/src/ground_map_2.c b/src/ground_map_2.c index 3819de6a1..74d792bcd 100644 --- a/src/ground_map_2.c +++ b/src/ground_map_2.c @@ -15,7 +15,7 @@ extern const u8 gGroundWeatherSelect[]; extern const s32 gUnknown_81177BC[]; extern void sub_80A3BB0(unkStruct_3001B70 *, u32); -extern void sub_80018D8(u8, u8, u32); +extern void SetScriptVarValue(u8, u8, u32); extern void sub_80A2D00(unkStruct_3001B70 *); extern void sub_80A2B40(unkStruct_3001B70 *, const u8 *); extern void sub_80A2FBC(unkStruct_3001B70 *, u32); @@ -29,8 +29,8 @@ static void sub_80A62D0(void); void sub_80A5E70(void) { - if (gUnknown_3001B70 != NULL) - sub_80A49E8(gUnknown_3001B70); + if (gGroundMapDungeon_3001B70 != NULL) + sub_80A49E8(gGroundMapDungeon_3001B70); sub_80A62D0(); } @@ -52,7 +52,7 @@ void sub_80A5EBC(void) void sub_80A5EDC(u8 param_1) { - sub_80018D8(0, 27, -1); + SetScriptVarValue(0, 27, -1); gUnknown_3001B74->unk0 = -1; gUnknown_3001B74->unk2 = param_1; @@ -84,7 +84,7 @@ void GroundWeather_Select(s16 param_1) iVar2 = param_1; iVar3 = iVar2; Log(0, gGroundWeatherSelect, iVar2, gUnknown_3001B74->unk2); - sub_80018D8(0, 27, iVar2); + SetScriptVarValue(0, 27, iVar2); gUnknown_3001B74->unk0 = iVar2; if (gUnknown_3001B74->unk2 == 0) diff --git a/src/ground_script.c b/src/ground_script.c index 9219272fe..b7ae7cc4c 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -2,10 +2,10 @@ #include "debug.h" #include "ground_script.h" -extern u8 gUnknown_2039A36; -extern u8 gUnknown_2039A38[]; -extern u32 gUnknown_2039B48[]; -extern u8 gUnknown_2039AC0[]; +extern u8 gAnyScriptLocked; +extern u8 gScriptLocks[]; +extern u32 gUnlockBranchLabels[]; +extern u8 gScriptLockConds[]; extern u32 gUnknown_8116588; extern u32 gUnknown_8116538; @@ -17,10 +17,10 @@ extern u8 gUnknown_811656C[]; extern DebugLocation gUnknown_81165C8; extern void sub_809D520(void *); -extern u8 sub_80AC378(void); -extern u8 sub_80AD290(void); -extern u8 sub_80A8B74(void); -extern u8 sub_809A750(void); +extern u8 GroundObjectsCancellAll(void); +extern u8 GroundEffectsCancelAll(void); +extern u8 GroundLivesCancelAll(void); +extern u8 IsTextboxOpen_809A750(void); extern s32 sub_80A882C(s16); extern s32 sub_80AC240(s16); extern s32 sub_80AD158(s16); @@ -112,7 +112,7 @@ void InitActionWithParams(Action *action, const CallbackData *callbacks, void *p action->unk8[1] = 0; } -void sub_809D648(Action *action) +void InitAction2(Action *action) { InitAction(action); } @@ -167,7 +167,7 @@ void SetPredefinedScript(Action *param_1, s16 index, ScriptCommand *param_3) param_1->predefinedScripts[index] = param_3; } -bool8 sub_809D6E4(Action *param_1, ScriptInfoSmall *script, s16 _index) +bool8 GetPredefinedScript(Action *param_1, ScriptInfoSmall *script, s16 _index) { ScriptCommand *scriptPtr; s32 index = _index; @@ -180,7 +180,7 @@ bool8 sub_809D6E4(Action *param_1, ScriptInfoSmall *script, s16 _index) return scriptPtr != NULL; } -void sub_809D710(Action *param_1, ScriptInfoSmall *script, s16 index) +void GetFunctionScript(Action *param_1, ScriptInfoSmall *script, s16 index) { s32 index_s32 = index; script->ptr = gFunctionScriptTable[index_s32].script; @@ -195,14 +195,14 @@ void sub_809D710(Action *param_1, ScriptInfoSmall *script, s16 index) } } -bool8 InitActionScriptData(Action *param_1, const DebugLocation *unused) +bool8 ActionResetScriptData(Action *param_1, const DebugLocation *unused) { InitScriptData(¶m_1->scriptData); InitScriptData(¶m_1->scriptData2); return TRUE; } -bool8 sub_809D770(Action *param_1, DebugLocation *unused) +bool8 ActionResetScriptDataForDeletion(Action *param_1, DebugLocation *unused) { InitScriptData(¶m_1->scriptData); InitScriptData(¶m_1->scriptData2); @@ -271,28 +271,28 @@ bool8 GroundScript_ExecutePP(Action *action, s32 *param_2, ScriptInfoSmall *para return TRUE; } -bool8 sub_809D8C0(Action *param_1, s32 *param_2, s16 index, DebugLocation *debug) +bool8 ExecutePredefinedScript(Action *param_1, s32 *param_2, s16 index, DebugLocation *debug) { ScriptInfoSmall auStack28; - sub_809D6E4(param_1,&auStack28,index); + GetPredefinedScript(param_1,&auStack28,index); return GroundScript_ExecutePP(param_1, param_2, &auStack28, debug); } -u8 sub_809D8EC(Action *param_1, s16 param_2) +u8 GroundScriptCheckLockCondition(Action *param_1, s16 param_2) { s32 param_2_s32; param_2_s32 = param_2; - if ((param_2 == 0) && (sub_809A750() == 0)) { - param_1->scriptData.script.ptr = sub_80A2460(param_1, 0); + if ((param_2 == 0) && (IsTextboxOpen_809A750() == 0)) { + param_1->scriptData.script.ptr = ResolveJump(param_1, 0); return 0; } else { param_1->scriptData.unk22 = param_2_s32; param_1->scriptData.savedState = 2; - gUnknown_2039A36 = 1; + gAnyScriptLocked = 1; return 1; } } @@ -301,20 +301,20 @@ u8 sub_809D8EC(Action *param_1, s16 param_2) bool8 GroundScript_Cancel(Action *r0) { // NOTE: Will always return TRUE - return sub_809D770(r0, &gUnknown_81165C8); + return ActionResetScriptDataForDeletion(r0, &gUnknown_81165C8); } -u8 sub_809D940(void) +u8 GroundCancelAllEntities(void) { u8 ret; - ret = sub_80A8B74(); - ret |= sub_80AC378(); - ret |= sub_80AD290(); + ret = GroundLivesCancelAll(); + ret |= GroundObjectsCancellAll(); + ret |= GroundEffectsCancelAll(); return ret; } -bool8 sub_809D968(Action *param_1, s16 param_2) +bool8 GroundScriptNotify(Action *param_1, s16 param_2) { s16 sVar1; s16 sVar2; @@ -336,40 +336,40 @@ bool8 sub_809D968(Action *param_1, s16 param_2) return ret; } -void sub_809D9B8(s16 index) +void GroundScriptLockJumpZero(s16 index) { s32 index_s16 = index; - gUnknown_2039A38[index_s16] = 1; - gUnknown_2039B48[index_s16] = 0; - gUnknown_2039A36 = 1; + gScriptLocks[index_s16] = 1; + gUnlockBranchLabels[index_s16] = 0; + gAnyScriptLocked = 1; } -void sub_809D9E0(s16 index, s32 r1) +void GroundScriptLock(s16 index, s32 r1) { s32 index_s16 = index; - gUnknown_2039A38[index_s16] = 1; - gUnknown_2039B48[index_s16] = r1; - gUnknown_2039A36 = 1; + gScriptLocks[index_s16] = 1; + gUnlockBranchLabels[index_s16] = r1; + gAnyScriptLocked = 1; } -bool8 sub_809DA08(Action *param_1, s16 index, u32 param_3) +bool8 GroundScriptLockCond(Action *param_1, s16 index, u32 param_3) { s32 index_s32; index_s32 = index; - gUnknown_2039B48[index_s32] = param_3; + gUnlockBranchLabels[index_s32] = param_3; if (index_s32 == 0) { - if (sub_809A750() == 0) { + if (IsTextboxOpen_809A750() == 0) { return FALSE; } param_1->scriptData.unk22 = index_s32; } else { param_1->scriptData.unk22 = index_s32 | 0x80; - gUnknown_2039A38[index_s32] = 1; - gUnknown_2039AC0[index_s32] = 1; + gScriptLocks[index_s32] = 1; + gScriptLockConds[index_s32] = 1; } param_1->scriptData.savedState = 2; - gUnknown_2039A36 = 1; + gAnyScriptLocked = 1; return TRUE; } diff --git a/src/ground_script_1.c b/src/ground_script_1.c index 63b65ebe0..c854d4e89 100644 --- a/src/ground_script_1.c +++ b/src/ground_script_1.c @@ -72,29 +72,29 @@ void FatalError(void* loc, char* fmt, ...) __attribute__((noreturn)); // The return values are almost certainly NOT correct and will need to be rechecked when moving to header files u32 FlagCalc(); u32 FlagJudge(); -s32 sub_8001658(ScriptUnion832*, s32); -void sub_8001570(u8*, s16); -void sub_80015C0(u8*, s16); -u32 sub_8001784(ScriptUnion832*, s16, u16); -void sub_80018D8(s32, s32, s32); -void sub_800199C(u8*, s16, u32, s32); -u32 sub_8001AB0(); -void sub_8001B88(s16, s32*, s32*); +s32 GetScriptVarValue(ScriptUnion832*, s32); +void ResetScriptVarArray(u8*, s16); +void ClearScriptVarArray(u8*, s16); +u32 GetScriptVarArrayValue(ScriptUnion832*, s16, u16); +void SetScriptVarValue(s32, s32, s32); +void SetScriptVarArrayValue(u8*, s16, u32, s32); +u32 GetScriptVarArraySum(); +void GetScriptVarScenario(s16, s32*, s32*); u32 ScenarioCalc(s16, s32, s32); -u32 sub_8001CC4(); -u32 sub_8001D08(); -u32 sub_8001D44(); -void sub_800226C(u8*, s16, s32, u8); -void sub_80022A0(u8*, s16, s32, u8); +u32 ScriptVarScenarioBefore(); +u32 ScriptVarScenarioEqual(); +u32 ScriptVarScenarioAfter(); +void UpdateScriptVarWithImmediate(u8*, s16, s32, u8); +void UpdateScriptVarWithVar(u8*, s16, s32, u8); u32 sub_80022F8(); u32 sub_8002318(); u32 sub_80023E4(); u32 sub_80026CC(); void sub_80026E8(s16, bool8); char sub_8002984(s32, u8); -u32 sub_8002C60(); -u32 sub_8002D54(); -u8 sub_8002DF0(Position32*, Position32*, Position32*, Position32*); +u32 VecDirection8Radial(); +u32 SizedDeltaDirection4(); +u8 SizedDeltaDirection8(Position32*, Position32*, Position32*, Position32*); s32 sub_8009FB8(); bool8 sub_8021700(s32); @@ -132,7 +132,7 @@ u32 sub_809B028(); bool8 sub_809B1C0(s32, s32, char[12]); void sub_809B1D4(u8, s32, s32, char*); void sub_809C770(s16, s16); -s32 sub_809CBA4(u8); +s32 HasItemInInventory(u8); u32 sub_809CC90(); void sub_809D0BC(void); void sub_809D124(s32, s32, s32); @@ -145,9 +145,9 @@ void sub_809D1E4(s32, s32, s32); void sub_809D208(s32, Position32*, s32); void sub_809D220(s32, s32, s32); u32 sub_809D52C(); -bool8 sub_809D940(void); -void sub_809D9B8(s16); -s16 sub_80A4D7C(s32); +bool8 GroundCancelAllEntities(void); +void GroundScriptLockJumpZero(s16); +s16 GetAdjustedGroundMap(s32); s16 sub_80A7AE8(s16); void sub_80A87AC(s32, s32); void sub_80A8BD8(s16, s32*); @@ -162,12 +162,12 @@ s16 sub_80AC448(s16, Position32*); s32 sub_80AC49C(s16, Position32*); s16 sub_80AD360(s16, Position32*); s16 sub_80AD3B4(s16, Position32*); -u32 sub_80AD8B4(); -u32 sub_80AD914(); -void DeleteBlankGroundEvents(void); -void DeleteBlankGroundLives(void); -void DeleteBlankGroundObjects(void); -void DeleteBlankGroundEffects(void); +u32 GroundLink_GetPos(); +u32 GroundLink_GetArea(); +void DeleteGroundEvents(void); +void DeleteGroundLives(void); +void DeleteGroundObjects(void); +void DeleteGroundEffects(void); u32 sub_80A14E8(u32, u8, u32, u32); s16 HandleAction(void *, DebugLocation *); @@ -178,9 +178,9 @@ extern s16 gCurrentMap; extern s16 gUnknown_2039A32; extern s16 gUnknown_2039A34; -extern struct { char *unk0; s32 unk4; } gUnknown_2039D50[9]; +extern struct { char *unk0; s32 unk4; } gChoices[9]; extern char gUnknown_2039D98[12]; -extern int gUnknown_203B4AC; +extern int gNumChoices; extern FunctionScript gFunctionScriptTable[]; @@ -195,7 +195,7 @@ extern char gUnknown_8116684[]; extern char gUnknown_81166C0[]; extern char gUnknown_81166D8[]; -extern const CallbackData gUnknown_8116488; +extern const CallbackData gGroundScriptTriggerCallbacks; extern DebugLocation gUnknown_81166B4; extern DebugLocation gUnknown_81166F8; extern DebugLocation gUnknown_8116704; @@ -235,25 +235,25 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x02: { s32 arg = (s16)curCmd.arg1; - if (arg == -1) arg = (s16)sub_8001658(0, 19); + if (arg == -1) arg = (s16)GetScriptVarValue(0, 19); if (ScriptLoggingEnabled(TRUE)) { // " dungeon select %3d" Log(1, gUnknown_81165F4, arg); } if (arg != -1) { GroundMainRescueRequest(arg, curCmd.argShort); - action->scriptData.script.ptr = sub_80A2460(action, 1); + action->scriptData.script.ptr = ResolveJump(action, 1); } else { - action->scriptData.script.ptr = sub_80A2460(action, 0); + action->scriptData.script.ptr = ResolveJump(action, 0); } break; } case 0x03: { if ((s8)sub_8021700(curCmd.arg1)) { - action->scriptData.script.ptr = sub_80A2460(action, -1); + action->scriptData.script.ptr = ResolveJump(action, -1); } else { sub_8098D80(curCmd.argShort); - action->scriptData.script.ptr = sub_80A2460(action, 0); + action->scriptData.script.ptr = ResolveJump(action, 0); } break; } @@ -267,7 +267,7 @@ s32 ExecuteScriptCommand(Action *action) { } return 2; // do action } else { - sub_80018D8(0, 18, sub_80A26B8((s16)curCmd.arg1)); + SetScriptVarValue(0, 18, sub_80A26B8((s16)curCmd.arg1)); action->scriptData.branchDiscriminant = 1; return 2; // do action } @@ -284,7 +284,7 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } } else { - sub_80018D8(0, 19, curCmd.arg1); + SetScriptVarValue(0, 19, curCmd.arg1); action->scriptData.branchDiscriminant = 1; return 2; } @@ -296,9 +296,9 @@ s32 ExecuteScriptCommand(Action *action) { case 0x07: { s32 tmp = (s16)curCmd.arg1; if (tmp == -1) { - tmp = (s16)sub_8001658(0, 19); + tmp = (s16)GetScriptVarValue(0, 19); } else { - sub_80018D8(0, 19, tmp); + SetScriptVarValue(0, 19, tmp); } if (ScriptLoggingEnabled(TRUE)) { Log(1, gUnknown_811660C, tmp); @@ -314,7 +314,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x08: case 0x09: { if (curCmd.op == 0x08) { gCurrentMap = curCmd.arg1; - gUnknown_2039A32 = sub_80A4D7C((s16)curCmd.arg1); + gUnknown_2039A32 = GetAdjustedGroundMap((s16)curCmd.arg1); gUnknown_2039A34 = gUnknown_2039A32; if (ScriptLoggingEnabled(TRUE)) { // " map select %3d %3d[%s]" @@ -330,14 +330,14 @@ s32 ExecuteScriptCommand(Action *action) { gGroundConversion_811BAF4[gCurrentMap].text); } } - sub_80018D8(0,0x10,gCurrentMap); - sub_80018D8(0,0x11,gGroundConversion_811BAF4[gCurrentMap].unk2); + SetScriptVarValue(0,0x10,gCurrentMap); + SetScriptVarValue(0,0x11,gGroundConversion_811BAF4[gCurrentMap].unk2); GroundSprite_Reset(gUnknown_2039A32); sub_809D0BC(); - DeleteBlankGroundEvents(); - DeleteBlankGroundLives(); - DeleteBlankGroundObjects(); - DeleteBlankGroundEffects(); + DeleteGroundEvents(); + DeleteGroundLives(); + DeleteGroundObjects(); + DeleteGroundEffects(); sub_809C770(gCurrentMap, gGroundConversion_811BAF4[gCurrentMap].unk2); GroundMap_Select(gUnknown_2039A32); GroundLink_Select(gUnknown_2039A32); @@ -348,7 +348,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x0a: { const DungeonInfo *tmp; DungeonLocation loc; - tmp = sub_80A2608((s16)curCmd.arg1); + tmp = GetDungeonInfo_80A2608((s16)curCmd.arg1); gUnknown_2039A34 = gUnknown_2039A32 = gCurrentMap = (s16)curCmd.arg2; if (ScriptLoggingEnabled(TRUE)) { // " dungeon select %3d %3d[%s]" @@ -357,10 +357,10 @@ s32 ExecuteScriptCommand(Action *action) { } GroundSprite_Reset(gUnknown_2039A32); sub_809D0BC(); - DeleteBlankGroundEvents(); - DeleteBlankGroundLives(); - DeleteBlankGroundObjects(); - DeleteBlankGroundEffects(); + DeleteGroundEvents(); + DeleteGroundLives(); + DeleteGroundObjects(); + DeleteGroundEffects(); loc.id = tmp->dungeonIndex; loc.floor = curCmd.argShort; GroundMap_SelectDungeon(gUnknown_2039A32, &loc, curCmd.argByte); @@ -524,21 +524,21 @@ s32 ExecuteScriptCommand(Action *action) { s32 tmp = (s8)curCmd.argByte < 0 ? scriptData->script.sector : (s8)curCmd.argByte; sector = tmp; } - map = sub_80A4D7C(map); + map = GetAdjustedGroundMap(map); res = curCmd.op == 0x1e; GroundMap_ExecuteStation(map, group, sector, res); if (gUnknown_2039A34 != map) { gUnknown_2039A34 = map; - sub_809D940(); + GroundCancelAllEntities(); if (action->unk8[0] != 0) return 4; // Fatal? } break; } case 0x1f: { - s32 a = (s16)sub_8001658(0, 19); - const DungeonInfo *ret1 = sub_80A2608(a); - s32 thing = sub_8001784(0, 48, a) == 0 ? ret1->unk6 : ret1->unk8; + s32 a = (s16)GetScriptVarValue(0, 19); + const DungeonInfo *ret1 = GetDungeonInfo_80A2608(a); + s32 thing = GetScriptVarArrayValue(0, 48, a) == 0 ? ret1->unk6 : ret1->unk8; // fakematch: this is almost certainly a range check of the form 0x37 <= a && a < 0x48 // but that loses the s32 -> u16 cast. Inlines, macros, or other schenanigans are likely involved if (!((u16)(a - 0x37) < 0x11) && (s16)sub_80A2750(a) == 1) { @@ -564,19 +564,19 @@ s32 ExecuteScriptCommand(Action *action) { break; case 1: { ScriptInfoSmall info1; - sub_809D710(action, &info1, curCmd.argShort); + GetFunctionScript(action, &info1, curCmd.argShort); GroundLives_ExecuteScript(action->unkC.arr[1], action->unk8, &info1); break; } case 2: { ScriptInfoSmall info2; - sub_809D710(action, &info2, curCmd.argShort); + GetFunctionScript(action, &info2, curCmd.argShort); GroundObject_ExecuteScript(action->unkC.arr[1], action->unk8, &info2); break; } case 3: { ScriptInfoSmall info3; - sub_809D710(action, &info3, curCmd.argShort); + GetFunctionScript(action, &info3, curCmd.argShort); GroundEffect_ExecuteScript(action->unkC.arr[1], action->unk8, &info3); break; } @@ -599,8 +599,8 @@ s32 ExecuteScriptCommand(Action *action) { action->callbacks->func08(action->parentObject, &pos2); sub_80A8FD8(ret, &pos3); sub_80A8F9C(ret, &pos4); - if ((tmp = (s8)sub_8002DF0(&pos3, &pos4, &pos1, &pos2)) != -1 || - (tmp = (s8)sub_8002D54(&pos1, &gUnknown_81164DC, &pos3, &gUnknown_81164DC)) != -1) { + if ((tmp = (s8)SizedDeltaDirection8(&pos3, &pos4, &pos1, &pos2)) != -1 || + (tmp = (s8)SizedDeltaDirection4(&pos1, &gUnknown_81164DC, &pos3, &gUnknown_81164DC)) != -1) { sub_80A9090(ret, tmp); } } @@ -673,7 +673,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x2c: { if (!(s8)sub_809A768()) break; sub_80A87AC(0, 10); - if ((s8)sub_809D8EC(action, 0)) return 2; + if ((s8)GroundScriptCheckLockCondition(action, 0)) return 2; break; } case 0x30: { @@ -782,20 +782,20 @@ s32 ExecuteScriptCommand(Action *action) { } if (ret) { sub_80A87AC(0, 10); - if ((s8)sub_809D8EC(action, 0)) return 2; + if ((s8)GroundScriptCheckLockCondition(action, 0)) return 2; } break; } case 0x39: { if ((s8)sub_809AF6C(curCmd.argShort, curCmd.argPtr) && curCmd.argShort >= 0) { sub_80A87AC(0, 10); - if ((s8)sub_809D8EC(action, 0)) return 2; + if ((s8)GroundScriptCheckLockCondition(action, 0)) return 2; } break; } case 0x3a: { sub_809AFC8((u8)curCmd.argByte > 0, curCmd.arg1, (s16)curCmd.arg2, curCmd.argPtr); - if ((s8)sub_809D8EC(action, 1)) { + if ((s8)GroundScriptCheckLockCondition(action, 1)) { sub_80A87AC(0, 11); return 2; } @@ -929,7 +929,7 @@ s32 ExecuteScriptCommand(Action *action) { Position32 posOut1; Position32 posOut2; action->callbacks->func0C(action->parentObject, &posIn); - sub_80AD914(curCmd.argShort, &posOut1, &posOut2, &posIn); + GroundLink_GetArea(curCmd.argShort, &posOut1, &posOut2, &posIn); action->callbacks->func20(action->parentObject, &posOut1, &posOut2); break; } @@ -991,7 +991,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x5b: { Position32 unk; action->callbacks->func0C(action->parentObject, &unk); - sub_80AD8B4((s16)curCmd.arg1, &unk); + GroundLink_GetPos((s16)curCmd.arg1, &unk); action->callbacks->func24(action->parentObject, &unk); // landing end of unwanted tailmerge scriptData->unk2A = (u8)curCmd.argByte; return 2; @@ -999,7 +999,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x5c: { Position32 pos, pos1, pos2; action->callbacks->func0C(action->parentObject, &pos); - sub_80AD914((s16)curCmd.arg1, &pos1, &pos2, &pos); + GroundLink_GetArea((s16)curCmd.arg1, &pos1, &pos2, &pos); pos.x = pos1.x + OtherRandInt(pos2.x - pos1.x); pos.y = pos1.y + OtherRandInt(pos2.y - pos1.y); action->callbacks->func24(action->parentObject, &pos); @@ -1021,10 +1021,10 @@ s32 ExecuteScriptCommand(Action *action) { Position32 pos; s32 height; s32 dir; - pos.x = sub_8001784(0, 0x32, (u16)curCmd.arg1); // POSITION_X - pos.y = sub_8001784(0, 0x33, (u16)curCmd.arg1); // POSITION_Y - height = sub_8001784(0, 0x34, (u16)curCmd.arg1); // POSITION_HEIGHT - dir = (s8)sub_8001784(0, 0x35, (u16)curCmd.arg1); // POSITION_DIRECTION + pos.x = GetScriptVarArrayValue(0, 0x32, (u16)curCmd.arg1); // POSITION_X + pos.y = GetScriptVarArrayValue(0, 0x33, (u16)curCmd.arg1); // POSITION_Y + height = GetScriptVarArrayValue(0, 0x34, (u16)curCmd.arg1); // POSITION_HEIGHT + dir = (s8)GetScriptVarArrayValue(0, 0x35, (u16)curCmd.arg1); // POSITION_DIRECTION action->callbacks->func24(action->parentObject, &pos); action->callbacks->func28(action->parentObject, height); action->scriptData.unk26 = dir; @@ -1044,10 +1044,10 @@ s32 ExecuteScriptCommand(Action *action) { action->callbacks->func0C(action->parentObject, &pos); action->callbacks->func10(action->parentObject, &height, &wat); action->callbacks->func14(action->parentObject, &dir); - sub_800199C(0, 0x32, (u16)curCmd.arg1, pos.x); - sub_800199C(0, 0x33, (u16)curCmd.arg1, pos.y); - sub_800199C(0, 0x34, (u16)curCmd.arg1, height); - sub_800199C(0, 0x35, (u16)curCmd.arg1, dir); + SetScriptVarArrayValue(0, 0x32, (u16)curCmd.arg1, pos.x); + SetScriptVarArrayValue(0, 0x33, (u16)curCmd.arg1, pos.y); + SetScriptVarArrayValue(0, 0x34, (u16)curCmd.arg1, height); + SetScriptVarArrayValue(0, 0x35, (u16)curCmd.arg1, dir); break; } case 0x60: { @@ -1073,21 +1073,21 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x63: case 0x6b: { action->callbacks->func0C(action->parentObject, &scriptData->pos2); - sub_80AD8B4((s16)curCmd.arg1, &scriptData->pos2); + GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = -1; return 2; } case 0x64: case 0x6c: { action->callbacks->func0C(action->parentObject, &scriptData->pos2); - sub_80AD8B4((s16)curCmd.arg1, &scriptData->pos2); + GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x65: case 0x6d: { action->callbacks->func0C(action->parentObject, &scriptData->pos2); - sub_80AD8B4((s16)curCmd.arg1, &scriptData->pos2); + GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = OtherRandInt((u8)curCmd.argByte); return 2; @@ -1143,7 +1143,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x74: case 0x7a: case 0x80: case 0x86: { action->callbacks->func0C(action->parentObject, &scriptData->pos1); scriptData->pos2 = scriptData->pos1; - sub_80AD8B4((s16)curCmd.arg1, &scriptData->pos2); + GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); if (curCmd.op == 0x80 || curCmd.op == 0x86) { scriptData->unk2A = sub_8009FB8(scriptData->pos2.x - scriptData->pos1.x, scriptData->pos2.y - scriptData->pos1.y) / curCmd.argShort; if (scriptData->unk2A <= 0) scriptData->unk2A = 1; @@ -1155,7 +1155,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x75: case 0x7b: case 0x81: case 0x87: { s32 cap = curCmd.arg1 * 2 - 1; action->callbacks->func0C(action->parentObject, &scriptData->pos2); - sub_80AD8B4((s16)curCmd.arg2, &scriptData->pos2); + GroundLink_GetPos((s16)curCmd.arg2, &scriptData->pos2); scriptData->pos2.x = scriptData->pos2.x + ((OtherRandInt(cap) - curCmd.argShort) << 8); scriptData->pos2.y = scriptData->pos2.y + ((OtherRandInt(cap) - curCmd.argShort) << 8); if (curCmd.op == 0x81 || curCmd.op == 0x87) { @@ -1255,7 +1255,7 @@ s32 ExecuteScriptCommand(Action *action) { flag = TRUE; action->callbacks->func0C(action->parentObject, &pos1); action->callbacks->func08(action->parentObject, &pos2); - sub_80AD8B4((s16)curCmd.arg1, &pos1); + GroundLink_GetPos((s16)curCmd.arg1, &pos1); break; } } @@ -1264,12 +1264,12 @@ s32 ExecuteScriptCommand(Action *action) { int tmp; action->callbacks->func0C(action->parentObject, &pos3); action->callbacks->func08(action->parentObject, &pos4); - ret = sub_8002DF0(&pos3, &pos4, &pos1, &pos2); // wtf + ret = SizedDeltaDirection8(&pos3, &pos4, &pos1, &pos2); // wtf *&dir = ret; tmp = -1; if (dir == tmp) { - dir = sub_8002D54(&pos3, &gUnknown_81164DC, &pos1, &gUnknown_81164DC); + dir = SizedDeltaDirection4(&pos3, &gUnknown_81164DC, &pos1, &gUnknown_81164DC); } if (dir == tmp) { action->callbacks->func14(action->parentObject, &dir); @@ -1456,23 +1456,23 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } case 0xa4: { - sub_8001570(scriptData->unk50[0].arr, curCmd.argShort); + ResetScriptVarArray(scriptData->unk50[0].arr, curCmd.argShort); break; } case 0xa5: { - sub_80015C0(scriptData->unk50[0].arr, curCmd.argShort); + ClearScriptVarArray(scriptData->unk50[0].arr, curCmd.argShort); break; } case 0xa6: { - sub_800226C(scriptData->unk50[0].arr, curCmd.argShort, curCmd.arg1, curCmd.argByte); + UpdateScriptVarWithImmediate(scriptData->unk50[0].arr, curCmd.argShort, curCmd.arg1, curCmd.argByte); break; } case 0xa7: { - sub_80022A0(scriptData->unk50[0].arr, curCmd.argShort, (s16)curCmd.arg1, curCmd.argByte); + UpdateScriptVarWithVar(scriptData->unk50[0].arr, curCmd.argShort, (s16)curCmd.arg1, curCmd.argByte); break; } case 0xa8: { - sub_800199C(scriptData->unk50[0].arr, curCmd.argShort, (u16)curCmd.arg1, curCmd.arg2); + SetScriptVarArrayValue(scriptData->unk50[0].arr, curCmd.argShort, (u16)curCmd.arg1, curCmd.arg2); break; } case 0xa9: { @@ -1481,17 +1481,17 @@ s32 ExecuteScriptCommand(Action *action) { } case 0xaa: { s32 a, b; - sub_8001B88(curCmd.argShort, &a, &b); + GetScriptVarScenario(curCmd.argShort, &a, &b); ScenarioCalc(curCmd.argShort, a, b+1); break; } case 0xab: { - sub_80018D8(0, 19, curCmd.arg1); - sub_80018D8(0, 22, curCmd.argShort); + SetScriptVarValue(0, 19, curCmd.arg1); + SetScriptVarValue(0, 22, curCmd.argShort); break; } case 0xac: { - sub_80018D8(0, 28, curCmd.argShort); + SetScriptVarValue(0, 28, curCmd.argShort); break; } case 0xad: { @@ -1520,80 +1520,80 @@ s32 ExecuteScriptCommand(Action *action) { } case 0xb3: { if ((u8)sub_80022F8(0, curCmd.argShort, curCmd.arg1, 2)) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xb4: { if ((s8)sub_80022F8(scriptData->unk50, (s16)curCmd.arg1, curCmd.arg2, (u8)curCmd.argByte)) { - scriptData->script.ptr = sub_80A242C(action, curCmd.argShort); + scriptData->script.ptr = FindLabel(action, curCmd.argShort); } break; } case 0xb5: { if ((s8)sub_8002318(scriptData->unk50, (s16)curCmd.arg1, (s16)curCmd.arg2, (u8)curCmd.argByte)) { - scriptData->script.ptr = sub_80A242C(action, curCmd.argShort); + scriptData->script.ptr = FindLabel(action, curCmd.argShort); } break; } case 0xb6: { - if (sub_8001784(scriptData->unk50, (s16)curCmd.arg1, (u16)curCmd.arg2)) { - scriptData->script.ptr = sub_80A242C(action, curCmd.argShort); + if (GetScriptVarArrayValue(scriptData->unk50, (s16)curCmd.arg1, (u16)curCmd.arg2)) { + scriptData->script.ptr = FindLabel(action, curCmd.argShort); } break; } case 0xb7: { - if ((s8)FlagJudge(sub_8001AB0(scriptData->unk50, (s16)curCmd.arg1), curCmd.arg2, (u8)curCmd.argByte)) { - scriptData->script.ptr = sub_80A242C(action, curCmd.argShort); + if ((s8)FlagJudge(GetScriptVarArraySum(scriptData->unk50, (s16)curCmd.arg1), curCmd.arg2, (u8)curCmd.argByte)) { + scriptData->script.ptr = FindLabel(action, curCmd.argShort); } break; } case 0xb8: { - if ((s8)sub_8001CC4(curCmd.argShort, curCmd.arg1, curCmd.arg2)) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + if ((s8)ScriptVarScenarioBefore(curCmd.argShort, curCmd.arg1, curCmd.arg2)) { + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xb9: { - if ((s8)sub_8001D08(curCmd.argShort, curCmd.arg1, curCmd.arg2)) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + if ((s8)ScriptVarScenarioEqual(curCmd.argShort, curCmd.arg1, curCmd.arg2)) { + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xba: { - if ((s8)sub_8001D44(curCmd.argShort, curCmd.arg1, curCmd.arg2)) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + if ((s8)ScriptVarScenarioAfter(curCmd.argShort, curCmd.arg1, curCmd.arg2)) { + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xbb: { if ((s8)sub_80023E4(curCmd.argShort)) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xbc: { if ((s8)sub_8098100((u8)curCmd.argShort)) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xbd: { if ((s8)sub_80026CC((s16)curCmd.arg1)) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xbf: { - if (sub_809CBA4(curCmd.argShort) > 0) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + if (HasItemInInventory(curCmd.argShort) > 0) { + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } break; } case 0xbe: { if (action->unk8[0] == 1) { if ((s8)sub_80A8C98(action->unk8[1])) { - scriptData->script.ptr = sub_80A242C(action, (u8)curCmd.argByte); + scriptData->script.ptr = FindLabel(action, (u8)curCmd.argByte); } } break; @@ -1609,20 +1609,20 @@ s32 ExecuteScriptCommand(Action *action) { Position32 pos, pos2, pos3; switch (curCmd.op) { case 0xc0: { - val = sub_8001658(scriptData->unk50, curCmd.argShort); + val = GetScriptVarValue(scriptData->unk50, curCmd.argShort); break; } case 0xc1: { val = FlagCalc( - sub_8001658(scriptData->unk50, curCmd.argShort), + GetScriptVarValue(scriptData->unk50, curCmd.argShort), curCmd.arg1, (u8)curCmd.argByte); break; } case 0xc2: { val = FlagCalc( - sub_8001658(scriptData->unk50, curCmd.argShort), - sub_8001658(scriptData->unk50, (s16)curCmd.arg1), + GetScriptVarValue(scriptData->unk50, curCmd.argShort), + GetScriptVarValue(scriptData->unk50, (s16)curCmd.arg1), (u8)curCmd.argByte); break; } @@ -1631,11 +1631,11 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0xc4: { - val = sub_8001784(0, curCmd.argShort, 0); + val = GetScriptVarArrayValue(0, curCmd.argShort, 0); break; } case 0xc5: { - val = sub_8001784(0, curCmd.argShort, 1); + val = GetScriptVarArrayValue(0, curCmd.argShort, 1); break; } case 0xc6: { @@ -1651,10 +1651,10 @@ s32 ExecuteScriptCommand(Action *action) { case 0xca: { action->callbacks->func0C(action->parentObject, &pos); pos2 = pos; - sub_80AD8B4((s16)curCmd.arg1, &pos2); + GroundLink_GetPos((s16)curCmd.arg1, &pos2); pos3.x = pos2.x - pos.x; pos3.y = pos2.y - pos.y; - val = (s8)sub_8002C60(&pos3); + val = (s8)VecDirection8Radial(&pos3); break; } case 0xc8: { @@ -1665,9 +1665,9 @@ s32 ExecuteScriptCommand(Action *action) { action->callbacks->func08(action->parentObject, &pos2); sub_80A8FD8(tmp, &pos3); sub_80A8F9C(tmp, &pos4); - val = (s8)sub_8002DF0(&pos1, &pos2, &pos3, &pos4); + val = (s8)SizedDeltaDirection8(&pos1, &pos2, &pos3, &pos4); if (val == -1) { - val = (s8)sub_8002D54(&pos1, &gUnknown_81164DC, &pos3, &gUnknown_81164DC); + val = (s8)SizedDeltaDirection4(&pos1, &gUnknown_81164DC, &pos3, &gUnknown_81164DC); } } else { val = -1; @@ -1681,9 +1681,9 @@ s32 ExecuteScriptCommand(Action *action) { action->callbacks->func0C(action->parentObject, &pos1); action->callbacks->func08(action->parentObject, &pos2); sub_80A8FD8(tmp, &pos3); - val = (s8)sub_8002DF0(&pos1, &pos2, &pos3, &gUnknown_81164DC); + val = (s8)SizedDeltaDirection8(&pos1, &pos2, &pos3, &gUnknown_81164DC); if (val == -1) { - val = (s8)sub_8002D54(&pos1, &gUnknown_81164DC, &pos3, &gUnknown_81164DC); + val = (s8)SizedDeltaDirection4(&pos1, &gUnknown_81164DC, &pos3, &gUnknown_81164DC); } } else { val = -1; @@ -1700,11 +1700,11 @@ s32 ExecuteScriptCommand(Action *action) { FatalError(&gUnknown_81166B4, gUnknown_81166C0, curCmd.op); } } - scriptData->script.ptr = sub_80A2460(action, val); + scriptData->script.ptr = ResolveJump(action, val); break; } case 0xcf: { - scriptData->branchDiscriminant = sub_8001658(scriptData->unk50, curCmd.argShort); + scriptData->branchDiscriminant = GetScriptVarValue(scriptData->unk50, curCmd.argShort); while (scriptData->script.ptr->op == 0xd0) { if (scriptData->script.ptr->argShort == scriptData->branchDiscriminant) return 2; @@ -1718,11 +1718,11 @@ s32 ExecuteScriptCommand(Action *action) { } case 0xd2 ... 0xd8: { char *out = curCmd.argPtr; - gUnknown_203B4AC = 0; + gNumChoices = 0; scriptData->branchDiscriminant = 0; switch(curCmd.op) { case 0xd6: case 0xd7: case 0xd8: { - s32 disc = sub_8001658(scriptData->unk50, (s16)curCmd.arg2); + s32 disc = GetScriptVarValue(scriptData->unk50, (s16)curCmd.arg2); for (; scriptData->script.ptr->op == 0xd0; scriptData->script.ptr++, scriptData->branchDiscriminant++) { if (scriptData->script.ptr->argShort == disc) out = scriptData->script.ptr->argPtr; @@ -1734,35 +1734,35 @@ s32 ExecuteScriptCommand(Action *action) { } if (!out) out = gUnknown_81166D8; // "" for (; scriptData->script.ptr->op == 0xd9; scriptData->script.ptr++) { - gUnknown_2039D50[gUnknown_203B4AC].unk0 = scriptData->script.ptr->argPtr; - gUnknown_2039D50[gUnknown_203B4AC].unk4 = gUnknown_203B4AC + 1; - gUnknown_203B4AC++; + gChoices[gNumChoices].unk0 = scriptData->script.ptr->argPtr; + gChoices[gNumChoices].unk4 = gNumChoices + 1; + gNumChoices++; } - if (gUnknown_203B4AC <= 0) break; - gUnknown_2039D50[gUnknown_203B4AC].unk0 = NULL; - gUnknown_2039D50[gUnknown_203B4AC].unk4 = curCmd.argShort; + if (gNumChoices <= 0) break; + gChoices[gNumChoices].unk0 = NULL; + gChoices[gNumChoices].unk4 = curCmd.argShort; switch (curCmd.op) { case 0xd2: case 0xd3: case 0xd6: { - sub_809B028(gUnknown_2039D50, (u8)curCmd.argByte > 0, -1, 0, (s16)curCmd.arg1, out); + sub_809B028(gChoices, (u8)curCmd.argByte > 0, -1, 0, (s16)curCmd.arg1, out); break; } case 0xd4: case 0xd7: { - sub_809B028(gUnknown_2039D50, (u8)curCmd.argByte > 0, -1, 1, (s16)curCmd.arg1, out); + sub_809B028(gChoices, (u8)curCmd.argByte > 0, -1, 1, (s16)curCmd.arg1, out); break; } case 0xd5: case 0xd8: { - sub_809B028(gUnknown_2039D50, (u8)curCmd.argByte > 0, -1, 2, (s16)curCmd.arg1, out); + sub_809B028(gChoices, (u8)curCmd.argByte > 0, -1, 2, (s16)curCmd.arg1, out); break; } } - if ((s8)sub_809D8EC(action, 1)) { + if ((s8)GroundScriptCheckLockCondition(action, 1)) { sub_80A87AC(0, 11); return 2; } break; } case 0xda: { - if (sub_809D8EC(action, 1)) { + if (GroundScriptCheckLockCondition(action, 1)) { return 2; } break; @@ -1780,18 +1780,18 @@ s32 ExecuteScriptCommand(Action *action) { } case 0xe3: { scriptData->branchDiscriminant = curCmd.argShort; - if (sub_809D8EC(action, curCmd.argShort)) { + if (GroundScriptCheckLockCondition(action, curCmd.argShort)) { return 2; } break; } case 0xe4: { - sub_809D9B8(curCmd.argShort); + GroundScriptLockJumpZero(curCmd.argShort); break; } case 0xe5: { scriptData->branchDiscriminant = curCmd.argShort; - if ((s8)sub_809DA08(action, curCmd.argShort, curCmd.argByte)) { + if ((s8)GroundScriptLockCond(action, curCmd.argShort, curCmd.argByte)) { return 2; } break; @@ -1800,7 +1800,7 @@ s32 ExecuteScriptCommand(Action *action) { scriptData->savedScript = scriptData->script; } //fallthrough case 0xe7: { // ??? - scriptData->script.ptr = sub_80A242C(action, curCmd.argShort); + scriptData->script.ptr = FindLabel(action, curCmd.argShort); break; } case 0xe8: { // SAVE_AND_TRIGGER @@ -1833,8 +1833,8 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0xec: { - gUnknown_2039A34 = sub_80A4D7C((s16)sub_8001658(scriptData->unk50, curCmd.argShort)); - sub_809D940(); + gUnknown_2039A34 = GetAdjustedGroundMap((s16)GetScriptVarValue(scriptData->unk50, curCmd.argShort)); + GroundCancelAllEntities(); GroundMap_ExecuteEnter(gUnknown_2039A34); break; } @@ -1882,15 +1882,15 @@ UNUSED bool8 GroundScript_ExecuteTrigger(s16 r0) if(ptr->unk2 != 0xB) return FALSE; - InitActionWithParams(&action, &gUnknown_8116488, NULL, 0, 0); - sub_809D710(NULL, &scriptInfo, r0); + InitActionWithParams(&action, &gGroundScriptTriggerCallbacks, NULL, 0, 0); + GetFunctionScript(NULL, &scriptInfo, r0); GroundScript_ExecutePP(&action, NULL, &scriptInfo, &gUnknown_81166F8); action.scriptData.savedScript = action.scriptData.script; action.scriptData.savedScript.ptr = &gUnknown_81164E4; action.scriptData.savedScript.ptr2 = &gUnknown_81164E4; ret = HandleAction(&action, &gUnknown_8116704); - sub_809D648(&action); + InitAction2(&action); if(ret == 0) return TRUE; else diff --git a/src/ground_script_2.c b/src/ground_script_2.c index 2ecf2440d..5126e8036 100644 --- a/src/ground_script_2.c +++ b/src/ground_script_2.c @@ -3,18 +3,18 @@ #include "ground_map_1.h" #include "ground_script.h" -s32 sub_8001658(ScriptUnion832*, s32); +s32 GetScriptVarValue(ScriptUnion832*, s32); u8 FlagJudge(s32 r0, s32 r1, u32 operation); -extern u8 gUnknown_2039A36; -extern u8 gUnknown_2039A38[]; -extern u32 gUnknown_2039B48[]; -extern u8 gUnknown_2039AC0[]; +extern u8 gAnyScriptLocked; +extern u8 gScriptLocks[]; +extern u32 gUnlockBranchLabels[]; +extern u8 gScriptLockConds[]; extern u8 gUnknown_8116848[]; -s32 sub_80A8B1C(s16); -s32 sub_80AC320(s16); -s32 sub_80AD238(s16); +s32 GroundLivesNotifyAll(s16); +s32 GroundObjectsNotifyAll(s16); +s32 GroundEffectsNotifyAll(s16); // TODO: this is still WIP @@ -24,41 +24,41 @@ s32 sub_80AD238(s16); // u8 temp; // s16 temp_s16; // -// if(gUnknown_2039A36 != 0) +// if(gAnyScriptLocked != 0) // { -// gUnknown_2039A36 = 0; +// gAnyScriptLocked = 0; // for(index = 0; index < 0x81; index++) // { -// if(gUnknown_2039A38[index] != 0) +// if(gScriptLocks[index] != 0) // { // Log(1, gUnknown_8116848, index); -// temp = sub_80A4D2C(index); -// temp |= sub_80A8B1C(index); -// temp |= sub_80AC320(index); -// temp |= sub_80AD238(index); +// temp = GroundMapNotifyAll(index); +// temp |= GroundLivesNotifyAll(index); +// temp |= GroundObjectsNotifyAll(index); +// temp |= GroundEffectsNotifyAll(index); // -// if(gUnknown_2039AC0[index] != 0) +// if(gScriptLockConds[index] != 0) // { // if (temp != 0) // { // temp_s16 = index; // temp_s16 |= 0x80; -// sub_80A4D2C(temp_s16); -// sub_80A8B1C(temp_s16); -// sub_80AC320(temp_s16); -// sub_80AD238(temp_s16); -// gUnknown_2039AC0[index] = 0; +// GroundMapNotifyAll(temp_s16); +// GroundLivesNotifyAll(temp_s16); +// GroundObjectsNotifyAll(temp_s16); +// GroundEffectsNotifyAll(temp_s16); +// gScriptLockConds[index] = 0; // } // } // else { -// gUnknown_2039A38[index] = 0; +// gScriptLocks[index] = 0; // } // } // } // } // } -ScriptCommand *sub_80A242C(Action *action, s32 r1) +ScriptCommand *FindLabel(Action *action, s32 r1) { ScriptCommand script; ScriptCommand *scriptPtr2; @@ -79,7 +79,7 @@ ScriptCommand *sub_80A242C(Action *action, s32 r1) } } -ScriptCommand *sub_80A2460(Action *action, s32 r1) +ScriptCommand *ResolveJump(Action *action, s32 r1) { ScriptCommand script; ScriptCommand *scriptPtr; @@ -93,18 +93,18 @@ ScriptCommand *sub_80A2460(Action *action, s32 r1) if (script.op == 0xCC) { if(FlagJudge(r1, script.arg1, 0x2)) - return sub_80A242C(action, script.argShort); + return FindLabel(action, script.argShort); } else if (script.op == 0xCD) { if(FlagJudge(r1, script.arg1, script.argByte)) - return sub_80A242C(action, script.argShort); + return FindLabel(action, script.argShort); } else if (script.op == 0xCE) { - temp = sub_8001658(action->scriptData.unk50, (s16)script.arg1); + temp = GetScriptVarValue(action->scriptData.unk50, (s16)script.arg1); if(FlagJudge(r1, temp, script.argByte)) - return sub_80A242C(action, script.argShort); + return FindLabel(action, script.argShort); } else { diff --git a/src/ground_sprite.c b/src/ground_sprite.c index 36be0e2e1..42b206ff8 100644 --- a/src/ground_sprite.c +++ b/src/ground_sprite.c @@ -38,7 +38,7 @@ extern const u8 *gUnknown_81178F4[]; extern void sub_809971C(u16, u8 *, s16); extern void sub_80997F4(u16, u16); // pokemon_2.s -extern void sub_808E53C(u32, u32); +extern void InitShadowSprites(u32, u32); // ground_sprite.s extern void sub_80A6460(void); @@ -89,7 +89,7 @@ void GroundSprite_Reset(s16 a0) gUnknown_2039DCE = 0; sub_80A6460(); - sub_808E53C(496, sub_80A4D48(uVar2) ? 3 : 2); + InitShadowSprites(496, sub_80A4D48(uVar2) ? 3 : 2); bee = &gUnknown_2039DB0; sub_8004E8C(bee); diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c index 40d6f5724..a1f7f3bc5 100644 --- a/src/gulpin_shop.c +++ b/src/gulpin_shop.c @@ -114,7 +114,7 @@ static void sub_801E980(void) { s32 index; - sub_8006518(sGulpinShopWork->unk12C); + RestoreUnkTextStruct_8006518(sGulpinShopWork->unk12C); switch (sGulpinShopWork->state) { case 2: @@ -131,7 +131,7 @@ static void sub_801E980(void) } ResetUnusedInputStruct(); - sub_800641C(sGulpinShopWork->unk12C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sGulpinShopWork->unk12C, TRUE, TRUE); } static void sub_801EA28(void) diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c index f0cf43809..3e6fff2fd 100644 --- a/src/gulpin_shop_801FB50.c +++ b/src/gulpin_shop_801FB50.c @@ -85,7 +85,7 @@ bool8 sub_801FB50(u32 mode) OpenedFile *faceFile; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); gUnknown_203B27C = MemoryAlloc(sizeof(unkStruct_203B27C), 0x8); gUnknown_203B27C->menuAction2 = 0; gUnknown_203B27C->menuAction3 = 0; @@ -201,7 +201,7 @@ static void sub_801FDC0(void) { s32 index; - sub_8006518(gUnknown_203B27C->unk180); + RestoreUnkTextStruct_8006518(gUnknown_203B27C->unk180); switch (gUnknown_203B27C->state) { case 0x2: @@ -210,21 +210,21 @@ static void sub_801FDC0(void) gUnknown_203B27C->unk180[2].unk0 = 0x80; gUnknown_203B27C->unk180[3] = gUnknown_80DC37C; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B27C->unk180, TRUE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, FALSE); break; case 0x11: sub_80205D0(); gUnknown_203B27C->unk180[2] = gUnknown_80DC334; sub_8012CAC(&gUnknown_203B27C->unk180[2], gUnknown_203B27C->unk7C); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); break; case 0x17: sub_802069C(); gUnknown_203B27C->unk180[2] = gUnknown_80DC334; sub_8012CAC(&gUnknown_203B27C->unk180[2], gUnknown_203B27C->unk7C); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); break; case 0x20: CreateGulpinLinkMenu(); @@ -232,14 +232,14 @@ static void sub_801FDC0(void) gUnknown_203B27C->unk180[2] = gUnknown_80DC34C; sub_8012CAC(&gUnknown_203B27C->unk180[2], gUnknown_203B27C->unk7C); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); break; default: for (index = 0; index < 4; index++) gUnknown_203B27C->unk180[index] = gUnknown_80DC31C; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B27C->unk180, TRUE, TRUE); break; } } @@ -266,19 +266,19 @@ static void sub_801FF28(void) break; case 3: gUnknown_203B27C->fallbackState = 0x1f; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_02],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_02],0,gUnknown_203B27C->unk17C,0x10d); break; case 4: gUnknown_203B27C->fallbackState = 0x1f; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_03],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_03],0,gUnknown_203B27C->unk17C,0x10d); break; case 5: gUnknown_203B27C->fallbackState = 0x1f; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_04],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_04],0,gUnknown_203B27C->unk17C,0x10d); break; case 6: gUnknown_203B27C->fallbackState = 0x1f; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_05],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_05],0,gUnknown_203B27C->unk17C,0x10d); break; case 7: sub_8020900(); @@ -294,23 +294,23 @@ static void sub_801FF28(void) break; case 9: gUnknown_203B27C->fallbackState = 1; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_22],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_22],0,gUnknown_203B27C->unk17C,0x10d); break; case 10: gUnknown_203B27C->fallbackState = 1; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_23],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_23],0,gUnknown_203B27C->unk17C,0x10d); break; case 0xb: gUnknown_203B27C->fallbackState = 1; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_24],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_24],0,gUnknown_203B27C->unk17C,0x10d); break; case 0xc: gUnknown_203B27C->fallbackState = 0xd; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_07],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_07],0,gUnknown_203B27C->unk17C,0x10d); break; case 0xe: gUnknown_203B27C->fallbackState = 0xf; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_08],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_08],0,gUnknown_203B27C->unk17C,0x10d); break; case 0xf: sub_8023868(2,0,0,10); @@ -330,7 +330,7 @@ static void sub_801FF28(void) break; case 0x14: gUnknown_203B27C->fallbackState = 0x15; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_09],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_09],0,gUnknown_203B27C->unk17C,0x10d); break; case 0x15: sub_801F428(gUnknown_203B27C->speciesNum,0); @@ -354,17 +354,17 @@ static void sub_801FF28(void) sub_8094060(gUnknown_203B27C->moves,gUnknown_203B27C->pokeStruct->moves); gUnknown_203B27C->fallbackState = 0x10; sub_8092C84(gAvailablePokemonNames,gUnknown_203B27C->unk1E); - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_10],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_10],0,gUnknown_203B27C->unk17C,0x10d); break; case 0x1a: sub_8094060(gUnknown_203B27C->moves,gUnknown_203B27C->pokeStruct->moves); gUnknown_203B27C->fallbackState = 0x10; if (gUnknown_203B27C->isNextMoveLinked) { - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_14],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_14],0,gUnknown_203B27C->unk17C,0x10d); } else { - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_13],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_13],0,gUnknown_203B27C->unk17C,0x10d); } break; case 0x1d: @@ -377,11 +377,11 @@ static void sub_801FF28(void) break; case 0x1b: gUnknown_203B27C->fallbackState = 0x10; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_15],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_15],0,gUnknown_203B27C->unk17C,0x10d); break; case 0x1c: gUnknown_203B27C->fallbackState = 0x10; - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_16],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_16],0,gUnknown_203B27C->unk17C,0x10d); break; case 0x1e: @@ -416,11 +416,11 @@ static void sub_801FF28(void) sub_8092C84(gUnknown_202DFE8,gUnknown_203B27C->unk20); if (gUnknown_203B27C->isNextMoveLinked) { - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_20],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_20],0,gUnknown_203B27C->unk17C,0x10d); } else { - sub_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_19],0,gUnknown_203B27C->unk17C,0x10d); + xxx_info_box_80141B4(gCommonGulpin[gUnknown_203B27C->mode][GULPIN_DLG_19],0,gUnknown_203B27C->unk17C,0x10d); } break; } diff --git a/src/hints_menu1.c b/src/hints_menu1.c index 8997df7d7..263b4d472 100644 --- a/src/hints_menu1.c +++ b/src/hints_menu1.c @@ -25,11 +25,11 @@ bool8 sub_801E3F0(u32 a0) sUnknown_203B264->unk34 = a0; sUnknown_203B264->unk38 = &sUnknown_203B264->unk3C[a0]; - sub_8006518(sUnknown_203B264->unk3C); + RestoreUnkTextStruct_8006518(sUnknown_203B264->unk3C); sUnknown_203B264->unk3C[sUnknown_203B264->unk34] = sUnknown_80DC0BC; sub_8012D08(sUnknown_203B264->unk38, 10); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B264->unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B264->unk3C, TRUE, TRUE); sub_8013818(&sUnknown_203B264->input, 5, 10, a0); sub_801E594(); DrawHintSelectionMenu(); @@ -74,7 +74,7 @@ s32 GetChosenHintIndex(void) void CreateHintSelectionScreen(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B264->unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B264->unk3C, FALSE, FALSE); sub_8013984(&sUnknown_203B264->input); sub_801E594(); DrawHintSelectionMenu(); @@ -88,7 +88,7 @@ void sub_801E54C(void) if (sUnknown_203B264 != NULL) { sUnknown_203B264->unk3C[sUnknown_203B264->unk34] = sUnknown_80DC0A0; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B264->unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B264->unk3C, TRUE, TRUE); MemoryFree(sUnknown_203B264); sUnknown_203B264 = NULL; } @@ -104,7 +104,7 @@ static void DrawHintSelectionMenu(void) s32 hintIndex; s32 y; - sub_8008C54(sUnknown_203B264->unk34); + CallPrepareTextbox_8008C54(sUnknown_203B264->unk34); sub_80073B8(sUnknown_203B264->unk34); PrintStringOnWindow(16, 0, sHints, sUnknown_203B264->unk34, 0); diff --git a/src/hints_menu2.c b/src/hints_menu2.c index 5f4194a24..a67422ae9 100644 --- a/src/hints_menu2.c +++ b/src/hints_menu2.c @@ -24,11 +24,11 @@ bool8 CreateHintDisplayScreen(u32 index) sUnknown_203B268 = MemoryAlloc(sizeof(struct_Sub80095E4_2), 8); sUnknown_203B268->s0.unk34 = 0; sUnknown_203B268->s0.unk38 = sUnknown_203B268->s0.unk3C; - sub_8006518(sUnknown_203B268->s0.unk3C); + RestoreUnkTextStruct_8006518(sUnknown_203B268->s0.unk3C); sUnknown_203B268->s0.unk3C[sUnknown_203B268->s0.unk34] = sUnknown_80DC0FC; sUnknown_203B268->s0.unk38->unk14 = &sUnknown_203B268->unk9C; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE); sub_8013818(&sUnknown_203B268->s0.input, 5, 1, sUnknown_203B268->s0.unk34); sUnknown_203B268->s0.input.unk1E = index; sub_801E714(); @@ -65,7 +65,7 @@ void DestroyHintDisplayScreen(void) if (sUnknown_203B268 != NULL) { sUnknown_203B268->s0.unk3C[sUnknown_203B268->s0.unk34] = sUnknown_80DC0E4; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE); MemoryFree(sUnknown_203B268); sUnknown_203B268 = NULL; } @@ -78,7 +78,7 @@ static void sub_801E76C(void) sUnknown_203B268->unk9C.f2 = 15; sUnknown_203B268->unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B268->s0.unk3C, TRUE, TRUE); } static void DisplayChosenHint(void) diff --git a/src/iq_skill_info_menu.c b/src/iq_skill_info_menu.c index d4674ec77..8724f3c58 100644 --- a/src/iq_skill_info_menu.c +++ b/src/iq_skill_info_menu.c @@ -12,7 +12,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gAvailablePokemonNames[]; // 202DF98 static EWRAM_DATA_2 struct IQSkillInfoMenu *sIQSkillInfoMenu = {0}; @@ -40,7 +40,7 @@ bool8 CreateIQSkillInfoMenu(u8 iqSkill) sIQSkillInfoMenu->unk24 = 0; sub_80140B4(sIQSkillInfoMenu->unk28); ResetUnusedInputStruct(); - sub_800641C(sIQSkillInfoMenu->unk28, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sIQSkillInfoMenu->unk28, TRUE, TRUE); SetIQSkillInfoMenuState(IQ_SKILL_INFO_MENU_INIT); return TRUE; } @@ -84,10 +84,10 @@ static void sub_801C6E4(void) switch (sIQSkillInfoMenu->state) { case IQ_SKILL_INFO_MENU_INIT: - sub_8008C54(sIQSkillInfoMenu->unk24); + CallPrepareTextbox_8008C54(sIQSkillInfoMenu->unk24); sub_80073B8(sIQSkillInfoMenu->unk24); skillName = GetIQSkillName(sIQSkillInfoMenu->chosenIQSkill); - strcpy(gUnknown_202DE58, skillName); + strcpy(gFormatItems, skillName); PrintFormatStringOnWindow(16, 0, sFmtMoveItem0, 0, 0); // {ARG_MOVE_ITEM_0} PrintStringOnWindow(8, 16, GetIQSkillDescription(sIQSkillInfoMenu->chosenIQSkill), sIQSkillInfoMenu->unk24, 0); sub_80073E0(sIQSkillInfoMenu->unk24); @@ -95,7 +95,7 @@ static void sub_801C6E4(void) sIQSkillInfoMenu->unk20 = 0; break; case 1: - sub_8008C54(sIQSkillInfoMenu->unk24); + CallPrepareTextbox_8008C54(sIQSkillInfoMenu->unk24); sub_80073B8(sIQSkillInfoMenu->unk24); preload = sIQSkillInfoMenu->unk10[sIQSkillInfoMenu->unk8]; strcpy(gAvailablePokemonNames, preload->pokeName); diff --git a/src/iq_skill_list_menu.c b/src/iq_skill_list_menu.c index 92171f88f..0381febaa 100644 --- a/src/iq_skill_list_menu.c +++ b/src/iq_skill_list_menu.c @@ -40,12 +40,12 @@ bool8 CreateIQSkillListMenu(s16 species, u32 index, u32 a2) sIQSkillListMenu->numIQSkills = GetNumAvailableIQSkills(sIQSkillListMenu->iqSkills, sIQSkillListMenu->pokeStruct->IQ); sIQSkillListMenu->s24.s0.unk34 = index; sIQSkillListMenu->s24.s0.unk38 = &sIQSkillListMenu->s24.s0.unk3C[index]; - sub_8006518(sIQSkillListMenu->s24.s0.unk3C); + RestoreUnkTextStruct_8006518(sIQSkillListMenu->s24.s0.unk3C); sIQSkillListMenu->s24.s0.unk3C[sIQSkillListMenu->s24.s0.unk34] = sUnknown_80DBDF0; sIQSkillListMenu->s24.s0.unk38->unk14 = &sIQSkillListMenu->s24.unk9C; sub_8012D08(sIQSkillListMenu->s24.s0.unk38, a2); ResetUnusedInputStruct(); - sub_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE); sub_8013818(&sIQSkillListMenu->s24.s0.input, sIQSkillListMenu->numIQSkills, a2, index); sub_801C440(); BuildIQSkillList(); @@ -87,7 +87,7 @@ s32 GetIQSkillSelection(void) void RedrawIQSkillListMenu(bool8 addCursor) { ResetUnusedInputStruct(); - sub_800641C(sIQSkillListMenu->s24.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, FALSE, FALSE); sIQSkillListMenu->s24.s0.input.unk22 = sIQSkillListMenu->numIQSkills; sub_8013984(&sIQSkillListMenu->s24.s0.input); sub_801C440(); @@ -102,7 +102,7 @@ void CleanIQSkillListMenu(void) if (sIQSkillListMenu != NULL) { sIQSkillListMenu->s24.s0.unk3C[sIQSkillListMenu->s24.s0.unk34] = sUnknown_80DBDD8; ResetUnusedInputStruct(); - sub_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE); MemoryFree(sIQSkillListMenu); sIQSkillListMenu = NULL; } @@ -115,7 +115,7 @@ static void sub_801C440(void) sIQSkillListMenu->s24.unk9C.f2 = 10; sIQSkillListMenu->s24.unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sIQSkillListMenu->s24.s0.unk3C, TRUE, TRUE); SUB_80095E4_CALL_2(sIQSkillListMenu->s24.s0); } @@ -127,7 +127,7 @@ void BuildIQSkillList(void) u32 skillIndex; s32 counter; - sub_8008C54(sIQSkillListMenu->s24.s0.unk34); + CallPrepareTextbox_8008C54(sIQSkillListMenu->s24.s0.unk34); sub_80073B8(sIQSkillListMenu->s24.s0.unk34); x = sIQSkillListMenu->s24.s0.input.unk1E * 8; x2 = x; diff --git a/src/iq_skill_menu.c b/src/iq_skill_menu.c index 1ae8f8303..f54c0a053 100644 --- a/src/iq_skill_menu.c +++ b/src/iq_skill_menu.c @@ -78,7 +78,7 @@ static void sub_801BFCC(void) { s32 i; - sub_8006518(sIQSkillMenu->unkC4); + RestoreUnkTextStruct_8006518(sIQSkillMenu->unkC4); if (sIQSkillMenu->state == 2) sIQSkillMenu->unkC4[2] = sUnknown_80DBDB0; @@ -88,7 +88,7 @@ static void sub_801BFCC(void) } ResetUnusedInputStruct(); - sub_800641C(sIQSkillMenu->unkC4, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sIQSkillMenu->unkC4, TRUE, TRUE); } static void HandleIQSkillMenuState(void) diff --git a/src/items.c b/src/items.c index e2b4738da..70160aa24 100644 --- a/src/items.c +++ b/src/items.c @@ -17,10 +17,10 @@ extern struct FileArchive gSystemFileArchive; extern const char gItemParaFileName[]; extern const char gUnknown_8109794[]; extern const char gUnknown_81097A4[]; -extern s32 gUnknown_81097B0[]; -extern u8 gUnknown_81097C4[]; +extern s32 gPowersOfTen[]; +extern u8 gHighDigits[]; extern u16 gGummiStatBoostLUT[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u32 gFormatData_202DE30; extern u8* gPtrTypeText; // ptr to "Type\0" extern u8* gPtrPPD0Text; // ptr to "PP {ARG_VALUE_0} \0" @@ -404,16 +404,16 @@ static void sub_8090F58(u8* a1, u8 *a2, Item *slot, const struct unkStruct_8090F } if (a4->unk6) { - sub_8090FEC(value, buffer, 1); + WriteHighDecimal(value, buffer, 1); sprintfStatic(a1, gUnknown_8109794, a2, a4->unk6, buffer); } else { - sub_8090FEC(value, buffer, 0); + WriteHighDecimal(value, buffer, 0); sprintfStatic(a1, gUnknown_81097A4, a2, buffer); } } -s32 sub_8090FEC(s32 a1, u8 *strbuf, u8 a3) +s32 WriteHighDecimal(s32 a1, u8 *strbuf, u8 a3) { s32 i, count; s32 cond = 0; @@ -423,8 +423,8 @@ s32 sub_8090FEC(s32 a1, u8 *strbuf, u8 a3) s32 div; div = 0; - while (a1 >= gUnknown_81097B0[i]) { - a1 -= gUnknown_81097B0[i]; + while (a1 >= gPowersOfTen[i]) { + a1 -= gPowersOfTen[i]; div++; } @@ -434,13 +434,13 @@ s32 sub_8090FEC(s32 a1, u8 *strbuf, u8 a3) if (div) { cond = 1; - *strbuf++ = gUnknown_81097C4[2 * div]; - *strbuf++ = (gUnknown_81097C4 + 1)[2 * div]; // weird staggered arrays... + *strbuf++ = gHighDigits[2 * div]; + *strbuf++ = (gHighDigits + 1)[2 * div]; // weird staggered arrays... count++; } else if (cond) { - *strbuf++ = gUnknown_81097C4[0]; - *strbuf++ = (gUnknown_81097C4 + 1)[0]; // weird staggered arrays... + *strbuf++ = gHighDigits[0]; + *strbuf++ = (gHighDigits + 1)[0]; // weird staggered arrays... count++; } else if (a3) { @@ -448,8 +448,8 @@ s32 sub_8090FEC(s32 a1, u8 *strbuf, u8 a3) } } - *strbuf++ = gUnknown_81097C4[2 * a1]; - *strbuf = (gUnknown_81097C4 + 1)[2 * a1]; + *strbuf++ = gHighDigits[2 * a1]; + *strbuf = (gHighDigits + 1)[2 * a1]; count += 1; strbuf[1] = 0; // null termination return count; @@ -669,7 +669,7 @@ u32 sub_80913E0(Item* slot, u32 a2, struct subStruct_203B240 ** a3) BufferItemName(buffer88, slot->id, NULL); if (slot->id == ITEM_TM_USED_TM) { // empty TM - BufferItemName(gUnknown_202DE58, (u8)(slot->quantity + 125), NULL); + BufferItemName(gFormatItems, (u8)(slot->quantity + 125), NULL); } sub_80073B8(a2); PrintFormatStringOnWindow(16, 0, buffer88, a2, 0); diff --git a/src/kangaskhan_storage1.c b/src/kangaskhan_storage1.c index c1cb51d5f..adb839eab 100644 --- a/src/kangaskhan_storage1.c +++ b/src/kangaskhan_storage1.c @@ -14,7 +14,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202E1C8[]; extern u8 gUnknown_202E5D8[]; @@ -51,7 +51,7 @@ bool8 CreateKangaskhanStorage(u32 mode) OpenedFile *faceFile; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); gKangaskhanStorageWork = MemoryAlloc(sizeof(struct KangaskhanStorageWork), 8); gKangaskhanStorageWork->menuAction1 = 0; gKangaskhanStorageWork->menuAction2 = 0; @@ -150,7 +150,7 @@ static void sub_8016E80(void) { s32 index; - sub_8006518(gKangaskhanStorageWork->unkEC); + RestoreUnkTextStruct_8006518(gKangaskhanStorageWork->unkEC); switch (gKangaskhanStorageWork->currState) { case 13: @@ -181,7 +181,7 @@ static void sub_8016E80(void) } ResetUnusedInputStruct(); - sub_800641C(gKangaskhanStorageWork->unkEC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gKangaskhanStorageWork->unkEC, TRUE, TRUE); } static void sub_8016FF8(void) @@ -202,53 +202,53 @@ static void sub_8016FF8(void) case 2: gKangaskhanStorageWork->fallbackState = KANGASKHAN_STORAGE_MAIN_MENU; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_HOW_IT_WORKS], 0, gKangaskhanStorageWork->unkE8, 0x10D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_HOW_IT_WORKS], 0, gKangaskhanStorageWork->unkE8, 0x10D); break; case 3: gKangaskhanStorageWork->fallbackState = KANGASKHAN_STORAGE_EXIT; gKangaskhanStorageWork->unkE4 = TRUE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_BYE], 0, gKangaskhanStorageWork->unkE8, 0x30D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_BYE], 0, gKangaskhanStorageWork->unkE8, 0x30D); break; case KANGASKHAN_STORAGE_NO_INV_ITEMS: gKangaskhanStorageWork->fallbackState = KANGASKHAN_STORAGE_MAIN_MENU; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_YOU_HAVE_NOTHING], 0, gKangaskhanStorageWork->unkE8, 0x10D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_YOU_HAVE_NOTHING], 0, gKangaskhanStorageWork->unkE8, 0x10D); break; case KANGASKHAN_STORAGE_TOO_MANY_ITEMS: gKangaskhanStorageWork->fallbackState = KANGASKHAN_STORAGE_MAIN_MENU; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_YOU_ARE_FULL], 0, gKangaskhanStorageWork->unkE8, 0x10D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_YOU_ARE_FULL], 0, gKangaskhanStorageWork->unkE8, 0x10D); break; case 7: gKangaskhanStorageWork->fallbackState = KANGASKHAN_STORAGE_MAIN_MENU; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORAGE_HAS_NOTHING], 0, gKangaskhanStorageWork->unkE8, 0x10D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORAGE_HAS_NOTHING], 0, gKangaskhanStorageWork->unkE8, 0x10D); break; case 8: gKangaskhanStorageWork->fallbackState = KANGASKHAN_STORAGE_MAIN_MENU; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORAGE_FULL], 0, gKangaskhanStorageWork->unkE8, 0x10D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORAGE_FULL], 0, gKangaskhanStorageWork->unkE8, 0x10D); break; case KANGASKHAN_STORAGE_IS_MONEY_USED_TM: - sub_8090E14(gUnknown_202DE58, &gKangaskhanStorageWork->storedItem, 0); + sub_8090E14(gFormatItems, &gKangaskhanStorageWork->storedItem, 0); gKangaskhanStorageWork->fallbackState = 14; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_DEPOSIT__INVALID_ITEM], 0, gKangaskhanStorageWork->unkE8, 0x30D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_DEPOSIT__INVALID_ITEM], 0, gKangaskhanStorageWork->unkE8, 0x30D); break; case 10: gKangaskhanStorageWork->fallbackState = 14; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_DEPOSIT__TOO_MANY_OF_ITEM], 0, gKangaskhanStorageWork->unkE8, 0x30D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_DEPOSIT__TOO_MANY_OF_ITEM], 0, gKangaskhanStorageWork->unkE8, 0x30D); break; case 11: gKangaskhanStorageWork->fallbackState = 13; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORE_WHAT], 0, gKangaskhanStorageWork->unkE8, 0x30D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORE_WHAT], 0, gKangaskhanStorageWork->unkE8, 0x30D); break; case 12: gKangaskhanStorageWork->fallbackState = 14; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORE_MORE], 0, gKangaskhanStorageWork->unkE8, 0x30D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_STORE_MORE], 0, gKangaskhanStorageWork->unkE8, 0x30D); break; case 13: sub_801A5D8(3, 3, NULL, 10); @@ -263,7 +263,7 @@ static void sub_8016FF8(void) break; case 17: sub_80177F8(); - sub_8090E14(gUnknown_202DE58, &gKangaskhanStorageWork->storedItem, 0); + sub_8090E14(gFormatItems, &gKangaskhanStorageWork->storedItem, 0); gKangaskhanStorageWork->unkE4 = FALSE; sub_8014248(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_DEPOSIT_ONE_PROMPT], 0, 4, gKangaskhanStorageWork->unk24, NULL, 4, 0, gKangaskhanStorageWork->unkE8, 12); @@ -283,17 +283,17 @@ static void sub_8016FF8(void) gKangaskhanStorageWork->fallbackState = 12; gKangaskhanStorageWork->unkE4 = TRUE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_DEPOSIT_CONFIRMATION], 0, gKangaskhanStorageWork->unkE8, 0x10D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_DEPOSIT_CONFIRMATION], 0, gKangaskhanStorageWork->unkE8, 0x10D); break; case 20: gKangaskhanStorageWork->fallbackState = 22; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_TAKE_WHAT], 0, gKangaskhanStorageWork->unkE8, 0x30D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_TAKE_WHAT], 0, gKangaskhanStorageWork->unkE8, 0x30D); break; case 21: gKangaskhanStorageWork->fallbackState = 23; gKangaskhanStorageWork->unkE4 = FALSE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_TAKE_MORE], 0, gKangaskhanStorageWork->unkE8, 0x30D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_TAKE_MORE], 0, gKangaskhanStorageWork->unkE8, 0x30D); break; case 22: sub_801C8C4(1, 3, 0, 10); @@ -332,7 +332,7 @@ static void sub_8016FF8(void) break; case 27: sub_80177F8(); - sub_8090E14(gUnknown_202DE58, &gKangaskhanStorageWork->storedItem, 0); + sub_8090E14(gFormatItems, &gKangaskhanStorageWork->storedItem, 0); gKangaskhanStorageWork->unkE4 = FALSE; sub_8014248(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_WITHDRAW_ONE_PROMPT], 0, 4, gKangaskhanStorageWork->unk24, NULL, 4, 0, gKangaskhanStorageWork->unkE8, 12); @@ -352,14 +352,14 @@ static void sub_8016FF8(void) gKangaskhanStorageWork->fallbackState = 21; gKangaskhanStorageWork->unkE4 = TRUE; - sub_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_WITHDRAW_CONFIRMATION], 0, gKangaskhanStorageWork->unkE8, 0x10D); + xxx_info_box_80141B4(gCommonKangStorage[gKangaskhanStorageWork->mode][KANG_DLG_WITHDRAW_CONFIRMATION], 0, gKangaskhanStorageWork->unkE8, 0x10D); break; } } static void sub_8017598(void) { - sub_8008C54(gKangaskhanStorageWork->unkA8.unk14); + CallPrepareTextbox_8008C54(gKangaskhanStorageWork->unkA8.unk14); sub_80073B8(gKangaskhanStorageWork->unkA8.unk14); PrintStringOnWindow(4, 0, sNumber, gKangaskhanStorageWork->unkA8.unk14, 0); sub_8013C68(&gKangaskhanStorageWork->unkA8); diff --git a/src/kangaskhan_storage2.c b/src/kangaskhan_storage2.c index fbeec421f..a06bbc3db 100644 --- a/src/kangaskhan_storage2.c +++ b/src/kangaskhan_storage2.c @@ -43,7 +43,7 @@ enum MenuActions { bool8 sub_8017E1C(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B20C = MemoryAlloc(sizeof(unkStruct_203B20C), 8); sUnknown_203B20C->menuAction1 = 0; sUnknown_203B20C->menuAction2 = 0; @@ -109,7 +109,7 @@ static void sub_8017F28(void) { s32 index; - sub_8006518(sUnknown_203B20C->unkF0); + RestoreUnkTextStruct_8006518(sUnknown_203B20C->unkF0); switch (sUnknown_203B20C->state) { case 1: @@ -148,7 +148,7 @@ static void sub_8017F28(void) break; } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B20C->unkF0, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B20C->unkF0, TRUE, TRUE); } static void sub_8018100(void) @@ -213,7 +213,7 @@ static void sub_8018100(void) static void sub_8018280(void) { - sub_8008C54(sUnknown_203B20C->unkC0.unk14); + CallPrepareTextbox_8008C54(sUnknown_203B20C->unkC0.unk14); sub_80073B8(sUnknown_203B20C->unkC0.unk14); PrintStringOnWindow(4, 0, sNumber, sUnknown_203B20C->unkC0.unk14, 0); sub_8013C68(&sUnknown_203B20C->unkC0); diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c index 748d29d04..92c12dcf6 100644 --- a/src/kecleon_bros1.c +++ b/src/kecleon_bros1.c @@ -19,7 +19,7 @@ #include "text2.h" extern u32 gFormatData_202DE30; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202E1C8[]; extern u8 gUnknown_202E5D8[]; @@ -185,7 +185,7 @@ static void sub_8018D30(void) { s32 i; - sub_8006518(sKecleonBrosWork1->unkE8); + RestoreUnkTextStruct_8006518(sKecleonBrosWork1->unkE8); switch (sKecleonBrosWork1->currState) { case 18: @@ -218,7 +218,7 @@ static void sub_8018D30(void) } ResetUnusedInputStruct(); - sub_800641C(sKecleonBrosWork1->unkE8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sKecleonBrosWork1->unkE8, TRUE, TRUE); } static void UpdateKecleonStoreDialogue(void) @@ -241,73 +241,73 @@ static void UpdateKecleonStoreDialogue(void) case 2: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_22], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_22], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 3: sKecleonBrosWork1->fallbackState = 4; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_02], 0, sKecleonBrosWork1->unkE4, 0x30D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_02], 0, sKecleonBrosWork1->unkE4, 0x30D); break; case KECLEON_STORE_NO_STORE_ITEMS: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_12], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_12], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case KECLEON_STORE_NO_MONEY: sKecleonBrosWork1->fallbackState = 16; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_13], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_13], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case KECLEON_STORE_TOO_MUCH_MONEY: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_14], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_14], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 8: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_15], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_15], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case KECLEON_STORE_NO_ITEMS_TO_SELL: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_16], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_16], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case KECLEON_STORE_TOO_MANY_ITEMS: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_17], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_17], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 11: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_18], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_18], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case KECLEON_STORE_NOT_ENOUGH_MONEY: sKecleonBrosWork1->fallbackState = 16; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_19], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_19], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case KECLEON_STORE_CANT_SELL_ITEM: - sub_8090E14(gUnknown_202DE58, &sKecleonBrosWork1->soldItem, NULL); + sub_8090E14(gFormatItems, &sKecleonBrosWork1->soldItem, NULL); sKecleonBrosWork1->fallbackState = 24; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_20], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_20], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 14: sKecleonBrosWork1->fallbackState = 24; sub_8019E04(TRUE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_21], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_21], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 15: sKecleonBrosWork1->fallbackState = 18; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_03], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_03], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 16: sKecleonBrosWork1->fallbackState = 19; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_04], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_04], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 18: if (sKecleonBrosWork1->isKecleonItemShop) @@ -340,7 +340,7 @@ static void UpdateKecleonStoreDialogue(void) break; case 22: sub_8019700(); - sub_8090E14(gUnknown_202DE58, &sKecleonBrosWork1->soldItem, 0); + sub_8090E14(gFormatItems, &sKecleonBrosWork1->soldItem, 0); gFormatData_202DE30 = sKecleonBrosWork1->itemSellPrice; sub_8019E04(FALSE); sub_8014248(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_05], 0, 5,sKecleonBrosWork1->menuItems, NULL, 4, 0, sKecleonBrosWork1->unkE4, 12); @@ -365,17 +365,17 @@ static void UpdateKecleonStoreDialogue(void) sKecleonBrosWork1->fallbackState = 16; } sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_06], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_06], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 23: sKecleonBrosWork1->fallbackState = 26; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_07], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_07], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 24: sKecleonBrosWork1->fallbackState = 27; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_08], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_08], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 26: sub_801A5D8(4, 3, NULL, 10); @@ -393,7 +393,7 @@ static void UpdateKecleonStoreDialogue(void) break; case 30: sub_8019700(); - sub_8090E14(gUnknown_202DE58, &sKecleonBrosWork1->soldItem, NULL); + sub_8090E14(gFormatItems, &sKecleonBrosWork1->soldItem, NULL); gFormatData_202DE30 = sKecleonBrosWork1->itemSellPrice; sub_8019E04(FALSE); sub_8014248(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_09], 0, 5, sKecleonBrosWork1->menuItems, NULL, 4, 0, sKecleonBrosWork1->unkE4, 12); @@ -411,7 +411,7 @@ static void UpdateKecleonStoreDialogue(void) sKecleonBrosWork1->fallbackState = 24; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_11], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_11], 0, sKecleonBrosWork1->unkE4, 0x10D); break; case 31: sub_8019700(); @@ -422,7 +422,7 @@ static void UpdateKecleonStoreDialogue(void) case 32: sKecleonBrosWork1->fallbackState = KECLEON_STORE_MAIN_MENU; sub_8019E04(FALSE); - sub_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_11], 0, sKecleonBrosWork1->unkE4, 0x10D); + xxx_info_box_80141B4(gCommonKecleonBros[sKecleonBrosWork1->mode][KECLEON_DLG_11], 0, sKecleonBrosWork1->unkE4, 0x10D); break; } } diff --git a/src/kecleon_bros2.c b/src/kecleon_bros2.c index 9e94f51be..ec88cba65 100644 --- a/src/kecleon_bros2.c +++ b/src/kecleon_bros2.c @@ -27,11 +27,11 @@ bool8 sub_8019E40(u32 r0) gUnknown_203B214 = MemoryAlloc(sizeof(*gUnknown_203B214), 8); gUnknown_203B214->s0.unk34 = r0; gUnknown_203B214->s0.unk38 = &gUnknown_203B214->s0.unk3C[gUnknown_203B214->s0.unk34]; - sub_8006518(gUnknown_203B214->s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B214->s0.unk3C); gUnknown_203B214->s0.unk3C[gUnknown_203B214->s0.unk34] = sUnknown_80DB8CC; gUnknown_203B214->s0.unk38->unk14 = &gUnknown_203B214->unk9C; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B214->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B214->s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_203B214->s0.input, CountKecleonShopItems(), 10, r0); gUnknown_203B214->s0.input.menuIndex = gUnknown_203B218; sub_8013984(&gUnknown_203B214->s0.input); @@ -85,7 +85,7 @@ u8 sub_8019FB0(void) void sub_8019FCC(bool8 r0) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B214->s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B214->s0.unk3C, FALSE, FALSE); gUnknown_203B214->s0.input.unk22 = CountKecleonShopItems(); sub_8013984(&gUnknown_203B214->s0.input); sub_801A064(); @@ -100,7 +100,7 @@ void sub_801A010(void) gUnknown_203B218 = gUnknown_203B214->s0.input.menuIndex; gUnknown_203B214->s0.unk3C[gUnknown_203B214->s0.unk34] = sUnknown_80DB8B4; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B214->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B214->s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B214); gUnknown_203B214 = NULL; } @@ -128,7 +128,7 @@ void sub_801A0D8(void) Item item; u8 temp_calc; - sub_8008C54(gUnknown_203B214->s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B214->s0.unk34); sub_80073B8(gUnknown_203B214->s0.unk34); PrintStringOnWindow((gUnknown_203B214->s0.input.unk1E * 8) + 10, 0, sGoods, gUnknown_203B214->s0.unk34, 0); diff --git a/src/kecleon_bros3.c b/src/kecleon_bros3.c index 7f4586b5c..7186db004 100644 --- a/src/kecleon_bros3.c +++ b/src/kecleon_bros3.c @@ -27,11 +27,11 @@ u8 sub_801A20C(u32 r0) gUnknown_203B21C = MemoryAlloc(sizeof(*gUnknown_203B21C), 8); gUnknown_203B21C->s0.unk34 = r0; gUnknown_203B21C->s0.unk38 = &gUnknown_203B21C->s0.unk3C[gUnknown_203B21C->s0.unk34]; - sub_8006518(gUnknown_203B21C->s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B21C->s0.unk3C); gUnknown_203B21C->s0.unk3C[gUnknown_203B21C->s0.unk34] = sUnknown_80DB914; gUnknown_203B21C->s0.unk38->unk14 = &gUnknown_203B21C->unk9C; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B21C->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B21C->s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_203B21C->s0.input, CountKecleonWareItems(), 10, r0); gUnknown_203B21C->s0.input.menuIndex = gUnknown_203B220; sub_8013984(&gUnknown_203B21C->s0.input); @@ -86,7 +86,7 @@ u8 sub_801A37C(void) void sub_801A398(bool8 r0) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B21C->s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B21C->s0.unk3C, FALSE, FALSE); gUnknown_203B21C->s0.input.unk22 = CountKecleonWareItems(); sub_8013984(&gUnknown_203B21C->s0.input); sub_801A430(); @@ -101,7 +101,7 @@ void sub_801A3DC(void) gUnknown_203B220 = gUnknown_203B21C->s0.input.menuIndex; gUnknown_203B21C->s0.unk3C[gUnknown_203B21C->s0.unk34] = sUnknown_80DB8FC; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B21C->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B21C->s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B21C); gUnknown_203B21C = NULL; } @@ -129,7 +129,7 @@ void sub_801A4A4(void) Item item; u8 temp_calc; - sub_8008C54(gUnknown_203B21C->s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B21C->s0.unk34); sub_80073B8(gUnknown_203B21C->s0.unk34); PrintStringOnWindow(gUnknown_203B21C->s0.input.unk1E * 8 + 10, 0, sGoods, gUnknown_203B21C->s0.unk34, 0); diff --git a/src/kecleon_bros4.c b/src/kecleon_bros4.c index d1c99e0c9..dedfd91ac 100644 --- a/src/kecleon_bros4.c +++ b/src/kecleon_bros4.c @@ -13,7 +13,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; static EWRAM_DATA_2 unkStruct_203B224 *gUnknown_203B224 = {0}; static EWRAM_DATA_2 u16 gUnknown_203B228 = {0}; @@ -39,7 +39,7 @@ bool8 sub_801A5D8(u32 param_1, s32 param_2, UnkTextStruct2_sub *param_3, u32 par sub_801AE84(); gUnknown_203B224->unk54.s0.unk34 = param_2; gUnknown_203B224->unk54.s0.unk38 = &gUnknown_203B224->unk54.s0.unk3C[param_2]; - sub_8006518(gUnknown_203B224->unk54.s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B224->unk54.s0.unk3C); gUnknown_203B224->unk54.s0.unk3C[gUnknown_203B224->unk54.s0.unk34] = sUnknown_80DB95C; gUnknown_203B224->unk54.s0.unk38->unk14 = &gUnknown_203B224->unk54.unk9C; @@ -49,7 +49,7 @@ bool8 sub_801A5D8(u32 param_1, s32 param_2, UnkTextStruct2_sub *param_3, u32 par sub_8012D08(gUnknown_203B224->unk54.s0.unk38, param_4); sub_8099690(1); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_203B224->unk54.s0.input, GetNumberOfFilledInventorySlots(), param_4, param_2); gUnknown_203B224->unk54.s0.input.menuIndex = gUnknown_203B228; gUnknown_203B224->unk54.s0.input.unk1E = gUnknown_203B22A; @@ -150,7 +150,7 @@ void sub_801A8D0(bool8 r0) { sub_8099690(1); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B224->unk54.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, FALSE, FALSE); FillInventoryGaps(); gUnknown_203B224->unk54.s0.input.unk22 = GetNumberOfFilledInventorySlots(); sub_8013984(&gUnknown_203B224->unk54.s0.input); @@ -168,7 +168,7 @@ void sub_801A928(void) gUnknown_203B224->unk54.s0.unk3C[gUnknown_203B224->unk54.s0.unk34] = sUnknown_80DB944; sub_8099690(0); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B224); gUnknown_203B224 = NULL; } @@ -181,7 +181,7 @@ static void sub_801A998(void) gUnknown_203B224->unk54.unk9C.f2 = 11; gUnknown_203B224->unk54.unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B224->unk54.s0.unk3C, TRUE, TRUE); } void sub_801A9E0(void) @@ -192,7 +192,7 @@ void sub_801A9E0(void) u8 buf1[80]; // sp4 Item item; // spC8 - sub_8008C54(gUnknown_203B224->unk54.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B224->unk54.s0.unk34); sub_80073B8(gUnknown_203B224->unk54.s0.unk34); x = gUnknown_203B224->unk54.s0.input.unk1E * 8 + 10; @@ -236,7 +236,7 @@ void sub_801A9E0(void) if (gUnknown_203B224->unk4[teamItemIndex] != 0 || sub_801ADA0(teamItemIndex)) PrintStringOnWindow(8,sub_8013800(&gUnknown_203B224->unk54.s0.input,r7), buf1, gUnknown_203B224->unk54.s0.unk34, 0); else { - strncpy(gUnknown_202DE58, buf1, 80); + strncpy(gFormatItems, buf1, 80); PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0); } break; @@ -262,7 +262,7 @@ void sub_801A9E0(void) } else { sub_8090E14(buf1, &item, 0); - strncpy(gUnknown_202DE58, buf1, 80); + strncpy(gFormatItems, buf1, 80); PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0); } break; @@ -280,7 +280,7 @@ void sub_801A9E0(void) if (IsGummiItem(item.id)) PrintStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), buf1, gUnknown_203B224->unk54.s0.unk34, 0); else { - strncpy(gUnknown_202DE58, buf1, 80); + strncpy(gFormatItems, buf1, 80); PrintFormatStringOnWindow(8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), sFmtMoveItem0, gUnknown_203B224->unk54.s0.unk34, 0); } break; @@ -296,7 +296,7 @@ void sub_801A9E0(void) void sub_801AD34(u32 param_1) { - sub_8008C54(param_1); + CallPrepareTextbox_8008C54(param_1); sub_80073B8(param_1); PrintStringOnWindow(6, 0, sItems, param_1, 0); sub_8012BC4(18, 13, GetNumberOfFilledInventorySlots(), 2, 7, param_1); diff --git a/src/load_screen.c b/src/load_screen.c index 6c81a896b..5637919db 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -163,7 +163,7 @@ void CreateLoadScreen(u32 currMenu) gLoadScreen->unk144[index] = gUnknown_80E75F8; } ResetUnusedInputStruct(); - sub_800641C(gLoadScreen->unk144, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gLoadScreen->unk144, TRUE, TRUE); SetMenuItems(gLoadScreen->unk4,gLoadScreen->unk144,0,&gUnknown_80E7610,gUnknown_203B378,FALSE,6,FALSE); switch(gLoadScreen->currMenu){ case MENU_CONTINUE: @@ -192,7 +192,7 @@ void CreateLoadScreen(u32 currMenu) void CleanLoadScreen(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); if(gLoadScreen != NULL) { MemoryFree(gLoadScreen); @@ -266,7 +266,7 @@ void DrawLoadScreenText(void) u8 *r2; iVar2 = sub_8011FA8(); - sub_8008C54(0); + CallPrepareTextbox_8008C54(0); sub_80073B8(0); PrintStringOnWindow(8,0, gTeamHeadingText,0,0); // Team: PrintStringOnWindow(8,12,gNameHeadingText,0,0); // Name: @@ -308,7 +308,7 @@ void DrawLoadScreenText(void) switch(sub_8011C1C()) { case 1: - switch(sub_8001658(0,24)) + switch(GetScriptVarValue(0,24)) { default: sprintfStatic(auStack356,gUnknown_80E7804,sub_8098FB4()); diff --git a/src/luminous_cave.c b/src/luminous_cave.c index 57d0d4511..74297f498 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -94,7 +94,7 @@ u32 sub_802465C(void) OpenedFile *faceFile; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sLuminousCaveWork = MemoryAlloc(sizeof(LuminousCaveWork), 8); sLuminousCaveWork->menuAction1 = 0; sLuminousCaveWork->menuAction2 = 0; @@ -184,7 +184,7 @@ static void sub_8024804(void) { s32 i; - sub_8006518(sLuminousCaveWork->unk114); + RestoreUnkTextStruct_8006518(sLuminousCaveWork->unk114); switch (sLuminousCaveWork->state) { case 8: @@ -209,7 +209,7 @@ static void sub_8024804(void) } ResetUnusedInputStruct(); - sub_800641C(sLuminousCaveWork->unk114, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sLuminousCaveWork->unk114, TRUE, TRUE); } static void UpdateLuminousCaveDialogue(void) @@ -232,12 +232,12 @@ static void UpdateLuminousCaveDialogue(void) break; case LUMINOUS_CAVE_EVOLVE_INFO: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_ASK_EVOLVE; - sub_80141B4(sEvolveInfo,0,0,0x105); + xxx_info_box_80141B4(sEvolveInfo,0,0,0x105); break; case LUMINOUS_CAVE_SHALL_RETURN: sLuminousCaveWork->fallbackState = 4; xxx_call_fade_in_new_bgm(MUS_FILE_SELECT,0x3c); - sub_80141B4(sYeShallReturn,0,0,0x305); + xxx_info_box_80141B4(sYeShallReturn,0,0,0x305); break; case LUMINOUS_CAVE_GIVE_ITEM_1: sub_8024D48(); @@ -276,11 +276,11 @@ static void UpdateLuminousCaveDialogue(void) break; case LUMINOUS_CAVE_LACK_WHAT_NEEDED: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_GIVE_ITEM_1; - sub_80141B4(sLackWhatIsNeeded,0,0,0x105); + xxx_info_box_80141B4(sLackWhatIsNeeded,0,0,0x105); break; case LUMINOUS_CAVE_ONLY_ONE_ITEM: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_GIVE_ITEM_2; - sub_80141B4(sOnlyOneItem,0,0,0x105); + xxx_info_box_80141B4(sOnlyOneItem,0,0,0x105); break; case LUMINOUS_CAVE_LET_US_BEGIN: sub_8025254(); @@ -302,13 +302,13 @@ static void UpdateLuminousCaveDialogue(void) else sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_CANT_EVOLVE_YET; xxx_call_fade_out_bgm(0x3c); - sub_80141B4(sLetUsBegin,0,0,0x105); + xxx_info_box_80141B4(sLetUsBegin,0,0,0x105); break; case LUMINOUS_CAVE_CHANGED_APPEARANCE: PrintColoredPokeNameToBuffer(gPlayerName,sLuminousCaveWork->pokeStruct, COLOR_CYAN); PlaySound(0x1ff); sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_EVOLVED; - sub_80141B4(sFmtChangedAppearance,0,0,0x105); + xxx_info_box_80141B4(sFmtChangedAppearance,0,0,0x105); break; case LUMINOUS_CAVE_EVOLVED: monName = GetMonSpecies(sLuminousCaveWork->pokeStruct->speciesNum); @@ -333,44 +333,44 @@ static void UpdateLuminousCaveDialogue(void) BoundedCopyStringtoBuffer(sLuminousCaveWork->pokeStruct->name,GetMonSpecies(sLuminousCaveWork->pokeStruct->speciesNum),POKEMON_NAME_LENGTH); } sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sFmtEvolved,0,0,0x105); + xxx_info_box_80141B4(sFmtEvolved,0,0,0x105); break; case LUMINOUS_CAVE_COME_ALONE: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sComeAlone,0,0,0x105); + xxx_info_box_80141B4(sComeAlone,0,0,0x105); break; case LUMINOUS_CAVE_LACK_LEVEL: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sLackLevel,0,0,0x105); + xxx_info_box_80141B4(sLackLevel,0,0,0x105); break; case LUMINOUS_CAVE_CANT_EVOLVE_ANYMORE: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sNoMoreEvolutions,0,0,0x105); + xxx_info_box_80141B4(sNoMoreEvolutions,0,0,0x105); break; case LUMINOUS_CAVE_LACK_FRIEND_AREA: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sLackFriendArea,0,0,0x105); + xxx_info_box_80141B4(sLackFriendArea,0,0,0x105); break; case LUMINOUS_CAVE_LACK_ROOM: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sLackFriendAreaRoom,0,0,0x105); + xxx_info_box_80141B4(sLackFriendAreaRoom,0,0,0x105); break; case LUMINOUS_CAVE_LACK_IQ: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sLackIQ,0,0,0x105); + xxx_info_box_80141B4(sLackIQ,0,0,0x105); break; case LUMINOUS_CAVE_LACK_ITEM: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sLackItem,0,0,0x105); + xxx_info_box_80141B4(sLackItem,0,0,0x105); break; case LUMINOUS_CAVE_CANT_EVOLVE_YET: sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_SHALL_RETURN; - sub_80141B4(sCannotEvolveYet,0,0,0x105); + xxx_info_box_80141B4(sCannotEvolveYet,0,0,0x105); break; case LUMINOUS_CAVE_PROMPT_NAME: xxx_call_fade_in_new_bgm(8,0x3c); sLuminousCaveWork->fallbackState = LUMINOUS_CAVE_FINISH_NAME; - sub_80141B4(sMustGiveName,0,0,0x105); + xxx_info_box_80141B4(sMustGiveName,0,0,0x105); break; case LUMINOUS_CAVE_FINISH_NAME: if (sLuminousCaveWork->pokeRenamed) { diff --git a/src/mailbox.c b/src/mailbox.c index 3823aee2a..2f73fc6bb 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -151,7 +151,7 @@ void SetMailboxState(u32 newState) void sub_802E0A0(void) { s32 index; - sub_8006518(gUnknown_203B304->unk10C); + RestoreUnkTextStruct_8006518(gUnknown_203B304->unk10C); switch(gUnknown_203B304->state) { case MAIN_MAILBOX_MENU: @@ -178,7 +178,7 @@ void sub_802E0A0(void) break; } ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B304->unk10C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B304->unk10C, TRUE, TRUE); } void sub_802E1AC(void) @@ -531,7 +531,7 @@ void nullsub_133(void) void CreateMailAcceptedStatusBox(u32 r0) { - sub_8008C54(r0); + CallPrepareTextbox_8008C54(r0); sub_80073B8(r0); PrintStringOnWindow(3, 0, gMailAccepted, r0, 0); sub_8012BC4(0x12, 0xD, GetNumAcceptedJobs(), 2, 7, r0); diff --git a/src/main_menu1.c b/src/main_menu1.c index 68b02dd34..7ff3c5a1b 100644 --- a/src/main_menu1.c +++ b/src/main_menu1.c @@ -296,7 +296,7 @@ void SetMenuItems(MenuStruct *a0, UnkTextStruct2 *a1, s32 index, const UnkTextSt { a1[index] = *a3; ResetUnusedInputStruct(); - sub_800641C(a1, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(a1, TRUE, TRUE); if (a5) sub_8012D60(&a0[index], menuItems, 0, 0, menuAction, index); @@ -308,10 +308,10 @@ void SetMenuItems(MenuStruct *a0, UnkTextStruct2 *a1, s32 index, const UnkTextSt void sub_8035CC0(UnkTextStruct2 *dataArray, u32 index) { - sub_8006518(dataArray); + RestoreUnkTextStruct_8006518(dataArray); dataArray[index] = sUnknown_80E59A8; ResetUnusedInputStruct(); - sub_800641C(dataArray, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(dataArray, TRUE, TRUE); } void sub_8035CF4(MenuStruct *menu, u32 index, bool8 a2) diff --git a/src/main_menu2.c b/src/main_menu2.c index 0baa02aa1..19efb509e 100644 --- a/src/main_menu2.c +++ b/src/main_menu2.c @@ -35,7 +35,7 @@ void DrawMainMenu(void) sUnknown_203B34C->unk144[i] = sUnknown_80E59C8; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B34C->unk144, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B34C->unk144, TRUE, TRUE); SetMainMenuItems(); sUnknown_203B34C->currMenuChoice = -1; @@ -49,7 +49,7 @@ void DrawMainMenu(void) void CleanMainMenu(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); if (sUnknown_203B34C != NULL) { MemoryFree(sUnknown_203B34C); diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index d16469aca..b444678f4 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -47,7 +47,7 @@ bool8 MakuhitaDojo_New(u32 mode) u32 initialState; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sMakuhitaDojoWork1 = MemoryAlloc(sizeof(MakuhitaDojoWork1), 8); sMakuhitaDojoWork1->unk10 = -1; @@ -158,7 +158,7 @@ static void sub_802FF1C(void) { s32 index; - sub_8006518(sMakuhitaDojoWork1->unk6C); + RestoreUnkTextStruct_8006518(sMakuhitaDojoWork1->unk6C); switch (sMakuhitaDojoWork1->state) { case 0: @@ -172,7 +172,7 @@ static void sub_802FF1C(void) } ResetUnusedInputStruct(); - sub_800641C(sMakuhitaDojoWork1->unk6C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sMakuhitaDojoWork1->unk6C, TRUE, TRUE); } static void MakuhitaDojo_UpdateDialogue(void) @@ -189,11 +189,11 @@ static void MakuhitaDojo_UpdateDialogue(void) break; case 2: sMakuhitaDojoWork1->fallbackState = 13; - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_2], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_2], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 3: sMakuhitaDojoWork1->fallbackState = 4; - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_3], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_3], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 4: sub_80302E8(3, NULL, 10); @@ -203,36 +203,36 @@ static void MakuhitaDojo_UpdateDialogue(void) dLoc.id = sub_80A2740(sMakuhitaDojoWork1->unk10); dLoc.floor = 1; PrintYellowDungeonNametoBuffer(gAvailablePokemonNames, &dLoc); - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_4], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_4], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 7: sMakuhitaDojoWork1->fallbackState = 13; - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_6], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_6], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 6: sMakuhitaDojoWork1->fallbackState = 13; - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_5], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_5], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 8: sMakuhitaDojoWork1->fallbackState = 9; - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_7], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_7], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 9: PrintColoredPokeNameToBuffer(gPlayerName, GetPlayerPokemonStruct(), COLOR_YELLOW); sMakuhitaDojoWork1->fallbackState = 11; PlaySound(203); - sub_80141B4(sReceivedBonslyDoll, 0, 0, 0x101); + xxx_info_box_80141B4(sReceivedBonslyDoll, 0, 0, 0x101); break; case 10: sMakuhitaDojoWork1->fallbackState = 13; - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_8], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_8], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 11: sub_801B60C(1, ITEM_GINSENG, 1); break; case 12: sMakuhitaDojoWork1->fallbackState = 1; - sub_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_9], 0, sMakuhitaDojoWork1->unk68, 0x10D); + xxx_info_box_80141B4(gCommonMakuhita[sMakuhitaDojoWork1->dlgMode][MAKUHITA_DLG_9], 0, sMakuhitaDojoWork1->unk68, 0x10D); break; case 13: return; diff --git a/src/makuhita_dojo2.c b/src/makuhita_dojo2.c index d3903659e..88b0c4dfa 100644 --- a/src/makuhita_dojo2.c +++ b/src/makuhita_dojo2.c @@ -33,7 +33,7 @@ bool8 sub_80302E8(s32 param_1, UnkTextStruct2_sub *param_2, u32 param_3) sMakuhitaDojoWork2->s30.s0.unk34 = param_1; sMakuhitaDojoWork2->s30.s0.unk38 = &sMakuhitaDojoWork2->s30.s0.unk3C[param_1]; - sub_8006518(sMakuhitaDojoWork2->s30.s0.unk3C); + RestoreUnkTextStruct_8006518(sMakuhitaDojoWork2->s30.s0.unk3C); sMakuhitaDojoWork2->s30.s0.unk3C[sMakuhitaDojoWork2->s30.s0.unk34] = sUnknown_80E0804; sMakuhitaDojoWork2->s30.s0.unk38->unk14 = &sMakuhitaDojoWork2->s30.unk9C; @@ -42,7 +42,7 @@ bool8 sub_80302E8(s32 param_1, UnkTextStruct2_sub *param_2, u32 param_3) sub_8012D08(sMakuhitaDojoWork2->s30.s0.unk38, param_3); ResetUnusedInputStruct(); - sub_800641C(sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE); sub_8013818(&sMakuhitaDojoWork2->s30.s0.input, sub_8030668(), param_3, param_1); sub_80304C8(); MakuhitaDojo_DrawCourseList(); @@ -94,7 +94,7 @@ void sub_8030480(void) if (sMakuhitaDojoWork2 != NULL) { sMakuhitaDojoWork2->s30.s0.unk3C[sMakuhitaDojoWork2->s30.s0.unk34] = sUnknown_80E07EC; ResetUnusedInputStruct(); - sub_800641C(sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sMakuhitaDojoWork2->s30.s0.unk3C, TRUE, TRUE); MemoryFree(sMakuhitaDojoWork2); sMakuhitaDojoWork2 = NULL; } @@ -120,7 +120,7 @@ static void MakuhitaDojo_DrawCourseList(void) s32 i; u8 buffer[256]; - sub_8008C54(sMakuhitaDojoWork2->s30.s0.unk34); + CallPrepareTextbox_8008C54(sMakuhitaDojoWork2->s30.s0.unk34); sub_80073B8(sMakuhitaDojoWork2->s30.s0.unk34); PrintStringOnWindow(10, 0, sCourses, sMakuhitaDojoWork2->s30.s0.unk34, 0); sub_8012BC4((sMakuhitaDojoWork2->s30.unk9C.f2 * 8) + 4, 0, sMakuhitaDojoWork2->s30.s0.input.unk1E + 1, 2, 7, sMakuhitaDojoWork2->s30.s0.unk34); diff --git a/src/menu_input.c b/src/menu_input.c index a07e093f4..5efb1c3bc 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -447,7 +447,7 @@ void sub_8012EBC(MenuStruct *param_1) if (ptr_text->unkC == 6) { ptr_text2 = &textStack[index]; - sub_8006518(textStack); + RestoreUnkTextStruct_8006518(textStack); x = sub_8008ED0(param_1->unk0); PrintFormatStringOnWindow(((ptr_text2->unk14->f2 * 8 - x) / 2) + 8, 0, param_1->unk0, param_1->index, 0); } diff --git a/src/mission_reward.c b/src/mission_reward.c index 4aea3b543..4c9e5c7c2 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -127,7 +127,7 @@ u32 sub_802F204(unkStruct_802F204 *r0, bool8 displayClientSprite) struct unkStruct_203B310 *preload; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); gUnknown_203B310 = MemoryAlloc(sizeof(struct unkStruct_203B310), 8); gUnknown_203B310->unk10 = r0; gUnknown_203B310->itemRewardIndex = 0; @@ -195,13 +195,13 @@ void sub_802F300(void) switch(gUnknown_203B310->state) { case PREP_MONEY_REWARD: - sub_8006518(gUnknown_203B310->unk24); + RestoreUnkTextStruct_8006518(gUnknown_203B310->unk24); for(index = 0; index < 4; index++) { gUnknown_203B310->unk24[index] = gUnknown_80E041C; } ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B310->unk24, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B310->unk24, TRUE, TRUE); default: break; } @@ -224,7 +224,7 @@ void HandleMissionReward(void) else { gFormatData_202DE30 = moneyReward; if (gUnknown_203B310->displayClientDialogueSprite) { - sub_80141B4(gUnknown_80E0434,0,&gUnknown_203B310->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80E0434,0,&gUnknown_203B310->faceFile,0x10d); gUnknown_203B310->nextState = MONEY_REWARD; } else { @@ -235,11 +235,11 @@ void HandleMissionReward(void) case MONEY_REWARD: PlaySound(0xcb); AddToTeamMoney(gUnknown_203B310->unk10->moneyReward); - if (sub_808D544(0) < 2) { - sub_80141B4(gUnknown_80E045C,0,0,0x101); + if (GetUnitSum_808D544(0) < 2) { + xxx_info_box_80141B4(gUnknown_80E045C,0,0,0x101); } else { - sub_80141B4(gUnknown_80E0484,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E0484,0,0,0x101); } gUnknown_203B310->nextState = PREP_FRIEND_AREA_REWARD; break; @@ -248,9 +248,9 @@ void HandleMissionReward(void) SetRewardSceneState(PREP_ITEM_REWARD); } else { - sub_8092578(gUnknown_202E628,gUnknown_203B310->unk10->friendAreaReward,FALSE); + WriteFriendAreaName(gUnknown_202E628,gUnknown_203B310->unk10->friendAreaReward,FALSE); if (gUnknown_203B310->displayClientDialogueSprite) { - sub_80141B4(gUnknown_80E04B4,0,&gUnknown_203B310->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80E04B4,0,&gUnknown_203B310->faceFile,0x10d); gUnknown_203B310->nextState = UNLOCK_FRIEND_AREA; } else { @@ -262,20 +262,20 @@ void HandleMissionReward(void) if (GetFriendAreaStatus(gUnknown_203B310->unk10->friendAreaReward)) { // We already have the friend area AddToTeamMoney(1000); - sub_80141B4(gUnknown_80E04F4,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E04F4,0,0,0x101); } else { - if (sub_808D544(0) < 2) { + if (GetUnitSum_808D544(0) < 2) { UnlockFriendArea(gUnknown_203B310->unk10->friendAreaReward); PlaySound(0xce); - sub_80141B4(gUnknown_80E05C0,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E05C0,0,0,0x101); } else { UnlockFriendArea(gUnknown_203B310->unk10->friendAreaReward); PlaySound(0xce); - sub_80141B4(gUnknown_80E05FC,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E05FC,0,0,0x101); } } gUnknown_203B310->nextState = PREP_ITEM_REWARD; @@ -298,7 +298,7 @@ void HandleMissionReward(void) local_20.unk8 = 1; sub_8090E14(gUnknown_202DEA8,&item,&local_20); if (gUnknown_203B310->displayClientDialogueSprite) { - sub_80141B4(gUnknown_80E0640,0,&gUnknown_203B310->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80E0640,0,&gUnknown_203B310->faceFile,0x10d); gUnknown_203B310->nextState = GIVE_ITEM_REWARD; } else @@ -349,7 +349,7 @@ void HandleMissionReward(void) gUnknown_203B310->nextState = REWARD_EXIT; } gFormatData_202DE30 = gUnknown_203B310->unk10->teamRankPtsReward; - sub_80141B4(gUnknown_80E0670,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E0670,0,0,0x101); } break; case NEW_TEAM_RANK: @@ -359,7 +359,7 @@ void HandleMissionReward(void) strcpy(gUnknown_202E038,rankString); rankString = GetTeamRankString(GetRescueTeamRank()); strcpy(gUnknown_202E038 + 0x50,rankString); - sub_80141B4(gUnknown_80E06A8,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E06A8,0,0,0x101); break; case REWARD_EXIT: break; diff --git a/src/move_actions.c b/src/move_actions.c index c555bc91f..10daadf37 100644 --- a/src/move_actions.c +++ b/src/move_actions.c @@ -41,7 +41,7 @@ struct NaturePowerMove extern struct NaturePowerMove gNaturePowerMoveTable[10]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gAvailablePokemonNames[]; extern u8 gUnknown_202DFE8[]; @@ -181,7 +181,7 @@ extern u8 *gUnknown_80FE36C[]; extern u8 *gPtrForecastPreventsTypeSwitchMessage[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u32 gUnknown_202F210; extern u32 gUnknown_202F214; extern u8 gUnknown_202F218; @@ -560,7 +560,7 @@ bool8 TormentMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4 if ((movePtr->moveFlags & MOVE_FLAG_EXISTS) != 0) { if ((movePtr->moveFlags & MOVE_FLAG_DISABLED) == 0) { if ((movePtr->moveFlags & MOVE_FLAG_LAST_USED) != 0) { - sub_80928C0(gUnknown_202DE58,movePtr,0); + sub_80928C0(gFormatItems,movePtr,0); // $i0 was tormented sub_80522F4(pokemon,target,*gUnknown_80FCFBC); movePtr->moveFlags |= MOVE_FLAG_DISABLED; @@ -578,7 +578,7 @@ bool8 TormentMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4 InitPokemonMove(&struggleMove, MOVE_STRUGGLE); entityInfo->struggleMoveFlags |= MOVE_FLAG_DISABLED; isTormented = TRUE; - sub_80928C0(gUnknown_202DE58,&struggleMove,0); + sub_80928C0(gFormatItems,&struggleMove,0); // $i0 was tormented sub_80522F4(pokemon,target,*gUnknown_80FCFBC); } @@ -1858,7 +1858,7 @@ _moveIDcheck: } else { InitPokemonMove(move, moveID); - sub_80928C0(gUnknown_202DE58, move, 0); + sub_80928C0(gFormatItems, move, 0); move->moveFlags2 |= MOVE_FLAG2_UNK4; move->moveFlags2 |= MOVE_FLAG_REPLACE; sub_80522F4(pokemon, target, *gUnknown_80FE38C); @@ -1987,7 +1987,7 @@ bool32 SketchMoveAction(Entity *pokemon, Entity *target, Move *move, s32 param_4 "\tpop {r1}\n" "\tbx r1\n" "\t.align 2, 0\n" -"_0805941C: .4byte gUnknown_202DE58\n" +"_0805941C: .4byte gFormatItems\n" "_08059420: .4byte gUnknown_80FE38C\n" ); } @@ -2338,7 +2338,7 @@ bool8 ConversionMoveAction(Entity * pokemon,Entity * target,Move * move,u32 para info->types[0] = moveType; info->types[1] = TYPE_NONE; info->isColorChanged = TRUE; - sub_80928C0(gUnknown_202DE58, moveStack[newIndex], NULL); + sub_80928C0(gFormatItems, moveStack[newIndex], NULL); sub_80522F4(pokemon,target,*gUnknown_80FE330); return TRUE; } @@ -2972,7 +2972,7 @@ void sub_805A7D4(Entity * pokemon, Entity * target, Item *item, Position *pos) SetEntityPixelPos(&stackEntity,(target->pos.x * 0x18 + 4) * 0x100, (target->pos.y * 0x18 + 4) * 0x100); stackEntity.spawnGenID = 0; - SetMessageArgument(gUnknown_202DE58,&stackEntity,0); + SetMessageArgument(gFormatItems,&stackEntity,0); sub_804652C(pokemon,&stackEntity,item,1,0); } diff --git a/src/move_effects_target.c b/src/move_effects_target.c index bc0afd0f0..a260350da 100644 --- a/src/move_effects_target.c +++ b/src/move_effects_target.c @@ -112,7 +112,7 @@ extern u8 *gUnknown_80FC0C8[]; extern u8 *gUnknown_80FC0E4[]; extern u8 *gUnknown_80FC0D4[]; extern u8 gUnknown_202DEA8[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 *gUnknown_80FC274[]; extern u8 *gUnknown_80FC15C[]; extern u8 *gUnknown_80FCA60[]; @@ -1000,10 +1000,10 @@ void LowerAttackStageTarget(Entity * pokemon, Entity * target, s32 index, s32 de return; } if (index != STAT_STAGE_ATK) { - strcpy(gUnknown_202DE58,*gUnknown_80FC0C8); + strcpy(gFormatItems,*gUnknown_80FC0C8); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC0B8); + strcpy(gFormatItems,*gUnknown_80FC0B8); } if (param_5) { if (sub_8071728(pokemon,target,displayMessage)) { @@ -1055,10 +1055,10 @@ void LowerDefenseStageTarget(Entity * pokemon, Entity * target, s32 index, s32 d return; } if (index != STAT_STAGE_DEF) { - strcpy(gUnknown_202DE58,*gUnknown_80FC0AC); + strcpy(gFormatItems,*gUnknown_80FC0AC); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC09C); + strcpy(gFormatItems,*gUnknown_80FC09C); } if (!param_5 || !sub_8071728(pokemon,target,displayMessage)) { entityInfo = target->info; @@ -1098,10 +1098,10 @@ void RaiseAttackStageTarget(Entity * pokemon, Entity * target, s32 index, s32 in SetMessageArgument(gAvailablePokemonNames,target,0); sub_8041F70(target,index); if (index != STAT_STAGE_ATK) { - strcpy(gUnknown_202DE58,*gUnknown_80FC0C8); + strcpy(gFormatItems,*gUnknown_80FC0C8); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC0B8); + strcpy(gFormatItems,*gUnknown_80FC0B8); } if (increment == 1) { @@ -1138,10 +1138,10 @@ void RaiseDefenseStageTarget(Entity * pokemon, Entity * target, s32 index, s32 i SetMessageArgument(gAvailablePokemonNames,target,0); sub_8041F94(target,index); if (index != STAT_STAGE_DEF) { - strcpy(gUnknown_202DE58,*gUnknown_80FC0AC); + strcpy(gFormatItems,*gUnknown_80FC0AC); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC09C); + strcpy(gFormatItems,*gUnknown_80FC09C); } if (increment == 1) { diff --git a/src/options_menu1.c b/src/options_menu1.c index 6caf7f12a..a42b10391 100644 --- a/src/options_menu1.c +++ b/src/options_menu1.c @@ -105,7 +105,7 @@ static void sub_801DD84(void) { s32 i; - sub_8006518(sUnknown_203B25C->unkBC); + RestoreUnkTextStruct_8006518(sUnknown_203B25C->unkBC); switch (sUnknown_203B25C->state) { case OPTIONS_MENU_INIT: @@ -142,7 +142,7 @@ static void sub_801DD84(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B25C->unkBC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B25C->unkBC, TRUE, TRUE); } static void sub_801DED0(void) diff --git a/src/options_menu2.c b/src/options_menu2.c index accd766b0..6037937da 100644 --- a/src/options_menu2.c +++ b/src/options_menu2.c @@ -24,11 +24,11 @@ bool8 sub_801E198(GameOptions *optionsMenu) sub_801317C(&sUnknown_203B260->unk4); sUnknown_203B260->unk44 = 0; sUnknown_203B260->unk48 = &sUnknown_203B260->unk4C[0]; - sub_8006518(sUnknown_203B260->unk4C); + RestoreUnkTextStruct_8006518(sUnknown_203B260->unk4C); sUnknown_203B260->unk4C[sUnknown_203B260->unk44] = sUnknown_80DC03C; sub_8012D08(sUnknown_203B260->unk48, 1); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B260->unk4C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B260->unk4C, TRUE, TRUE); sub_8013818(&sUnknown_203B260->input, 1, 1, sUnknown_203B260->unk44); nullsub_38(); CreateOptionsMenu(); @@ -86,7 +86,7 @@ void sub_801E2C4(void) if (sUnknown_203B260 != NULL) { sUnknown_203B260->unk4C[sUnknown_203B260->unk44] = sUnknown_80DC020; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B260->unk4C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B260->unk4C, TRUE, TRUE); MemoryFree(sUnknown_203B260); sUnknown_203B260 = NULL; } @@ -101,7 +101,7 @@ static void CreateOptionsMenu(void) u32 length; u32 y; - sub_8008C54(sUnknown_203B260->unk44); + CallPrepareTextbox_8008C54(sUnknown_203B260->unk44); sub_80073B8(sUnknown_203B260->unk44); PrintStringOnWindow(16, 0, sGameOptions,sUnknown_203B260->unk44, 0); diff --git a/src/other_menus1.c b/src/other_menus1.c index 5d0940a26..a7e3046d5 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -43,7 +43,7 @@ void sub_8036FDC(s32 param_1) s32 index2; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); ResetSprites(FALSE); if (sUnknown_203B35C == NULL) { @@ -64,7 +64,7 @@ void sub_8036FDC(s32 param_1) sUnknown_203B35C->unk15C[index2] = sUnknown_80E653C; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B35C->unk15C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B35C->unk15C, TRUE, TRUE); SetMenuItems(sUnknown_203B35C->unk1C, sUnknown_203B35C->unk15C, 0, &sUnknown_80E6CD0, sUnknown_80E6CE8, FALSE, 6, FALSE); sub_8035CF4(sUnknown_203B35C->unk1C, 0, TRUE); sub_80376CC(); diff --git a/src/party_list_menu.c b/src/party_list_menu.c index 28e04c8ed..26d029c70 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -27,7 +27,7 @@ // TODO: Clean this -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gUnknown_202DEA8[]; extern u8 gAvailablePokemonNames[]; // 202DF98 @@ -163,7 +163,7 @@ static void SetPartyListMenuState(s32 newState) static void sub_802608C(void) { s32 index; - sub_8006518(sUnknown_203B2B8->unk220); + RestoreUnkTextStruct_8006518(sUnknown_203B2B8->unk220); switch(sUnknown_203B2B8->state) { case PARTY_LIST_STATE_MAIN_MENU: @@ -192,7 +192,7 @@ static void sub_802608C(void) break; } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2B8->unk220, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2B8->unk220, TRUE, TRUE); } void HandlePartyListMenuCallback(void) @@ -259,22 +259,22 @@ void HandlePartyListMenuCallback(void) case PARTY_LIST_STATE_JOIN_TEAM: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_EXIT; PlaySound(0xcf); - sub_80141B4(sUnknown_80DD4C4,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD4C4,0,0,0x101); break; case PARTY_LIST_STATE_STANDBY: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_EXIT; PlaySound(0xcf); - sub_80141B4(sUnknown_80DD4F4,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD4F4,0,0,0x101); break; case PARTY_LIST_STATE_MAKE_LEADER: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_EXIT; PlaySound(0xcc); - sub_80141B4(sBecameLeader,0,0,0x101); + xxx_info_box_80141B4(sBecameLeader,0,0,0x101); break; case PARTY_LIST_STATE_POKEMON_FAREWELL: sUnknown_203B2B8->fallbackState = 9; PlaySound(0xca); - sub_80141B4(sUnknown_80DD564,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD564,0,0,0x101); break; case 9: sub_8026FA4(); @@ -283,23 +283,23 @@ void HandlePartyListMenuCallback(void) break; case PARTY_LIST_STATE_GIVEN_ITEM: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_MAIN_MENU_1; - sub_80141B4(sUnknown_80DD594,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD594,0,0,0x101); break; case PARTY_LIST_STATE_GIVEN_ITEM_HELD_ITEM: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_MAIN_MENU_1; - sub_80141B4(sUnknown_80DD5B8,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD5B8,0,0,0x101); break; case PARTY_LIST_STATE_TAKE_ITEM: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_MAIN_MENU_1; - sub_80141B4(sUnknown_80DD60C,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD60C,0,0,0x101); break; case 10: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_EXIT; - sub_80141B4(sUnknown_80DD60C,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD60C,0,0,0x101); break; case 0xb: sUnknown_203B2B8->fallbackState = PARTY_LIST_STATE_EXIT; - sub_80141B4(sUnknown_80DD63C,0,0,0x101); + xxx_info_box_80141B4(sUnknown_80DD63C,0,0,0x101); break; case PARTY_LIST_STATE_INIT: case PARTY_LIST_STATE_EXIT: @@ -775,14 +775,14 @@ void sub_8026DAC(u32 r0, BulkItem *item) Item slot; struct unkStruct_8090F58 temp; - sub_8008C54(r0); + CallPrepareTextbox_8008C54(r0); sub_80073B8(r0); HeldItemToSlot(&slot, item); temp.unk0 = 0; temp.unk4 = 0; temp.unk8 = 1; slot.flags = ITEM_FLAG_EXISTS; - sub_8090E14(gUnknown_202DE58, &slot, &temp); + sub_8090E14(gFormatItems, &slot, &temp); PrintFormatStringOnWindow(4, 3, sPartyMenuItemPlaceholder, r0, 0); sub_80073E0(r0); } @@ -793,7 +793,7 @@ void sub_8026E08(u32 r0) u8 buffer[20]; s32 x; - sub_8008C54(r0); + CallPrepareTextbox_8008C54(r0); sub_80073B8(r0); sub_80922B4(gAvailablePokemonNames, sUnknown_203B2B8->pokeStruct->name, POKEMON_NAME_LENGTH); sub_808D930(buffer, sUnknown_203B2B8->pokeStruct->speciesNum); diff --git a/src/pelipper_board.c b/src/pelipper_board.c index d7af11dfd..e7ec9b563 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -148,7 +148,7 @@ void SetPelipperBoardState(u32 newState) void sub_802E94C(void) { s32 index; - sub_8006518(gPelipperBoard->unk10C); + RestoreUnkTextStruct_8006518(gPelipperBoard->unk10C); switch(gPelipperBoard->state) { case MAIN_PELIPPER_BOARD_MENU: @@ -175,7 +175,7 @@ void sub_802E94C(void) break; } ResetUnusedInputStruct(); - sub_800641C(gPelipperBoard->unk10C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gPelipperBoard->unk10C, TRUE, TRUE); } void sub_802EA58(void) @@ -435,7 +435,7 @@ void nullsub_134(void) void CreatePelipperAcceptedStatusBox(u32 r0) { - sub_8008C54(r0); + CallPrepareTextbox_8008C54(r0); sub_80073B8(r0); PrintStringOnWindow(3, 0, gPelipperBoard_Accepted, r0, 0); sub_8012BC4(0x12, 0xD, GetNumAcceptedJobs(), 2, 7, r0); diff --git a/src/personality_test1.c b/src/personality_test1.c index 8276fdc78..65170594d 100644 --- a/src/personality_test1.c +++ b/src/personality_test1.c @@ -287,7 +287,7 @@ static void RevealStarter(void) s32 temp; if (sub_80144A4(&temp) == 0) { - sub_80141B4(gStarterReveal, 0, 0, 0x101); + xxx_info_box_80141B4(gStarterReveal, 0, 0, 0x101); PersonalityTest_DisplayStarterSprite(); sPersonalityTestTracker->TestState = PERSONALITY_ADVANCE_TO_PARTNER_SELECTION_1; } @@ -303,7 +303,7 @@ static void AdvanceToPickPartnerPrompt(void) static void PromptPickPartner(void) { - sub_80141B4(gPartnerPrompt, 0, 0, 0x301); + xxx_info_box_80141B4(gPartnerPrompt, 0, 0, 0x301); sPersonalityTestTracker->TestState = PERSONALITY_ADVANCE_TO_PARTNER_SELECTION_3; } @@ -331,7 +331,7 @@ static void PromptForPartnerNickname(void) if (selectedPartner != 0xFFFE) { sub_803CE6C(); sPersonalityTestTracker->PartnerID = selectedPartner; - sub_80141B4(gPartnerNickPrompt, 0, 0, 0x301); + xxx_info_box_80141B4(gPartnerNickPrompt, 0, 0, 0x301); sPersonalityTestTracker->TestState = PERSONALITY_ADVANCE_TO_PARTNER_NICKNAME_2; } } @@ -356,7 +356,7 @@ static void PrintEndIntroText(void) { if (sub_8016080()) { CleanConfirmNameMenu(); - sub_80141B4(gEndIntroText, 0, 0, 0x301); + xxx_info_box_80141B4(gEndIntroText, 0, 0, 0x301); sPersonalityTestTracker->TestState = PERSONALITY_ADVANCE_TO_TEST_END; } } @@ -380,7 +380,7 @@ static void PromptNewQuestion(void) static void PrintPersonalityTypeDescription(void) { CopyMonsterNametoBuffer(gAvailablePokemonNames, sPersonalityTestTracker->StarterID); - sub_80141B4(sPersonalityTypeDescriptionTable[sPersonalityTestTracker->playerNature], 0, 0, 0x101); + xxx_info_box_80141B4(sPersonalityTypeDescriptionTable[sPersonalityTestTracker->playerNature], 0, 0, 0x101); } static void PersonalityTest_DisplayStarterSprite(void) @@ -393,11 +393,11 @@ static void PersonalityTest_DisplayStarterSprite(void) UnkTextStruct2 stackArray[4]; starterID = sPersonalityTestTracker->StarterID; - sub_8006518(stackArray); + RestoreUnkTextStruct_8006518(stackArray); stackArray[1] = sUnknown_80F4244; ResetUnusedInputStruct(); - sub_800641C(stackArray, TRUE, FALSE); - sub_8008C54(1); + xxx_call_save_unk_text_struct_800641C(stackArray, TRUE, FALSE); + CallPrepareTextbox_8008C54(1); sub_80073B8(1); faceFile = GetDialogueSpriteDataPtr(starterID); diff --git a/src/personality_test2.c b/src/personality_test2.c index 8128a872e..724525278 100644 --- a/src/personality_test2.c +++ b/src/personality_test2.c @@ -47,7 +47,7 @@ void CreatePartnerSelectionMenu(s16 starterID) gUnknown_203B404->s18.unk9C.f2 = 6; gUnknown_203B404->s18.unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_203B404->s18.s0.input, GetValidPartners(), 10, gUnknown_203B404->s18.s0.unk34); RedrawPartnerSelectionMenu(); PersonalityTest_DisplayPartnerSprite(); @@ -92,7 +92,7 @@ void sub_803CE6C(void) { gUnknown_203B404->s18.s0.unk3C[gUnknown_203B404->s18.s0.unk34] = gUnknown_80F4278; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B404->s18.s0.unk3C, TRUE, TRUE); sub_803CECC(); } @@ -125,7 +125,7 @@ static void RedrawPartnerSelectionMenu(void) SUB_80095E4_CALL(gUnknown_203B404->s18.s0); - sub_8008C54(gUnknown_203B404->s18.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B404->s18.s0.unk34); sub_80073B8(gUnknown_203B404->s18.s0.unk34); PrintStringOnWindow(12, 0, gPartnerSelectionHeaderText, gUnknown_203B404->s18.s0.unk34, 0); @@ -177,10 +177,10 @@ static void RedrawPartnerSelectionMenu(void) "\tadds r0, 0x54\n" "\tmovs r1, 0x1\n" "\tmovs r2, 0x1\n" - "\tbl sub_800641C\n" + "\tbl xxx_call_save_unk_text_struct_800641C\n" "\tldr r0, [r6]\n" "\tldr r0, [r0, 0x4C]\n" - "\tbl sub_8008C54\n" + "\tbl CallPrepareTextbox_8008C54\n" "\tldr r0, [r6]\n" "\tldr r0, [r0, 0x4C]\n" "\tbl sub_80073B8\n" @@ -249,7 +249,7 @@ static void PersonalityTest_DisplayPartnerSprite(void) u32 faceIndex; partnerID = gUnknown_203B404->PartnerArray[gUnknown_203B404->s18.s0.input.menuIndex]; - sub_8008C54(1); + CallPrepareTextbox_8008C54(1); sub_80073B8(1); faceFile = GetDialogueSpriteDataPtr(partnerID); r6 = ((struct FaceData *)faceFile->data)->unk0[1 + EMOTION_NORMAL]; diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 3f8c653c0..a98db162d 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -33,7 +33,7 @@ struct unkStruct_808E9EC }; extern s32 gUnknown_81076C4[6]; // x-coord positioning for shadow sprites -extern SpriteOAM gUnknown_202F3E8[3]; // Shadow sprites of some kind +extern SpriteOAM gShadowSprites[3]; // Shadow sprites of some kind extern s16 gUnknown_810AC60; // 0xC extern s16 gUnknown_810AC62; // 0xC extern s16 gUnknown_810AC68; // 0x8 @@ -58,7 +58,7 @@ s16 GetPokemonEvolveConditions(s16 index, unkEvolve *r1); u32 sub_808F798(PokemonStruct1 *, s16); -bool8 sub_808E668(s16 species, s16* a2, s16* a3) +bool8 AddShadowSprite(s16 species, s16* a2, s16* a3) { if (species != MONSTER_DIGLETT && species != MONSTER_DUGTRIO) { u8 shadowSize = GetShadowSize(species); @@ -71,7 +71,7 @@ bool8 sub_808E668(s16 species, s16* a2, s16* a3) unk6 -= 4; x &= SPRITEOAM_MAX_X; - spr = &gUnknown_202F3E8[shadowSize]; + spr = &gShadowSprites[shadowSize]; spr->attrib2 &= ~SPRITEOAM_MASK_X; spr->attrib2 |= x; unk6 &= SPRITEOAM_MAX_UNK6_4; diff --git a/src/pokemon_mail.c b/src/pokemon_mail.c index e0fae5b09..7021c7fdd 100644 --- a/src/pokemon_mail.c +++ b/src/pokemon_mail.c @@ -17,7 +17,7 @@ #include "text_util.h" #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 gAvailablePokemonNames[]; // 202DF98 #include "data/pokemon_mail.h" @@ -57,13 +57,13 @@ void CreateRescueTitle(unkStruct_802C39C *param_1) PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0); break; case 12: - BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL); - sprintfStatic(buf_1, gUnknown_80E8830, gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->targetItem, NULL); + sprintfStatic(buf_1, gUnknown_80E8830, gFormatItems); PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0); break; case 11: - BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL); - sprintfStatic(buf_1, gUnknown_80E8848, gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->targetItem, NULL); + sprintfStatic(buf_1, gUnknown_80E8848, gFormatItems); PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0); break; case 4: @@ -163,13 +163,13 @@ void CreateRescueDescription(unkStruct_802C39C *param_1) PrintStringOnWindow(10, y, gMedichamMissionDescription, param_1->unk0[0], 0); break; case 4: - BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL); - sprintfStatic(buf_1, gUnknown_80E8968, gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->targetItem, NULL); + sprintfStatic(buf_1, gUnknown_80E8968, gFormatItems); PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0); break; case 5: - BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL); - sprintfStatic(buf_1, gUnknown_80E89B0, gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->targetItem, NULL); + sprintfStatic(buf_1, gUnknown_80E89B0, gFormatItems); PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0); break; case 6: @@ -194,12 +194,12 @@ void CreateRescueDescription(unkStruct_802C39C *param_1) case 16: { u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id; u8 bVar3 = param_1->unk8->seed + param_1->unk8->dungeon.floor; - BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL); - sprintfStatic(buf_1, gUnknown_80EB3F8[bVar2 % 22], gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->targetItem, NULL); + sprintfStatic(buf_1, gUnknown_80EB3F8[bVar2 % 22], gFormatItems); PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0); y += 12; - sprintfStatic(buf_1, gUnknown_80EB72C[bVar3 % 22], gUnknown_202DE58); + sprintfStatic(buf_1, gUnknown_80EB72C[bVar3 % 22], gFormatItems); PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0); y -= 12; break; @@ -282,13 +282,13 @@ void CreateRescueDescription(unkStruct_802C39C *param_1) PrintStringOnWindow(68, y, gUnknown_80E8AEC, param_1->unk0[0], 0); break; case MISSION_TYPE_DELIVER_ITEM: - BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL); - sprintfStatic(buf_1, gUnknown_80E8AFC, gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->targetItem, NULL); + sprintfStatic(buf_1, gUnknown_80E8AFC, gFormatItems); PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0); break; case MISSION_TYPE_FIND_ITEM: - BufferItemName(gUnknown_202DE58, param_1->targetItem, NULL); - sprintfStatic(buf_1, gUnknown_80E8B10, gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->targetItem, NULL); + sprintfStatic(buf_1, gUnknown_80E8B10, gFormatItems); PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0); break; case MISSION_TYPE_RESCUE_CLIENT: @@ -347,8 +347,8 @@ void CreateRescueDescription(unkStruct_802C39C *param_1) break; case ITEM: // Item case ITEM_EXTRA: // Item + ? - BufferItemName(gUnknown_202DE58, param_1->rewardItem, NULL); - sprintfStatic(buf_1, gMissionRewardText[param_1->rewardType], gUnknown_202DE58); + BufferItemName(gFormatItems, param_1->rewardItem, NULL); + sprintfStatic(buf_1, gMissionRewardText[param_1->rewardType], gFormatItems); PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0); break; case 4: // Friend Area diff --git a/src/pokemon_news1.c b/src/pokemon_news1.c index dcd315f67..9f6cd0a93 100644 --- a/src/pokemon_news1.c +++ b/src/pokemon_news1.c @@ -35,7 +35,7 @@ bool8 sub_802B640(u32 a0, UnkTextStruct2_sub *a1, u32 a2) sUnknown_203B2CC->s38.unk34 = a0; sUnknown_203B2CC->s38.unk38 = &sUnknown_203B2CC->s38.unk3C[a0]; - sub_8006518(sUnknown_203B2CC->s38.unk3C); + RestoreUnkTextStruct_8006518(sUnknown_203B2CC->s38.unk3C); sUnknown_203B2CC->s38.unk3C[sUnknown_203B2CC->s38.unk34] = sUnknown_80DFBEC; @@ -44,7 +44,7 @@ bool8 sub_802B640(u32 a0, UnkTextStruct2_sub *a1, u32 a2) sub_8012D08(sUnknown_203B2CC->s38.unk38, a2); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2CC->s38.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2CC->s38.unk3C, TRUE, TRUE); sub_8013818(&sUnknown_203B2CC->s38.input, GetNumPKMNNews(), a2, a0); @@ -93,7 +93,7 @@ u8 GetPokemonNewsIndex(void) void sub_802B7D0(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2CC->s38.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2CC->s38.unk3C, FALSE, FALSE); sUnknown_203B2CC->s38.input.unk22 = GetNumPKMNNews(); sub_8013984(&sUnknown_203B2CC->s38.input); @@ -114,7 +114,7 @@ void sub_802B81C(void) sUnknown_203B2CC->s38.unk3C[sUnknown_203B2CC->s38.unk34] = sUnknown_80DFBD0; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2CC->s38.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2CC->s38.unk3C, TRUE, TRUE); MemoryFree(sUnknown_203B2CC); sUnknown_203B2CC = NULL; @@ -133,7 +133,7 @@ static void CreatePKMNNewsMenu(void) s32 new_index; u8 mailIndex; - sub_8008C54(sUnknown_203B2CC->s38.unk34); + CallPrepareTextbox_8008C54(sUnknown_203B2CC->s38.unk34); sub_80073B8(sUnknown_203B2CC->s38.unk34); PrintStringOnWindow(10, 0, sNewsList, sUnknown_203B2CC->s38.unk34, 0); diff --git a/src/pokemon_news2.c b/src/pokemon_news2.c index 1154380a0..545ad5209 100644 --- a/src/pokemon_news2.c +++ b/src/pokemon_news2.c @@ -35,7 +35,7 @@ bool8 sub_802B9FC(u8 mailIndex) sUnknown_203B2D4->unk28[2] = sUnknown_80DFC18; sUnknown_203B2D4->unk28[3] = sUnknown_80DFC18; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2D4->unk28, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D4->unk28, TRUE, TRUE); sUnknown_203B2D4->unk8 = 0; sub_802BCC4(); sub_802BC7C(); @@ -67,7 +67,7 @@ void sub_802BACC(void) if (sUnknown_203B2D4 != NULL) { sUnknown_203B2D4->unk28[sUnknown_203B2D4->unk24] = sUnknown_80DFC18; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2D4->unk28, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D4->unk28, TRUE, TRUE); MemoryFree(sUnknown_203B2D4); sUnknown_203B2D4 = NULL; } @@ -84,7 +84,7 @@ static void sub_802BB28(void) switch (sUnknown_203B2D4->state) { case 0: case 1: - sub_8008C54(sUnknown_203B2D4->unk24); + CallPrepareTextbox_8008C54(sUnknown_203B2D4->unk24); sub_80073B8(sUnknown_203B2D4->unk24); PrintFormatStringOnWindow(10, 0, GetPokemonMailHeadline(sUnknown_203B2D4->currMailIndex), sUnknown_203B2D4->unk24, 0); PrintFormatStringOnWindow(6, 20, sUnknown_203B2D4->unk10[sUnknown_203B2D4->unk8], sUnknown_203B2D4->unk24, 0); diff --git a/src/pokemon_news3.c b/src/pokemon_news3.c index 248b94551..cdb6c812c 100644 --- a/src/pokemon_news3.c +++ b/src/pokemon_news3.c @@ -38,7 +38,7 @@ bool8 sub_802BD14(s32 a0, UnkTextStruct2_sub *a1, u32 a2) sUnknown_203B2D8->unk4.s0.unk34 = a0; sUnknown_203B2D8->unk4.s0.unk38 = &sUnknown_203B2D8->unk4.s0.unk3C[a0]; - sub_8006518(sUnknown_203B2D8->unk4.s0.unk3C); + RestoreUnkTextStruct_8006518(sUnknown_203B2D8->unk4.s0.unk3C); sUnknown_203B2D8->unk4.s0.unk3C[sUnknown_203B2D8->unk4.s0.unk34] = sUnknown_80DFC74; sUnknown_203B2D8->unk4.s0.unk38->unk14 = &sUnknown_203B2D8->unk4.unk9C; @@ -47,7 +47,7 @@ bool8 sub_802BD14(s32 a0, UnkTextStruct2_sub *a1, u32 a2) sub_8012D34(sUnknown_203B2D8->unk4.s0.unk38, a2); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE); sub_8013848(&sUnknown_203B2D8->unk4.s0.input, CountEmptyMailSlots(), a2, a0); sUnknown_203B2D8->unk4.s0.input.menuIndex = sUnknown_203B2DC; sub_8013984(&sUnknown_203B2D8->unk4.s0.input); @@ -91,7 +91,7 @@ u8 sub_802BE74(void) void sub_802BE94(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2D8->unk4.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D8->unk4.s0.unk3C, FALSE, FALSE); sUnknown_203B2D8->unk4.s0.input.unk22 = CountEmptyMailSlots(); sub_8013984(&sUnknown_203B2D8->unk4.s0.input); @@ -108,7 +108,7 @@ void sub_802BEDC(void) sUnknown_203B2DC = sUnknown_203B2D8->unk4.s0.input.menuIndex; sUnknown_203B2D8->unk4.s0.unk3C[sUnknown_203B2D8->unk4.s0.unk34] = sUnknown_80DFC5C; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2D8->unk4.s0.unk3C, TRUE, TRUE); MemoryFree(sUnknown_203B2D8); sUnknown_203B2D8 = NULL; } @@ -131,7 +131,7 @@ void CreateMailMenu(void) unkStruct_802C39C local; u8 buffer[128]; - sub_8008C54(sUnknown_203B2D8->unk4.s0.unk34); + CallPrepareTextbox_8008C54(sUnknown_203B2D8->unk4.s0.unk34); sub_80073B8(sUnknown_203B2D8->unk4.s0.unk34); PrintStringOnWindow((sUnknown_203B2D8->unk4.s0.input.unk1E * 8) + 10, 0, sMailbox, sUnknown_203B2D8->unk4.s0.unk34, 0); diff --git a/src/post_office_guide1.c b/src/post_office_guide1.c index 7dbd9abf5..dfa83817d 100644 --- a/src/post_office_guide1.c +++ b/src/post_office_guide1.c @@ -47,7 +47,7 @@ bool8 CreateHelperPelipperMenu(s16 speciesID) species_32 = speciesID; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sPostOfficeHelper = MemoryAlloc(sizeof(PostOfficeWork), 8); CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, speciesID); @@ -137,16 +137,16 @@ static void UpdateHelperPelipperText(void) case RETURN_TO_GET_HELP: switch (sPostOfficeHelper->currMenuChoice) { case GETTING_HELP: - sub_80141B4(sGettingHelpExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sGettingHelpExplanation, 0, faceFile, 0x10d); break; case SEND_SOS_MAIL: - sub_80141B4(sSendSOSMailExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sSendSOSMailExplanation, 0, faceFile, 0x10d); break; case RECEIVE_AOK_MAIL: - sub_80141B4(sReceiveAOKMailExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sReceiveAOKMailExplanation, 0, faceFile, 0x10d); break; case SEND_THANK_YOU_MAIL: - sub_80141B4(sSendThankYouMailExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sSendThankYouMailExplanation, 0, faceFile, 0x10d); break; default: break; @@ -158,19 +158,19 @@ static void UpdateHelperPelipperText(void) case RETURN_TO_GO_RESCUE: switch (sPostOfficeHelper->currMenuChoice) { case RESCUE_PROCEDURES: - sub_80141B4(sRescueProceduresExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sRescueProceduresExplanation, 0, faceFile, 0x10d); break; case RECEIVE_SOS_MAIL: - sub_80141B4(sReceiveSOSMailExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sReceiveSOSMailExplanation, 0, faceFile, 0x10d); break; case SEND_AOK_MAIL: - sub_80141B4(sSendAOKMailExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sSendAOKMailExplanation, 0, faceFile, 0x10d); break; case LEAVE_FOR_RESCUE: - sub_80141B4(sLeaveForRescueExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sLeaveForRescueExplanation, 0, faceFile, 0x10d); break; case GET_THANK_YOU_MAIL: - sub_80141B4(sGetThankYouMailExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sGetThankYouMailExplanation, 0, faceFile, 0x10d); break; default: break; @@ -185,13 +185,13 @@ static void UpdateHelperPelipperText(void) case RETURN_TO_START_MENU: switch (sPostOfficeHelper->currMenuChoice) { case POST_OFFICE: - sub_80141B4(sPostOfficeExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sPostOfficeExplanation, 0, faceFile, 0x10d); break; case BULLETIN_BOARD: - sub_80141B4(sBulletinBoardExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sBulletinBoardExplanation, 0, faceFile, 0x10d); break; case DELIVERY: - sub_80141B4(sDeliveryExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sDeliveryExplanation, 0, faceFile, 0x10d); break; default: break; @@ -203,10 +203,10 @@ static void UpdateHelperPelipperText(void) case RETURN_TO_FRIEND_RESCUE: switch (sPostOfficeHelper->currMenuChoice) { case FRIEND_RESCUE_INFO: - sub_80141B4(sFriendRescueExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sFriendRescueExplanation, 0, faceFile, 0x10d); break; case DELETING_MAIL: - sub_80141B4(sDeletingMailExplanation, 0, faceFile, 0x10d); + xxx_info_box_80141B4(sDeletingMailExplanation, 0, faceFile, 0x10d); break; default: break; diff --git a/src/post_office_guide2.c b/src/post_office_guide2.c index f1b252511..c61612dfb 100644 --- a/src/post_office_guide2.c +++ b/src/post_office_guide2.c @@ -17,7 +17,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; static EWRAM_DATA_2 unkStruct_203B330 *sUnknown_203B330 = {0}; @@ -70,7 +70,7 @@ void sub_8031A3C(void) if (sUnknown_203B330 != NULL) { sUnknown_203B330->unk18[sUnknown_203B330->unk10] = sUnknown_80E1EFC; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B330->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B330->unk18, TRUE, TRUE); MemoryFree(sUnknown_203B330); sUnknown_203B330 = NULL; } @@ -80,7 +80,7 @@ static void sub_8031A84(void) { s32 jobs; - sub_8006518(sUnknown_203B330->unk18); + RestoreUnkTextStruct_8006518(sUnknown_203B330->unk18); sUnknown_203B330->unk18[sUnknown_203B330->unk10] = sUnknown_80E1F18; if (sUnknown_203B330->unkC == 2) { @@ -92,7 +92,7 @@ static void sub_8031A84(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B330->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B330->unk18, TRUE, TRUE); } static void DisplayMissionObjectives(void) @@ -147,13 +147,13 @@ static void DisplayMissionObjectives(void) switch (jobInfo->missionType) { case WONDER_MAIL_MISSION_TYPE_DELIVER_ITEM: - BufferItemName(gUnknown_202DE58, jobInfo->targetItem, NULL); - sprintfStatic(buffer1, sFmtBring, gUnknown_202DE58); + BufferItemName(gFormatItems, jobInfo->targetItem, NULL); + sprintfStatic(buffer1, sFmtBring, gFormatItems); PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0); break; case WONDER_MAIL_MISSION_TYPE_FIND_ITEM: - BufferItemName(gUnknown_202DE58, jobInfo->targetItem, NULL); - sprintfStatic(buffer1, sFmtFind, gUnknown_202DE58); + BufferItemName(gFormatItems, jobInfo->targetItem, NULL); + sprintfStatic(buffer1, sFmtFind, gFormatItems); PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0); break; case WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT: diff --git a/src/quick_save_read.c b/src/quick_save_read.c index 01c805493..5cc9b4020 100644 --- a/src/quick_save_read.c +++ b/src/quick_save_read.c @@ -35,7 +35,7 @@ bool8 ReadQuickSave(void) sQuickSaveRead->state = 3; } else { - sub_80141B4(sSaveFailedExplanation, 0, 0, 0x301); + xxx_info_box_80141B4(sSaveFailedExplanation, 0, 0, 0x301); sQuickSaveRead->state = 2; } break; diff --git a/src/quick_save_write.c b/src/quick_save_write.c index 3e1535ac8..9f6863adf 100644 --- a/src/quick_save_write.c +++ b/src/quick_save_write.c @@ -18,9 +18,9 @@ void PrepareQuickSaveWrite(u8 *r0, u32 r1, u8 r2) sQuickSaveWrite->state = 0; if (sQuickSaveWrite->unkC != 0) - sub_80141B4(sUnknown_80D45AC, 0, 0, 0x20); + xxx_info_box_80141B4(sUnknown_80D45AC, 0, 0, 0x20); else - sub_80141B4(sUnknown_80D45AC, 0, 0, 0x20); + xxx_info_box_80141B4(sUnknown_80D45AC, 0, 0, 0x20); } u32 WriteQuickSave(void) @@ -49,19 +49,19 @@ u32 WriteQuickSave(void) sub_80121E0(987655); if (sQuickSaveWrite->unkC != 0) - sub_80141B4(sUnknown_80D45F4, 0, 0, 0x301); + xxx_info_box_80141B4(sUnknown_80D45F4, 0, 0, 0x301); else - sub_80141B4(sUnknown_80D4668, 0, 0, 0x301); + xxx_info_box_80141B4(sUnknown_80D4668, 0, 0, 0x301); sQuickSaveWrite->state = 3; break; case SAVE_NOT_WRTTEN: - sub_80141B4(sSaveNotWritten, 0, 0, 0); + xxx_info_box_80141B4(sSaveNotWritten, 0, 0, 0); sQuickSaveWrite->state = 4; break; default: sub_80121E0(987657); - sub_80141B4(sSaveFailed, 0, 0, 0x301); + xxx_info_box_80141B4(sSaveFailed, 0, 0, 0x301); sQuickSaveWrite->state = 3; break; } diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index ba3666e5f..28a97244a 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -269,7 +269,7 @@ void CreateRescuePasswordMenu(u32 currMenu) gRescuePasswordMenu->unk148[counter] = gUnknown_80E71E4; ResetUnusedInputStruct(); - sub_800641C(gRescuePasswordMenu->unk148, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gRescuePasswordMenu->unk148, TRUE, TRUE); if ((gUnknown_203B368 != 0) || (gUnknown_203B36C != currMenu)) { for(counter = 0; counter < RESCUE_PASSWORD_SIZE; counter++) @@ -314,7 +314,7 @@ void CleanRescuePasswordMenu(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); if (gRescuePasswordMenu != NULL) { sub_80155F0(); sub_8031E10(); @@ -495,7 +495,7 @@ s32 UpdateRescuePasswordMenu(void) case 0xC: sub_8039174(); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80151C0(4,gRescuePasswordBuffer); gRescuePasswordMenu->state = 8; subtract = gRescuePasswordMenu->currMenu - 0x21; @@ -523,7 +523,7 @@ s32 UpdateRescuePasswordMenu(void) case 0xC: sub_8039174(); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80151C0(4,gRescuePasswordBuffer); gRescuePasswordMenu->state = ConvertMenutoRescuePasswordState(gRescuePasswordMenu->currMenu); subtract = gRescuePasswordMenu->currMenu - 0x21; @@ -544,9 +544,9 @@ s32 UpdateRescuePasswordMenu(void) void DisplayRescuePasswordError(u32 passwordError) { - sub_8006518(gRescuePasswordMenu->unk1A8); + RestoreUnkTextStruct_8006518(gRescuePasswordMenu->unk1A8); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80155F0(); switch(passwordError) { case PASSWORD_ENTRY_INCORRECT_PASSWORD: @@ -584,9 +584,9 @@ void DisplayRescuePasswordError(u32 passwordError) void DisplayPasswordAcceptScreen(void) { - sub_8006518(gRescuePasswordMenu->unk1A8); + RestoreUnkTextStruct_8006518(gRescuePasswordMenu->unk1A8); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80155F0(); SetMenuItems(gRescuePasswordMenu->unk8,gRescuePasswordMenu->unk148,0,&gUnknown_80E7278,gUnknown_80E7290,FALSE,13,FALSE); sub_8035CF4(gRescuePasswordMenu->unk8,0,TRUE); diff --git a/src/save.c b/src/save.c index 4dae0f545..cb0b3008e 100644 --- a/src/save.c +++ b/src/save.c @@ -49,7 +49,7 @@ extern u32 sub_80954CC(void* a, s32 b); extern u32 sub_8095624(u8 *, u32); extern u32 RestoreMailInfo(void* a, s32 b); extern u32 SaveMailInfo(u8 *, u32); -extern void sub_800135C(void); +extern void ThouroughlyResetScriptVars(void); extern void sub_80958E4(u32 *a, u32 b); extern void sub_80972F4(void); extern void sub_80974E8(void); @@ -458,7 +458,7 @@ void sub_80122D0(void) void sub_80122F4(void) { - sub_800135C(); + ThouroughlyResetScriptVars(); } void InitializePlayerData(void) diff --git a/src/save_menu.c b/src/save_menu.c index e8413db98..3f589a5a8 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -132,7 +132,7 @@ void CreateSaveMenu(s32 currMenu) sUnknown_203B364->unk148[index] = gUnknown_80E6F20; } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B364->unk148, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B364->unk148, TRUE, TRUE); if (currMenu == MENU_DELETE_SAVE) { // Beware, Deleting your Adventure @@ -153,7 +153,7 @@ void CreateSaveMenu(s32 currMenu) void CleanSaveMenu(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); if (sUnknown_203B364 != NULL) { MemoryFree(sUnknown_203B364); sUnknown_203B364 = NULL; @@ -203,7 +203,7 @@ s32 UpdateSaveMenu(void) sUnknown_203B364->unk4 = 1; break; case SAVE_NOT_WRTTEN: - sub_80141B4(gUnknown_80E7178,0,0,0); + xxx_info_box_80141B4(gUnknown_80E7178,0,0,0); sUnknown_203B364->unk4 = 5; break; default: diff --git a/src/save_read.c b/src/save_read.c index 3f37afdb3..7e91fb843 100644 --- a/src/save_read.c +++ b/src/save_read.c @@ -32,7 +32,7 @@ u8 ReadSavePak(void) case 2: if (gSavePakRead->readStatus != READ_SAVE_VALID) { if (IsSaveCorrupted()) { - sub_80141B4(sSaveCorrupted, 0, 0, 0x301); + xxx_info_box_80141B4(sSaveCorrupted, 0, 0, 0x301); gSavePakRead->state = 3; } else diff --git a/src/save_write.c b/src/save_write.c index cc8fd70b0..54696e71a 100644 --- a/src/save_write.c +++ b/src/save_write.c @@ -37,10 +37,10 @@ void PrepareSavePakWrite(s16 pokemonID) if (sSavePakWrite->faceFile != 0) { preload_face = &sSavePakWrite->faceFile; - sub_80141B4(sSavingAdventure, 0, preload_face, 0x20); + xxx_info_box_80141B4(sSavingAdventure, 0, preload_face, 0x20); } else - sub_80141B4(sSavingAdventure, 0, NULL, 0x20); + xxx_info_box_80141B4(sSavingAdventure, 0, NULL, 0x20); sSavePakWrite->state = 3; } @@ -62,7 +62,7 @@ bool8 WriteSavePak(void) case 1: sSavePakWrite->unk4++; if (sSavePakWrite->unk4 > 8) { - sub_80141B4(sWriteGamePak, 0, 0, 0x20); + xxx_info_box_80141B4(sWriteGamePak, 0, 0, 0x20); sSavePakWrite->state = 3; } break; @@ -79,21 +79,21 @@ bool8 WriteSavePak(void) switch (sSavePakWrite->saveStatus) { case SAVE_COMPLETED: if (sSavePakWrite->faceFile != NULL) - sub_80141B4(sSaveCompleted, 0, faceFile, 0x101); + xxx_info_box_80141B4(sSaveCompleted, 0, faceFile, 0x101); else - sub_80141B4(sSaveCompleted, 0, faceFile, 0x101); + xxx_info_box_80141B4(sSaveCompleted, 0, faceFile, 0x101); sSavePakWrite->state = 5; break; case SAVE_NOT_WRTTEN: - sub_80141B4(sSaveNotWritten, 0, 0, 0); + xxx_info_box_80141B4(sSaveNotWritten, 0, 0, 0); sSavePakWrite->state = 6; break; default: if (sSavePakWrite->faceFile != NULL) - sub_80141B4(sSaveFailed, 0, faceFile, 0x101); + xxx_info_box_80141B4(sSaveFailed, 0, faceFile, 0x101); else - sub_80141B4(sSaveFailed, 0, faceFile, 0x101); + xxx_info_box_80141B4(sSaveFailed, 0, faceFile, 0x101); sSavePakWrite->state = 5; break; diff --git a/src/sprite.c b/src/sprite.c index 44e6418a9..48ddf797e 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -5,11 +5,11 @@ static EWRAM_DATA u16 sOAMSpriteCount = {0}; // 2025670 Written to but never read #ifndef NONMATCHING -UNUSED // TODO: Remove the "UNUSED" attribute after sub_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done #endif static EWRAM_DATA s16 sUnknown_2025672[8] = {0}; #ifndef NONMATCHING -UNUSED // TODO: Remove the "UNUSED" attribute after sub_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done #endif static EWRAM_DATA s16 sUnknown_2025682[9] = {0}; static EWRAM_DATA Position sUnknown_2025694 = {0}; @@ -30,11 +30,11 @@ static EWRAM_DATA_2 unkStruct_20266B0 *sUnknown_203B074 = {0}; extern void nullsub_3(s32, s32); #ifndef NONMATCHING -UNUSED // TODO: Remove the "UNUSED" attribute after sub_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done #endif static void RegisterSpriteParts_80052BC(UnkSpriteMem *); -static void sub_800545C(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, bool8); +static void AxResInitUnoriented_800545C(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, bool8); void InitSprites(void) { @@ -156,7 +156,7 @@ void sub_8004E8C(unkStruct_2039DB0 *a0) // https://decomp.me/scratch/VYqKb // spriteMasks is a u16[6] #ifdef NONMATCHING -static void sub_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) +static void AddAxSprite_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) { // size: 0xC struct UnkStackFor8004EA8 @@ -258,7 +258,7 @@ static void sub_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteM } #else NAKED -static void sub_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) +static void AddAxSprite_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) { asm_unified( "push {r4-r7,lr}\n" @@ -829,7 +829,7 @@ static void RegisterSpriteParts_80052BC(UnkSpriteMem *a0) } } #else -UNUSED // TODO: Remove the "UNUSED" attribute after sub_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done NAKED static void RegisterSpriteParts_80052BC(UnkSpriteMem *a0) { @@ -897,16 +897,16 @@ void sub_800533C(ax_pose **a0, UnkSpriteMem **a1, axdata1 *a2, u16 *spriteMasks, if (a4 != 0 && r4->sprite > -1) mem = a1[r4->sprite]; - sub_8004EA8(r4, a2, mem, spriteMasks); + AddAxSprite_8004EA8(r4, a2, mem, spriteMasks); } } -void sub_80053AC(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 a4, u32 spriteAnimIndex, bool8 a6) +void AxResInitFile_80053AC(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 a4, u32 spriteAnimIndex, bool8 a6) { - sub_80053D0(a0, (Dungeon_ax *)a1->data, a2, a3, a4, spriteAnimIndex, a6); + AxResInit_80053D0(a0, (Dungeon_ax *)a1->data, a2, a3, a4, spriteAnimIndex, a6); } -void sub_80053D0(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6) +void AxResInit_80053D0(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6) { a0->unk0 = 0x8000; if (a6) @@ -929,12 +929,12 @@ void sub_80053D0(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 direction, u3 a0->unk30 = a1->unk10; } -void sub_800543C(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) +void AxResInitUnorientedFile_800543C(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) { - sub_800545C(a0, (Dungeon_ax *)a1->data, a2, a3, spriteAnimIndex, a5); + AxResInitUnoriented_800545C(a0, (Dungeon_ax *)a1->data, a2, a3, spriteAnimIndex, a5); } -static void sub_800545C(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) +static void AxResInitUnoriented_800545C(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) { a0->unk0 = 0x8000; if (a5) @@ -964,7 +964,7 @@ static inline s16 check_flag_for_80054BC(u16 flags) { } -void sub_80054BC(struct axPokemon *a0) +void RunAxAnimationFrame_80054BC(struct axPokemon *a0) { ax_anim *aData; diff --git a/src/status.c b/src/status.c index 1506daf40..e4b145438 100644 --- a/src/status.c +++ b/src/status.c @@ -23,7 +23,7 @@ #include "structs/str_dungeon.h" extern u8 gAvailablePokemonNames[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 *gUnknown_80FBD78[]; extern u8 *gUnknown_80FBD9C[]; @@ -233,10 +233,10 @@ void ChangeAttackMultiplierTarget(Entity *pokemon, Entity *target, u32 statStage } if (statStage != STAT_STAGE_ATK) { - strcpy(gUnknown_202DE58,*gUnknown_80FC0C8); + strcpy(gFormatItems,*gUnknown_80FC0C8); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC0B8); + strcpy(gFormatItems,*gUnknown_80FC0B8); } if ((param_4 < 0x100) && sub_8071728(pokemon,target,displayMessage)) { return; @@ -298,10 +298,10 @@ void ChangeDefenseMultiplierTarget(Entity *pokemon, Entity *target, u32 statStag } if (statStage != STAT_STAGE_DEF) { - strcpy(gUnknown_202DE58,*gUnknown_80FC0AC); + strcpy(gFormatItems,*gUnknown_80FC0AC); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC09C); + strcpy(gFormatItems,*gUnknown_80FC09C); } if ((param_4 < 0x100) && sub_8071728(pokemon,target,displayMessage)) { return; @@ -348,10 +348,10 @@ void RaiseAccuracyStageTarget(Entity * pokemon, Entity * target, s32 statStage) SetMessageArgument(gAvailablePokemonNames,target,0); sub_8042040(target,statStage); if (statStage != STAT_STAGE_ACCURACY) { - strcpy(gUnknown_202DE58,*gUnknown_80FC090); + strcpy(gFormatItems,*gUnknown_80FC090); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC084); + strcpy(gFormatItems,*gUnknown_80FC084); } if (entityInfo->hitChanceStages[statStage] < MAX_STAT_STAGE) { entityInfo->hitChanceStages[statStage]++; @@ -370,10 +370,10 @@ void LowerAccuracyStageTarget(Entity * pokemon, Entity * target, s32 statStage, if (EntityExists(target)) { if (statStage != STAT_STAGE_ACCURACY) { - strcpy(gUnknown_202DE58,*gUnknown_80FC090); + strcpy(gFormatItems,*gUnknown_80FC090); } else { - strcpy(gUnknown_202DE58,*gUnknown_80FC084); + strcpy(gFormatItems,*gUnknown_80FC084); } if (!sub_8071728(pokemon,target,displayMessage)) { if (HasAbility(target, ABILITY_KEEN_EYE) && (statStage == STAT_STAGE_ACCURACY)){ diff --git a/src/status_actions.c b/src/status_actions.c index d60ca77f7..12e72f85d 100644 --- a/src/status_actions.c +++ b/src/status_actions.c @@ -140,7 +140,7 @@ extern s16 gUnknown_80F4F94[]; extern u8 *gUnknown_80FC5A8[]; extern u8 *gPtrForecastPreventsTypeSwitchMessage[]; extern u8 *gUnknown_80FEB08[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern s16 gUnknown_80F4E08; extern u8 gDungeonCamouflageTypes[76]; extern u32 gUnknown_202F228; @@ -257,7 +257,7 @@ bool8 HandleColorChange(Entity * pokemon, Entity * target) entityInfo->isColorChanged = TRUE; SetMessageArgument(gUnknown_202DFE8,target,0); typeString = GetUnformattedTypeString(newType); - strcpy(gUnknown_202DE58, typeString); + strcpy(gFormatItems, typeString); sub_80522F4(pokemon,target,*gUnknown_80FEB08); return TRUE; } diff --git a/src/text1.c b/src/text1.c index d0d0f427c..a46d98b37 100644 --- a/src/text1.c +++ b/src/text1.c @@ -17,9 +17,9 @@ extern OpenedFile *gCharmapFiles[2]; // 202AFB4 extern UnkTextStruct2 gUnknown_202AFC0[4]; extern u32 gUnknown_202B020; extern u32 gUnknown_202B024; -extern u32 gUnknown_202B028[2]; -extern u32 gUnknown_202B030; // Some text color info is stored; retrieve via "& 0xF" -extern u8 gUnknown_202B034; +extern u32 gCharHeight[2]; +extern u32 gTextShadowMask; // Some text color info is stored; retrieve via "& 0xF" +extern u8 gDrawTextShadow; extern u16 gUnknown_202B038[4][32][32]; // ? @@ -29,14 +29,14 @@ extern s16 gUnknown_3000E94[]; extern const UnkTextStruct2 gUnknown_80B857C[4]; extern const u8 gKanjiA_file_string[]; // 80B87B4 extern const u8 gKanjiB_file_string[]; // 80B87BC -extern const u32 gUnknown_80B87C4[8]; -extern const u32 gUnknown_80B87E4[8]; +extern const u32 gFadeInNone[8]; +extern const u32 gFadeInDungeon[8]; extern const u32 gUnknown_80B8804[4]; extern const u32 gUnknown_80B8814[]; // system_sbin.s extern const struct FileArchive gSystemFileArchive; -static void sub_8006438(const UnkTextStruct2 *, bool8, bool8, UnkTextStruct2_sub *); +static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct2 *, bool8, bool8, UnkTextStruct2_sub *); void LoadCharmaps(void) { @@ -49,8 +49,8 @@ void LoadCharmaps(void) gCharmapFiles[1] = OpenFileAndGetFileDataPtr(gKanjiB_file_string, &gSystemFileArchive); gCharmaps[0] = gCharmapFiles[0]->data; gCharmaps[1] = gCharmapFiles[1]->data; - gUnknown_202B028[0] = 11; - gUnknown_202B028[1] = 12; + gCharHeight[0] = 11; + gCharHeight[1] = 12; for (k = 0; k < 4; k++) { gUnknown_2027370[k].unk4 = 0; @@ -70,16 +70,16 @@ void LoadCharmaps(void) } } - gUnknown_202B034 = 1; - gUnknown_202B030 = 0x88888888; + gDrawTextShadow = 1; + gTextShadowMask = 0x88888888; gUnknown_203B078 = NULL; gUnknown_20274A5 = 0; gUnknown_202B020 = 1; gUnknown_202B024 = 20; - xxx_update_some_bg_tiles(0); + UpdateFadeInTile(0); } -u32 xxx_update_some_bg_tiles(u32 a0) +u32 UpdateFadeInTile(u32 a0) { u32 r5 = gUnknown_20274B0; u32 *r4 = (u32 *)(VRAM + 0x4F40); @@ -88,14 +88,14 @@ u32 xxx_update_some_bg_tiles(u32 a0) if (a0 == 0 || a0 == 2) { sub_800CDA8(2); - r2 = gUnknown_80B87C4; + r2 = gFadeInNone; } else { sub_800CDA8(1); - r2 = gUnknown_80B87E4; + r2 = gFadeInDungeon; } - gUnknown_202B030 = 0x88888888; + gTextShadowMask = 0x88888888; *r4++ = *r2++; *r4++ = *r2++; *r4++ = *r2++; @@ -112,10 +112,10 @@ u32 sub_80063B0(void) return gUnknown_20274B0; } -u8 sub_80063BC(u8 a0) +u8 UnusedSetTextShadow(u8 a0) { - u8 retval = gUnknown_202B034; - gUnknown_202B034 = a0; + u8 retval = gDrawTextShadow; + gDrawTextShadow = a0; return retval; } @@ -124,7 +124,7 @@ void SelectCharmap(u32 a0) gCurrentCharmap = a0; } -void sub_80063D8(int a0) +void SetCharacterMask(int a0) { u32 retval; if (a0 == 0) { @@ -140,17 +140,17 @@ void sub_80063D8(int a0) retval |= ((a0 & 0xF) << 24); retval |= ((a0 & 0xF) << 28); } - gUnknown_202B030 = retval; + gTextShadowMask = retval; } -// TODO: Move sub_800641C and sub_8006438 to text2.c ? data.s shows text1 and text2 are merged somehow but not fully -void sub_800641C(UnkTextStruct2 *a0, bool8 a1, bool8 a2) +// TODO: Move xxx_call_save_unk_text_struct_800641C and SaveUnkTextStructAndXXX_8006438 to text2.c ? data.s shows text1 and text2 are merged somehow but not fully +void xxx_call_save_unk_text_struct_800641C(UnkTextStruct2 *a0, bool8 a1, bool8 a2) { UnkTextStruct2_sub r3 = {0, 0}; - sub_8006438(a0, a1, a2, &r3); + SaveUnkTextStructAndXXX_8006438(a0, a1, a2, &r3); } -static void sub_8006438(const UnkTextStruct2 *a0, bool8 a1, bool8 a2, UnkTextStruct2_sub *a3) +static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct2 *a0, bool8 a1, bool8 a2, UnkTextStruct2_sub *a3) { s32 i; u32 r9; diff --git a/src/text2.c b/src/text2.c index 11a72870b..b147a87c1 100644 --- a/src/text2.c +++ b/src/text2.c @@ -4,14 +4,14 @@ // data.s extern const u32 gUnknown_80B853C[16]; -extern const struct unkShiftData gUnknown_80B85DC[8]; +extern const struct unkShiftData gCharMasksOffsets[8]; extern const u32 gUnknown_80B8814[]; extern const struct unkStruct_80B8824 gUnknown_80B8824; extern const struct unkStruct_80B8848 gUnknown_80B8848; // text.s extern void sub_8007E64(UnkTextStruct1 *, u16 *, u32, u32, u32, u32, u32, u8 *, u32); -extern void sub_8008C6C(UnkTextStruct1 *, u32); +extern void PrepareTextbox_8008C6C(UnkTextStruct1 *, u32); void nullsub_129(u32, s32, s32, s32, u32); u32 xxx_draw_char(UnkTextStruct1 *, s32, s32, u32, u32, u32); @@ -31,7 +31,7 @@ void nullsub_152(void) { } -void sub_8006518(UnkTextStruct2 *unkData) +void RestoreUnkTextStruct_8006518(UnkTextStruct2 *unkData) { s32 iVar2; for (iVar2 = 0; iVar2 < 4; iVar2++) @@ -136,7 +136,7 @@ void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const Un } if ((a5->unk0 & 0x80) == 0) - sub_8008C6C(a0, a4); + PrepareTextbox_8008C6C(a0, a4); t1->unk46 = 0; } @@ -1410,7 +1410,7 @@ u32 xxx_draw_char(UnkTextStruct1 *a0, s32 x, s32 y, u32 a3, u32 color, u32 a5) "\tb _08007508\n" "\t.align 2, 0\n" "_080074F8: .4byte 0x00008199\n" -"_080074FC: .4byte gUnknown_202B034\n" +"_080074FC: .4byte gDrawTextShadow\n" "_08007500:\n" "\tmovs r3, 0\n" "\tstr r3, [sp, 0x1C]\n" @@ -1607,8 +1607,8 @@ u32 xxx_draw_char(UnkTextStruct1 *a0, s32 x, s32 y, u32 a3, u32 color, u32 a5) "\tblt _08007570\n" "\tb _0800786C\n" "\t.align 2, 0\n" -"_08007664: .4byte gUnknown_80B85DC\n" -"_08007668: .4byte gUnknown_202B028\n" +"_08007664: .4byte gCharMasksOffsets\n" +"_08007668: .4byte gCharHeight\n" "_0800766C: .4byte gCurrentCharmap\n" "_08007670:\n" "\tmovs r0, 0\n" @@ -1897,24 +1897,24 @@ u32 xxx_draw_char(UnkTextStruct1 *a0, s32 x, s32 y, u32 a3, u32 color, u32 a5) "\tpop {r1}\n" "\tbx r1\n" "\t.align 2, 0\n" -"_0800788C: .4byte gUnknown_80B85DC\n" -"_08007890: .4byte gUnknown_202B028\n" +"_0800788C: .4byte gCharMasksOffsets\n" +"_08007890: .4byte gCharHeight\n" "_08007894: .4byte gCurrentCharmap\n" "_08007898: .4byte 0x11111111\n" -"_0800789C: .4byte gUnknown_202B030\n" +"_0800789C: .4byte gTextShadowMask\n" "_080078A0: .4byte gCharacterSpacing"); } void sub_80078A4(u32 a0, s32 x, s32 y, s32 a3, u32 color) { sub_800792C(a0, x, y, a3, color); - sub_800792C(a0, x, y + 1, a3, gUnknown_202B030 & 0xF); + sub_800792C(a0, x, y + 1, a3, gTextShadowMask & 0xF); } UNUSED static void sub_80078E8(u32 a0, s32 x, s32 y, s32 a3, u32 color) { nullsub_129(a0, x, y, a3, color); - nullsub_129(a0, x, y + 1, a3, gUnknown_202B030 & 0xF); + nullsub_129(a0, x, y + 1, a3, gTextShadowMask & 0xF); } void sub_800792C(u32 a0, s32 x, s32 y, s32 a3, u32 color) @@ -1957,7 +1957,7 @@ void sub_8007958(UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 color) if (lol > 7) lol = 8; - shiftData = &gUnknown_80B85DC[x + (x / 8 * -8)]; + shiftData = &gCharMasksOffsets[x + (x / 8 * -8)]; uVar4 = dataLOL.arr[lol]; uVar4 = (uVar4 & 0x11111111) + (uVar4 & r9); diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index a4455fcc9..b6b33e4f7 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -237,7 +237,7 @@ u32 CreateThankYouMailPelipper(void) unkStruct_203B480 *mail; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B2C4 = MemoryAlloc(sizeof(WonderMailStruct_203B2C4), 8); MemoryFill8((u8 *)sUnknown_203B2C4, 0, sizeof(WonderMailStruct_203B2C4)); @@ -439,34 +439,34 @@ void PrintThankYouMailLinkError(u32 errorCode) { switch(errorCode) { case COMMS_INCORRECT_NUM_SYSTEMS: - sub_80141B4(gUnknown_80DEF28, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DEF28, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_DIFFERENT_MODES: - sub_80141B4(gUnknown_80DEF80, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DEF80, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_NO_ROOM_STORAGE: - sub_80141B4(gUnknown_80DEFDC, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DEFDC, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_DUPLICATE_MAIL: - sub_80141B4(gUnknown_80DF044, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF044, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_NOT_ELIGIBLE_1: - sub_80141B4(gUnknown_80DF0A0, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF0A0, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_NOT_ELIGIBLE_2: - sub_80141B4(gUnknown_80DF0A0, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF0A0, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_NO_ROOM_MAIL: - sub_80141B4(gUnknown_80DF0E0, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF0E0, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case 1: case COMMS_NO_RESPONSE: case 5: case 14: - sub_80141B4(gUnknown_80DEF04, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DEF04, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_NOT_READY: - sub_80141B4(gUnknown_80DF138, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF138, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case COMMS_GOOD: default: @@ -495,7 +495,7 @@ void DisplayThankYouMailCommsOutcome(void) case WONDER_MAIL_PASSWORD: case 6: // "Thank-You Mail has been sent" - sub_80141B4(gUnknown_80DF194, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF194, 0, &sUnknown_203B2C4->faceFile, 0x10d); break; case 4: default: @@ -525,7 +525,7 @@ void sub_802A050(void) case 2: sub_8031E10(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); SetThankYouMailMenuState(0x1B); break; case 1: @@ -571,9 +571,9 @@ void sub_802A0C8(void) case 4: sUnknown_203B2C4->fallbackState = 0x10; sUnknown_203B2C4->mailIndex = sub_80307EC(); - sub_8006518(sUnknown_203B2C4->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C4->mailIndex,0); SetThankYouMailMenuState(0x12); break; @@ -607,9 +607,9 @@ void sub_802A174(void) break; case 0xC: sUnknown_203B2C4->fallbackState = 0x2b; - sub_8006518(sUnknown_203B2C4->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C4->mailIndex,0); SetThankYouMailMenuState(0x12); break; @@ -631,7 +631,7 @@ void sub_802A230(void) case 3: sub_8030DE4(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); sub_803092C(); if (sUnknown_203B2C4->fallbackState == 0x2b) { sub_8035CF4(sUnknown_203B2C4->unk21C, 3, TRUE); @@ -666,9 +666,9 @@ void sub_802A28C(void) case 4: sUnknown_203B2C4->fallbackState = 0x13; sUnknown_203B2C4->unk41C.id = sub_801CB24(); - sub_8006518(sUnknown_203B2C4->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_801B3C0(&sUnknown_203B2C4->unk41C); SetThankYouMailMenuState(SHOW_ITEM_TO_SEND_INFO); break; @@ -683,7 +683,7 @@ void sub_802A33C(void) case 3: sub_801B450(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); sub_801CB5C(TRUE); if (sUnknown_203B2C4->fallbackState == 0x2b) { sub_8035CF4(sUnknown_203B2C4->unk21C,3,TRUE); @@ -717,9 +717,9 @@ void sub_802A39C(void) break; case 0xC: sUnknown_203B2C4->fallbackState = 0x2b; - sub_8006518(sUnknown_203B2C4->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_801B3C0(&sUnknown_203B2C4->unk41C); SetThankYouMailMenuState(SHOW_ITEM_TO_SEND_INFO); break; @@ -808,11 +808,11 @@ void HandleThankYouMailPasswordMenu(void) SetThankYouMailMenuState(THANK_YOU_PASSWORD_WRONG); break; case PASSWORD_ENTRY_NOT_THANK_YOU_MAIL: - sub_80141B4(gUnknown_80DF208, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF208, 0, &sUnknown_203B2C4->faceFile, 0x10d); SetThankYouMailMenuState(PRINT_THANK_YOU_ERROR); break; case PASSWORD_ENTRY_DUPLICATE_THANK_YOU_MAIL: - sub_80141B4(gUnknown_80DF0A0, 0, &sUnknown_203B2C4->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DF0A0, 0, &sUnknown_203B2C4->faceFile, 0x10d); SetThankYouMailMenuState(PRINT_THANK_YOU_ERROR); break; case PASSWORD_ENTRY_THANK_YOU_MAIL_SUCCESS: @@ -832,7 +832,7 @@ void HandleThankYouMailPasswordMenu(void) case 2: sub_80155F0(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C4->unk3BC, TRUE, TRUE); SetThankYouMailMenuState(ANYTHING_ELSE_THANK_YOU_MAIN_MENU); break; } @@ -1255,7 +1255,7 @@ void UpdateThankYouMailText(void) pokeStruct = GetPlayerPokemonStruct(); sub_80922B4(buffer1,pokeStruct->name, POKEMON_NAME_LENGTH); sprintfStatic(sUnknown_203B2C4->formattedString,gUnknown_80DF250,buffer1); - sub_80141B4(sUnknown_203B2C4->formattedString,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(sUnknown_203B2C4->formattedString,0,&sUnknown_203B2C4->faceFile,0x10d); break; case 0xe: // Is it OK to send this Thank-You Mail? @@ -1263,17 +1263,17 @@ void UpdateThankYouMailText(void) break; case PROMPT_THANK_YOU_TO_SEND: // Please choose the Thank-You Mail that you want to send to your friend - sub_80141B4(gUnknown_80DF330,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF330,0,&sUnknown_203B2C4->faceFile,0x10d); break; case 0x10: if (sub_8030894() != 0) break; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80306A8(WONDER_MAIL_TYPE_THANK_YOU,0,0,6); break; case 0x11: - sub_8006518(sUnknown_203B2C4->unk35C); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk35C); SetMenuItems(sUnknown_203B2C4->unk21C,sUnknown_203B2C4->unk35C,3,&gUnknown_80DED60,gUnknown_80DED78,TRUE,0,FALSE); sub_803092C(); sub_8035CF4(sUnknown_203B2C4->unk21C,3,TRUE); @@ -1282,14 +1282,14 @@ void UpdateThankYouMailText(void) if (sub_801D008() != NULL) break; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); { UnkTextStruct2_sub local_x = {3, 2}; sub_801C8C4(0, 1, &local_x, 9); } break; case 0x14: - sub_8006518(sUnknown_203B2C4->unk35C); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk35C); SetMenuItems(sUnknown_203B2C4->unk21C,sUnknown_203B2C4->unk35C,3,&gUnknown_80DED48,gUnknown_80DED78,TRUE,0,FALSE); sub_801CCD8(); sub_8035CF4(sUnknown_203B2C4->unk21C,3,TRUE); @@ -1333,35 +1333,35 @@ void UpdateThankYouMailText(void) break; case PROMPT_THANK_YOU_PASSWORD: // OK. Please enter the Thank-You Mail Password - sub_80141B4(gUnknown_80DF380,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF380,0,&sUnknown_203B2C4->faceFile,0x10d); break; case PROCESS_THANK_YOU_PASSWORD: - sub_8006518(sUnknown_203B2C4->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80151C0(4,sUnknown_203B2C4->passwordBuffer); break; case 0x1a: - sub_8006518(sUnknown_203B2C4->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C4->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8031D70(sUnknown_203B2C4->mailIndex,0); break; case 0x1b: // Please give this password to the friend that rescued your team. I also must save your adventure - sub_80141B4(gUnknown_80DF3B4,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF3B4,0,&sUnknown_203B2C4->faceFile,0x10d); break; case DISPLAY_THANK_YOU_PASSWORD: // Ok. Here is your Thank You Mail Password - sub_80141B4(gUnknown_80DF418,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF418,0,&sUnknown_203B2C4->faceFile,0x10d); break; case 0x24: // I need to save your adventure - sub_80141B4(gUnknown_80DF44C,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF44C,0,&sUnknown_203B2C4->faceFile,0x10d); break; case 0x20: // There we go. I'm all done. - sub_80141B4(gUnknown_80DF46C,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF46C,0,&sUnknown_203B2C4->faceFile,0x10d); break; case THANK_YOU_PASSWORD_SUCCESS: switch(sUnknown_203B2C4->wonderMailMethod) @@ -1370,7 +1370,7 @@ void UpdateThankYouMailText(void) case WONDER_MAIL_PASSWORD: case 6: // A Thank You Mail has arrived from your friend - sub_80141B4(gUnknown_80DF4F4,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF4F4,0,&sUnknown_203B2C4->faceFile,0x10d); break; case 4: break; @@ -1399,11 +1399,11 @@ void UpdateThankYouMailText(void) case COMMUNICATING_THANK_YOU_MAIL: // Communicating.. nullsub_23(FALSE); - sub_80141B4(gUnknown_80DF544,0,0,0); + xxx_info_box_80141B4(gUnknown_80DF544,0,0,0); break; case 0x17: // There. I've sent your thank-you mail. I need to save your adventure. - sub_80141B4(gUnknown_80DF594,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF594,0,&sUnknown_203B2C4->faceFile,0x10d); break; case PROMPT_CONNECT_GAME_LINK: // Please connect the GBA systems with a Game Link Cable @@ -1413,7 +1413,7 @@ void UpdateThankYouMailText(void) pokeStruct2 = GetPlayerPokemonStruct(); sub_80922B4(buffer2, pokeStruct2->name, POKEMON_NAME_LENGTH); sprintfStatic(sUnknown_203B2C4->formattedString,gUnknown_80DF63C,buffer2); - sub_80141B4(sUnknown_203B2C4->formattedString,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(sUnknown_203B2C4->formattedString,0,&sUnknown_203B2C4->faceFile,0x10d); break; case CONFIRM_ITEM_TO_SEND: // The item you've chosen can't be exchanged later. Is that OK? @@ -1421,15 +1421,15 @@ void UpdateThankYouMailText(void) break; case 0x29: // I need to save your adventure - sub_80141B4(gUnknown_80DF44C,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF44C,0,&sUnknown_203B2C4->faceFile,0x10d); break; case 0x2a: // I've saved your adventure - sub_80141B4(gUnknown_80DF6F0,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF6F0,0,&sUnknown_203B2C4->faceFile,0x10d); break; case PROMPT_ITEM_TO_SEND: // Ok, please choose the item to be sent - sub_80141B4(gUnknown_80DF710,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF710,0,&sUnknown_203B2C4->faceFile,0x10d); break; case THANK_YOU_MAIL_STORAGE_EMPTY: // Oh? Your storage space is empty @@ -1441,7 +1441,7 @@ void UpdateThankYouMailText(void) break; case ITEM_EXISTS_ON_THANK_YOU_MAIL: // Oh? You've already attached a reward item on this mail. - sub_80141B4(gUnknown_80DF7D4,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF7D4,0,&sUnknown_203B2C4->faceFile,0x10d); break; case PROMPT_RESEND_WITH_ATTACHED_ITEM: // Would you like to send it again with the item you chose before? @@ -1449,7 +1449,7 @@ void UpdateThankYouMailText(void) break; case NO_THANK_YOU_MAIL: // You don't seem to have a Thank-You Mail - sub_80141B4(gUnknown_80DF8B4,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF8B4,0,&sUnknown_203B2C4->faceFile,0x10d); break; case THANK_YOU_MAIL_MAIN_MENU: // Hello. I handle Thank You Mail. How may I help You? @@ -1461,7 +1461,7 @@ void UpdateThankYouMailText(void) break; case EXIT_THANK_YOU_MAIL_PRE: // Please come see me anytime - sub_80141B4(gUnknown_80DF94C,0,&sUnknown_203B2C4->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DF94C,0,&sUnknown_203B2C4->faceFile,0x10d); break; case SELECT_THANK_YOU_MAIL_COMMS: switch(sUnknown_203B2C4->wonderMailMode){ diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index dbe1154bb..c87827123 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -18,7 +18,7 @@ #include "trade_items_menu.h" extern u32 gFormatData_202DE30; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; static EWRAM_DATA_2 struct TradeItemsMenu *sTradeItemsMenu = {0}; @@ -53,7 +53,7 @@ void WriteandExitTradeItemsMenu(); s32 CreateTradeItemsMenu(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sTradeItemsMenu = MemoryAlloc(sizeof(struct TradeItemsMenu), 8); MemoryFill8((u8 *)sTradeItemsMenu, 0, sizeof(struct TradeItemsMenu)); sub_8035C1C(); @@ -182,9 +182,9 @@ void sub_80365AC(void) sTradeItemsMenu->fallbackState = TRADE_ITEMS_SEND_ITEM_SELECTION; sTradeItemsMenu->itemToSend.id = sub_801CB24(); sTradeItemsMenu->itemToSend.quantity = 1; - sub_8006518(sTradeItemsMenu->unk1E4); + RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk1E4); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_801B3C0(&sTradeItemsMenu->itemToSend); SetTradeItemMenu(TRADE_ITEMS_ITEM_INFO); break; @@ -206,9 +206,9 @@ void sub_8036674(void) break; case 4: // Info sTradeItemsMenu->fallbackState = 0x13; - sub_8006518(sTradeItemsMenu->unk1E4); + RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk1E4); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_801B3C0(&sTradeItemsMenu->itemToSend); SetTradeItemMenu(TRADE_ITEMS_ITEM_INFO); break; @@ -230,7 +230,7 @@ void sub_8036728(void) case 3: sub_801B450(); ResetUnusedInputStruct(); - sub_800641C(sTradeItemsMenu->unk1E4, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sTradeItemsMenu->unk1E4, TRUE, TRUE); sub_801CB5C(TRUE); if (sTradeItemsMenu->fallbackState == 0x13) { sub_8035CF4(sTradeItemsMenu->unk44, 3, TRUE); @@ -506,12 +506,12 @@ void sub_8036B28(void) } break; case TRADE_ITEMS_SEND_ITEM: - sub_80141B4(sPleaseChooseItem,0,0,0x101); + xxx_info_box_80141B4(sPleaseChooseItem,0,0,0x101); break; case TRADE_ITEMS_SEND_ITEM_SELECTION: if (sub_801D008() == NULL) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); { UnkTextStruct2_sub local_10 = {3, 2}; sub_801C8C4(0,1,&local_10,9); @@ -519,7 +519,7 @@ void sub_8036B28(void) } break; case TRADE_ITEMS_SEND_ITEM_POPUP_MENU: - sub_8006518(sTradeItemsMenu->unk184); + RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk184); SetMenuItems(sTradeItemsMenu->unk44,sTradeItemsMenu->unk184,3,&sUnknown_80E60EC, sUnknown_80E6104,TRUE,0,FALSE); sub_801CCD8(); @@ -530,7 +530,7 @@ void sub_8036B28(void) break; case TRADE_ITEMS_SEND_ITEM_CONFIRM: gFormatData_202DE30 = sTradeItemsMenu->unk14.unk0; - BufferItemName(gUnknown_202DE58,sTradeItemsMenu->itemToSend.id,NULL); + BufferItemName(gFormatItems,sTradeItemsMenu->itemToSend.id,NULL); sub_8014248(sFmtWillBeSentPrompt,0,5, sUnknown_80E6154,0,4,0,0,0x101); break; case TRADE_ITEMS_RECEIVE_ITEM: @@ -541,7 +541,7 @@ void sub_8036B28(void) break; case TRADE_ITEMS_IN_COMMUNICATION: nullsub_23(FALSE); - sub_80141B4(sInCommunication,0,0,0); + xxx_info_box_80141B4(sInCommunication,0,0,0); break; case 10: sTradeItemsMenu->linkStatus = COMMS_GOOD; @@ -589,18 +589,18 @@ void sub_8036B28(void) case 0xe: if (sTradeItemsMenu->unk24C.quantity == 0) { gFormatData_202DE30 = sTradeItemsMenu->unk244.quantity; - BufferItemName(gUnknown_202DE58,sTradeItemsMenu->unk244.itemIdx.id,NULL); + BufferItemName(gFormatItems,sTradeItemsMenu->unk244.itemIdx.id,NULL); } else { gFormatData_202DE30 = sTradeItemsMenu->unk24C.quantity; - BufferItemName(gUnknown_202DE58,sTradeItemsMenu->unk24C.itemIdx.id,NULL); + BufferItemName(gFormatItems,sTradeItemsMenu->unk24C.itemIdx.id,NULL); } - sub_80141B4(sFmtYouReceived,0,0,0x101); + xxx_info_box_80141B4(sFmtYouReceived,0,0,0x101); break; case 0xd: gFormatData_202DE30 = sTradeItemsMenu->unk14.unk0; - BufferItemName(gUnknown_202DE58,sTradeItemsMenu->itemToSend.id,NULL); - sub_80141B4(sFmtYouSent,0,0,0x101); + BufferItemName(gFormatItems,sTradeItemsMenu->itemToSend.id,NULL); + xxx_info_box_80141B4(sFmtYouSent,0,0,0x101); break; case 0xB: case 0xC: @@ -619,28 +619,28 @@ void PrintTradeItemsLinkError(u32 errorNum) case COMMS_GOOD: break; case 1: - sub_80141B4(sCommunicationError, 0, 0, 0x101); + xxx_info_box_80141B4(sCommunicationError, 0, 0, 0x101); break; case COMMS_INCORRECT_NUM_SYSTEMS: - sub_80141B4(sInvalidGBACount, 0, 0, 0x101); + xxx_info_box_80141B4(sInvalidGBACount, 0, 0, 0x101); break; case COMMS_NO_RESPONSE: - sub_80141B4(sNoResponseSoRedo, 0, 0, 0x101); + xxx_info_box_80141B4(sNoResponseSoRedo, 0, 0, 0x101); break; case COMMS_DIFFERENT_MODES: - sub_80141B4(sUnequalModes, 0, 0, 0x101); + xxx_info_box_80141B4(sUnequalModes, 0, 0, 0x101); break; case 5: - sub_80141B4(sCommunicationError, 0, 0, 0x101); + xxx_info_box_80141B4(sCommunicationError, 0, 0, 0x101); break; case 0xe: - sub_80141B4(sCommunicationError, 0, 0, 0x101); + xxx_info_box_80141B4(sCommunicationError, 0, 0, 0x101); break; case COMMS_NOT_READY: - sub_80141B4(sNoResponseCheckSenderReceiver, 0, 0, 0x101); + xxx_info_box_80141B4(sNoResponseCheckSenderReceiver, 0, 0, 0x101); break; default: - sub_80141B4(sCommunicationError, 0, 0, 0x101); + xxx_info_box_80141B4(sCommunicationError, 0, 0, 0x101); break; } } @@ -658,7 +658,7 @@ void sub_8036ECC(u32 index, u32 r1) sub_8013AA0(&sTradeItemsMenu->unk14); sTradeItemsMenu->unk184[index] = sUnknown_80E6174; ResetUnusedInputStruct(); - sub_800641C(sTradeItemsMenu->unk184, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sTradeItemsMenu->unk184, TRUE, TRUE); } void sub_8036F30(void) @@ -666,7 +666,7 @@ void sub_8036F30(void) u32 uVar1; uVar1 = sTradeItemsMenu->unk14.unk14; - sub_8008C54(uVar1); + CallPrepareTextbox_8008C54(uVar1); sub_80073B8(uVar1); PrintStringOnWindow(2, 0, sHowMany, uVar1, 0); sub_8013C68(&sTradeItemsMenu->unk14); @@ -675,7 +675,7 @@ void sub_8036F30(void) void sub_8036F74(void) { - sub_8006518(sTradeItemsMenu->unk184); + RestoreUnkTextStruct_8006518(sTradeItemsMenu->unk184); sub_8036ECC(2, gTeamInventoryRef->teamStorage[sTradeItemsMenu->itemToSend.id]); sub_801CCD8(); sub_8035CF4(sTradeItemsMenu->unk44, 3, FALSE); diff --git a/src/trap.c b/src/trap.c index f5c58711c..9aa45b7ce 100644 --- a/src/trap.c +++ b/src/trap.c @@ -21,7 +21,7 @@ #include "structs/str_dungeon.h" extern u8 gAvailablePokemonNames[]; -extern u8 gUnknown_202DE58[]; +extern u8 gFormatItems[]; extern u8 *gTrapNames[]; extern u8 *gUnknown_80FC5FC[]; @@ -434,7 +434,7 @@ void HandleStickyTrap(Entity *pokemon,Entity *target) } else { newIndex = DungeonRandInt(itemCount); - sub_8045BF8(gUnknown_202DE58, itemStack[newIndex]); + sub_8045BF8(gFormatItems, itemStack[newIndex]); itemStack[newIndex]->flags |= ITEM_FLAG_STICKY; sub_80421C0(target, 0x192); sub_80522F4(pokemon,target,*gUnknown_80FDC18); @@ -661,7 +661,7 @@ void HandlePPZeroTrap(Entity *param_1,Entity *param_2) if (counter != 0) { moveIndex = DungeonRandInt(counter); moveStack[moveIndex]->PP = 0; - sub_80928C0(gUnknown_202DE58,moveStack[moveIndex],0); + sub_80928C0(gFormatItems,moveStack[moveIndex],0); sub_806A9B4(param_2, indexStack[moveIndex]); flag = TRUE; } diff --git a/src/trap_1.c b/src/trap_1.c index 7856b91d5..dba5c976a 100644 --- a/src/trap_1.c +++ b/src/trap_1.c @@ -11,8 +11,8 @@ #include "structs/str_dungeon.h" #include "structs/str_traps.h" -extern u8 gUnknown_81071E0[]; -extern u8 gUnknown_81071D4[]; +extern u8 gMisakiSan[]; +extern u8 gYayoiSan[]; extern void sub_8082FA8(unkStruct_8094924 *, void *, s32); @@ -97,7 +97,7 @@ Entity *sub_8045684(u8, Position *, u8); u32 sub_80831A0(unkStruct_8094924 *param_1); void sub_8082280(unkStruct_8094924 *param_1,bool8 isTeamMember,s32 index); -extern u8 gUnknown_81071D4[]; +extern u8 gYayoiSan[]; void HandleTripTrap(Entity *pokemon, Entity *target) { @@ -153,13 +153,13 @@ void sub_8080B30(u32 param_1,u32 param_2) SaveItemData(&uStack_14); SaveTrapData(&uStack_14); sub_8080CF0(&uStack_14); - sub_808300C(&uStack_14,gUnknown_81071D4); + sub_808300C(&uStack_14,gYayoiSan); nullsub_98(&uStack_14); } void sub_8080B90(unkStruct_8094924 *param_1) { - sub_808300C(param_1,gUnknown_81071E0); + sub_808300C(param_1,gMisakiSan); sub_8082FA8(param_1,&gDungeon->dungeonLocation,0x58); } @@ -175,7 +175,7 @@ void SaveItemData(unkStruct_8094924 *param_1) { local_1c[counter] = 0; } - sub_808300C(param_1,gUnknown_81071E0); + sub_808300C(param_1,gMisakiSan); for(counter = 0; counter < DUNGEON_MAX_ITEMS; counter++) { @@ -206,7 +206,7 @@ void SaveTrapData(unkStruct_8094924 *param_1) { local_1c[counter] = -1; } - sub_808300C(param_1,gUnknown_81071E0); + sub_808300C(param_1,gMisakiSan); for(counter = 0; counter < DUNGEON_MAX_TRAPS; counter++) { @@ -231,7 +231,7 @@ void sub_8080CF0(unkStruct_8094924 *param_1) { s32 counter; - sub_808300C(param_1,gUnknown_81071E0); + sub_808300C(param_1,gMisakiSan); sub_8083078(param_1,gDungeon->unk37F0); sub_8083078(param_1,gDungeon->unk37F4); sub_80830B4(param_1,gDungeon->plusIsActive[0]); @@ -482,7 +482,7 @@ void sub_8081454(unkStruct_8094924 *param_1) int iVar2; int iVar4; - sub_808300C(param_1,gUnknown_81071E0); + sub_808300C(param_1,gMisakiSan); sub_80830B4(param_1, gDungeon->unk3A08); sub_80830B4(param_1, gDungeon->unk3A09); sub_80830B4(param_1, gDungeon->unk3A0A); @@ -531,7 +531,7 @@ void sub_8081454(unkStruct_8094924 *param_1) void sub_808165C(unkStruct_8094924 *param_1) { - sub_808300C(param_1,gUnknown_81071E0); + sub_808300C(param_1,gMisakiSan); sub_8083060(param_1, gDungeon->unk181e8.unk18208); sub_8083060(param_1, gDungeon->unk181e8.visibilityRange); sub_80830B4(param_1, gDungeon->unk181e8.blinded); @@ -803,13 +803,13 @@ void sub_8081BF4(u8 *r0, u32 r1) RestoreTrapData(&uStack_14); sub_808217C(&uStack_14); - sub_8083018(&uStack_14, gUnknown_81071D4); + sub_8083018(&uStack_14, gYayoiSan); nullsub_98(&uStack_14); } void sub_8081C50(unkStruct_8094924 *r0) { - sub_8083018(r0, gUnknown_81071E0); + sub_8083018(r0, gMisakiSan); sub_8082FE0(r0, (u32 *)&gDungeon->dungeonLocation, 0x58); } @@ -819,7 +819,7 @@ void sub_8081C7C(unkStruct_8094924 *r0) int y; s32 iVar7; - sub_8083018(r0,gUnknown_81071E0); + sub_8083018(r0,gMisakiSan); gDungeon->unk3A08 = sub_80831DC(r0); gDungeon->unk3A09 = sub_80831DC(r0); gDungeon->unk3A0A = sub_80831DC(r0); @@ -894,7 +894,7 @@ void RestoreDungeonWeather(unkStruct_8094924 *r0, Weather *weather) void sub_8081F2C(unkStruct_8094924 *param_1) { - sub_8083018(param_1,gUnknown_81071E0); + sub_8083018(param_1,gMisakiSan); gDungeon->unk181e8.cameraTarget = NULL; gDungeon->unk181e8.unk18208 = sub_8083188(param_1); gDungeon->unk181e8.visibilityRange = sub_8083188(param_1); @@ -920,7 +920,7 @@ void RestoreItemData(unkStruct_8094924 *r0) { s32 index; Item item; Position pos; - sub_8083018(r0, gUnknown_81071E0); + sub_8083018(r0, gMisakiSan); for(index = 0; index < DUNGEON_MAX_ITEMS; index++) { sub_80820A8(r0, &item); @@ -949,7 +949,7 @@ void RestoreTrapData(unkStruct_8094924 *param_1) u8 unk1; u8 trapID; - sub_8083018(param_1, gUnknown_81071E0); + sub_8083018(param_1, gMisakiSan); for(counter = 0; counter < DUNGEON_MAX_TRAPS; counter++) { @@ -977,7 +977,7 @@ void sub_808217C(unkStruct_8094924 *param_1) { s32 counter; - sub_8083018(param_1,gUnknown_81071E0); + sub_8083018(param_1,gMisakiSan); gDungeon->unk37F0 = sub_80831A0(param_1); gDungeon->unk37F4 = sub_80831A0(param_1); gDungeon->plusIsActive[0] = sub_80831DC(param_1); diff --git a/src/unk_menu_203B360.c b/src/unk_menu_203B360.c index f89b1b70a..cc150cd20 100644 --- a/src/unk_menu_203B360.c +++ b/src/unk_menu_203B360.c @@ -70,7 +70,7 @@ void sub_80382E4(s32 currMenu) sUnknown_203B360->unk148[index] = gUnknown_80E6E7C; } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B360->unk148, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B360->unk148, TRUE, TRUE); if (currMenu == 0x25) { // Caution! // The storage space is empty! @@ -87,7 +87,7 @@ void sub_80382E4(s32 currMenu) void sub_80383A8(void) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); if (sUnknown_203B360 != 0) { MemoryFree(sUnknown_203B360); sUnknown_203B360 = 0; diff --git a/src/wigglytuff_shop1.c b/src/wigglytuff_shop1.c index 8f641adff..4cffbc41c 100644 --- a/src/wigglytuff_shop1.c +++ b/src/wigglytuff_shop1.c @@ -32,11 +32,11 @@ bool8 sub_80211AC(u32 mode, u32 a1) sWigglytuffShop1Work->mode = mode; sWigglytuffShop1Work->s40.s0.unk34 = a1; sWigglytuffShop1Work->s40.s0.unk38 = &sWigglytuffShop1Work->s40.s0.unk3C[sWigglytuffShop1Work->s40.s0.unk34]; - sub_8006518(sWigglytuffShop1Work->s40.s0.unk3C); + RestoreUnkTextStruct_8006518(sWigglytuffShop1Work->s40.s0.unk3C); sWigglytuffShop1Work->s40.s0.unk3C[sWigglytuffShop1Work->s40.s0.unk34] = sUnknown_80DC47C; sWigglytuffShop1Work->s40.s0.unk38->unk14 = &sWigglytuffShop1Work->s40.unk9C; ResetUnusedInputStruct(); - sub_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE); sub_8013818(&sWigglytuffShop1Work->s40.s0.input, sub_8021664(), 10, a1); if (sUnknown_203B284 == sWigglytuffShop1Work->mode) { @@ -88,7 +88,7 @@ u8 sub_802132C(void) void sub_8021354(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(sWigglytuffShop1Work->s40.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, FALSE, FALSE); sWigglytuffShop1Work->s40.s0.input.unk22 = sub_8021664(); sub_8013984(&sWigglytuffShop1Work->s40.s0.input); sub_8021410(); @@ -106,7 +106,7 @@ void sub_80213A0(void) sUnknown_203B28A = sWigglytuffShop1Work->s40.s0.input.unk1E; sWigglytuffShop1Work->s40.s0.unk3C[sWigglytuffShop1Work->s40.s0.unk34] = sUnknown_80DC464; ResetUnusedInputStruct(); - sub_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE); MemoryFree(sWigglytuffShop1Work); sWigglytuffShop1Work = NULL; } @@ -119,7 +119,7 @@ static void sub_8021410(void) sWigglytuffShop1Work->s40.unk9C.f2 = 12; sWigglytuffShop1Work->s40.unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sWigglytuffShop1Work->s40.s0.unk3C, TRUE, TRUE); SUB_80095E4_CALL(sWigglytuffShop1Work->s40.s0); } @@ -131,7 +131,7 @@ void sub_8021494(void) u8 buffer1[80]; u8 buffer2[80]; - sub_8008C54(sWigglytuffShop1Work->s40.s0.unk34); + CallPrepareTextbox_8008C54(sWigglytuffShop1Work->s40.s0.unk34); sub_80073B8(sWigglytuffShop1Work->s40.s0.unk34); PrintStringOnWindow(10, 0, sFriendAreas, sWigglytuffShop1Work->s40.s0.unk34, 0); @@ -141,7 +141,7 @@ void sub_8021494(void) friendAreaIndex = sWigglytuffShop1Work->friendAreas[(sWigglytuffShop1Work->s40.s0.input.unk1E * sWigglytuffShop1Work->s40.s0.input.unk1C) + i]; if (sWigglytuffShop1Work->mode == 2) { - sub_8092578(buffer1, friendAreaIndex, TRUE); + WriteFriendAreaName(buffer1, friendAreaIndex, TRUE); if (GetFriendAreaPrice(friendAreaIndex) <= gTeamInventoryRef->teamMoney) PrintStringOnWindow(8,sub_8013800(&sWigglytuffShop1Work->s40.s0.input, i), buffer1, sWigglytuffShop1Work->s40.s0.unk34, 0); diff --git a/src/wigglytuff_shop2.c b/src/wigglytuff_shop2.c index f6562d86f..3afac4ddd 100644 --- a/src/wigglytuff_shop2.c +++ b/src/wigglytuff_shop2.c @@ -33,7 +33,7 @@ bool8 CreateWigglytuffShopFriendAreaMenu(u8 friendArea, bool8 a1, s32 a2) sub_8021A60(); sWigglytuffShop2Work->unk74 = a2; sWigglytuffShop2Work->unk78 = &sWigglytuffShop2Work->unk7C[a2]; - sub_8006518(sWigglytuffShop2Work->unk7C); + RestoreUnkTextStruct_8006518(sWigglytuffShop2Work->unk7C); sWigglytuffShop2Work->unk7C[sWigglytuffShop2Work->unk74] = sUnknown_80DC4D8; sub_8021820(); return TRUE; @@ -64,7 +64,7 @@ void CleanWigglytuffShopFriendAreaInfoMenu(void) if (sWigglytuffShop2Work) { sWigglytuffShop2Work->unk7C[sWigglytuffShop2Work->unk74] = sUnknown_80DC4BC; ResetUnusedInputStruct(); - sub_800641C(sWigglytuffShop2Work->unk7C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sWigglytuffShop2Work->unk7C, TRUE, TRUE); MemoryFree(sWigglytuffShop2Work); sWigglytuffShop2Work = NULL; } @@ -73,7 +73,7 @@ void CleanWigglytuffShopFriendAreaInfoMenu(void) static void sub_8021878(void) { ResetUnusedInputStruct(); - sub_800641C(sWigglytuffShop2Work->unk7C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sWigglytuffShop2Work->unk7C, TRUE, TRUE); } static void PopulateWigglytuffShopFriendAreaInfoScreen(void) @@ -86,7 +86,7 @@ static void PopulateWigglytuffShopFriendAreaInfoScreen(void) u8 buffer2[100]; sub_80073B8(sWigglytuffShop2Work->unk74); - sub_8092578(buffer1, sWigglytuffShop2Work->friendArea, FALSE); + WriteFriendAreaName(buffer1, sWigglytuffShop2Work->friendArea, FALSE); PrintStringOnWindow(20, 0, buffer1, sWigglytuffShop2Work->unk74, 0); string = GetFriendAreaDescription(sWigglytuffShop2Work->friendArea); diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index b7bb150c0..8a0ceeb84 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -60,7 +60,7 @@ bool8 CreateWigglytuffShop(u32 mode) OpenedFile *file; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sWigglytuffShop3Work = MemoryAlloc(sizeof(WigglytuffShop3Work), 8); sWigglytuffShop3Work->menuAction1 = 0; @@ -147,7 +147,7 @@ static void sub_8021D5C(void) { s32 i; - sub_8006518(sWigglytuffShop3Work->unkD0); + RestoreUnkTextStruct_8006518(sWigglytuffShop3Work->unkD0); switch (sWigglytuffShop3Work->state) { case WIGGLYTUFF_UNK9: @@ -166,7 +166,7 @@ static void sub_8021D5C(void) } ResetUnusedInputStruct(); - sub_800641C(sWigglytuffShop3Work->unkD0, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sWigglytuffShop3Work->unkD0, TRUE, TRUE); } static void UpdateWigglytuffDialogue(void) @@ -185,37 +185,37 @@ static void UpdateWigglytuffDialogue(void) break; case FRIEND_AREA_SELECT_BUY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNK9; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_03], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_03], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case FRIEND_AREA_SELECT_BUY_AGAIN: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKA; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_04], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_04], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_INFO: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_MAIN_MENU; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_19], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_19], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_PRE_EXIT: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_EXIT; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_02], 0, sWigglytuffShop3Work->unkCC, 0x30d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_02], 0, sWigglytuffShop3Work->unkCC, 0x30d); break; default: break; case WIGGLYTUFF_CANT_ADD_FRIEND_AREA: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_PRE_EXIT; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_08], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_08], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case NO_MONEY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKA; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_09], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_09], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case NO_FRIEND_AREAS: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_PRE_EXIT; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_10], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_10], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case NOT_ENOUGH_MONEY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKA; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_11], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_11], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_UNK9: sub_80211AC(2, 3); @@ -233,7 +233,7 @@ static void UpdateWigglytuffDialogue(void) break; case BUY_FRIEND_AREA: CreateWigglytuffConfirmFriendAreaMenu(); - sub_8092578(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); + WriteFriendAreaName(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); gFormatData_202DE30[0] = sWigglytuffShop3Work->friendAreaPrice; sub_8014248(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_05], 0, 5, sWigglytuffShop3Work->unk1C, 0, 4, 0, sWigglytuffShop3Work->unkCC, 12); break; @@ -242,8 +242,8 @@ static void UpdateWigglytuffDialogue(void) break; case CONFIRM_BUY_FRIEND_AREA: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKD; - sub_8092578(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_06], 0, sWigglytuffShop3Work->unkCC, 0x10d); + WriteFriendAreaName(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_06], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_UNKD: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNKE; @@ -263,15 +263,15 @@ static void UpdateWigglytuffDialogue(void) sWigglytuffShop3Work->fallbackState = FRIEND_AREA_SELECT_BUY_AGAIN; PlaySound(206); - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_07], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_07], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNK16; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_12], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_12], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_AGAIN: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_UNK17; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_13], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_13], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_UNK16: sub_8023144(0, 3, 0, 10); @@ -306,24 +306,24 @@ static void UpdateWigglytuffDialogue(void) string = GetMonSpecies(sWigglytuffShop3Work->chosenSpecies); strcpy(gAvailablePokemonNames, string); - sub_8092578(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_14], 0, sWigglytuffShop3Work->unkCC, 0x10d); + WriteFriendAreaName(gUnknown_202E628, sWigglytuffShop3Work->chosenFriendArea, FALSE); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_14], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_HAS_FRIEND_AREA: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_15], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_15], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_POST_GAME: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_16], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_16], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_WONDER_MAIL: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_17], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_17], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; case WIGGLYTUFF_CHECK_LEGENDARY: sWigglytuffShop3Work->fallbackState = WIGGLYTUFF_CHECK_AGAIN; - sub_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_18], 0, sWigglytuffShop3Work->unkCC, 0x10d); + xxx_info_box_80141B4(gCommonWigglytuff[sWigglytuffShop3Work->mode][WIGGLY_DLG_18], 0, sWigglytuffShop3Work->unkCC, 0x10d); break; } } diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 8aa79c0bd..580d64565 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -207,7 +207,7 @@ u32 sub_8027F88(void) s32 counter; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B2C0 = MemoryAlloc(sizeof(WonderMailStruct_203B2C0), 8); MemoryFill8((u8 *)sUnknown_203B2C0, 0, sizeof(WonderMailStruct_203B2C0)); sUnknown_203B2C0->unk53C = 0; @@ -440,19 +440,19 @@ void sub_8028348(void) switch(sUnknown_203B2C0->state) { case 0x3B: - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8031D70(sUnknown_203B2C0->mailIndex, 0); break; case 0x3C: - sub_80141B4(gUnknown_80DDBA8, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDBA8, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case AOK_PASSWORD_DISPLAY: - sub_80141B4(gUnknown_80DDBFC, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDBFC, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x38: - sub_80141B4(gUnknown_80DDC30, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDC30, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case SENT_AOK_MAIL: switch(sUnknown_203B2C0->unk534) @@ -461,28 +461,28 @@ void sub_8028348(void) case 0x10: case 0xF: case 0xD: - sub_80141B4(gUnknown_80DDC70, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDC70, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0xE: break; } break; case SENT_AOK_MAIL_SAVE_COMPLETE: - sub_80141B4(gUnknown_80DDC30, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDC30, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case PROMPT_SELECT_HELPER_POKEMON: - sub_80141B4(gUnknown_80DDCBC, 0, 0,0x101); + xxx_info_box_80141B4(gUnknown_80DDCBC, 0, 0,0x101); break; case SELECT_HELPER_POKEMON: if(sub_8023CE8() == 0) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8023868(3, 0, 0, 9); } break; case 0x34: - sub_8006518(sUnknown_203B2C0->unk35C); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk35C); SetMenuItems(sUnknown_203B2C0->unk21C, sUnknown_203B2C0->unk35C, 3, &gUnknown_80DDAE4, gUnknown_80DDAFC, TRUE, 0, FALSE); sub_8023DA4(); sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE); @@ -497,34 +497,34 @@ void sub_8028348(void) sub_8014248(gUnknown_80DDDBC, 0, 8, gUnknown_80DDA64, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case PROMPT_CHOOSE_AOK_MAIL: - sub_80141B4(gUnknown_80DDDD8, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDDD8, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x2A: if(sub_8030894() == 0) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80306A8(WONDER_MAIL_TYPE_AOK, 0, 0, 6); } break; case NO_AOK_MAIL_TO_SEND: - sub_80141B4(gUnknown_80DDE20, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDE20, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x30: - sub_80141B4(gUnknown_80DDE58, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDE58, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x2E: sub_8014248(gUnknown_80DDEC0, 0, 0x11, gUnknown_80DDB60, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case NO_MAIL_ROOM: - sub_80141B4(gUnknown_80DDF2C, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DDF2C, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 4: sub_8014248(gUnknown_80DDFB8, 0, 8, gUnknown_80DDA48, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case FRIEND_RESCUE_COMMUNICATING_PRE: nullsub_23(FALSE); - sub_80141B4(gUnknown_80DE01C, 0 , 0, 0); + xxx_info_box_80141B4(gUnknown_80DE01C, 0 , 0, 0); break; case FRIEND_RESCUE_COMMUNICATING: sUnknown_203B2C0->linkError = COMMS_GOOD; @@ -579,22 +579,22 @@ void sub_8028348(void) case 0x10: case 0xF: case 0xD: - sub_80141B4(gUnknown_80DE06C, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE06C, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0xE: break; } break; case RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE: - sub_80141B4(gUnknown_80DE0C0, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE0C0, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case PROMPT_SOS_MAIL_PASSWORD: - sub_80141B4(gUnknown_80DE124, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE124, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x27: - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80151C0(4, sUnknown_203B2C0->passwordBuffer); break; case 8: @@ -609,35 +609,35 @@ void sub_8028348(void) } break; case NO_SOS_MAIL_TO_SEND: - sub_80141B4(gUnknown_80DE1E4, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE1E4, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x1B: - sub_80141B4(gUnknown_80DE280, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE280, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case CANT_GO_TO_DUNGEON: - sub_80141B4(gUnknown_80DE2B0, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE2B0, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case FRIEND_RESCUE_FAILED: - sub_80141B4(gUnknown_80DE368, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE368, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x22: sub_8014248(gUnknown_80DDDBC, 0, 8, gUnknown_80DDA64, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case PROMPT_CHOOSE_SOS_MAIL: - sub_80141B4(gUnknown_80DE430, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE430, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x1F: if(sub_8030894() == 0) { ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); // SOS Mail sub_80306A8(2, 0, 0, 6); } break; case 0x20: case 0x2B: - sub_8006518(sUnknown_203B2C0->unk35C); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk35C); SetMenuItems(sUnknown_203B2C0->unk21C, sUnknown_203B2C0->unk35C, 3, &gUnknown_80DDACC, gUnknown_80DDAFC, TRUE, 0, FALSE); sub_803092C(); sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE); @@ -661,22 +661,22 @@ void sub_8028348(void) sub_8014248(gUnknown_80DE48C, 0, 5, gUnknown_80DD9EC, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case CHOOSE_DELETE_SOS_MAIL: - sub_80141B4(gUnknown_80DE4B8, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE4B8, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case NO_SOS_MAIL: - sub_80141B4(gUnknown_80DE4F0, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE4F0, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case CHOOSE_DELETE_AOK_MAIL: - sub_80141B4(gUnknown_80DE524, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE524, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case NO_AOK_MAIL: - sub_80141B4(gUnknown_80DE614, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE614, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case CHOOSE_DELETE_ALL_MAIL: - sub_80141B4(gUnknown_80DE648, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE648, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case NO_MAIL: - sub_80141B4(gUnknown_80DE694, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE694, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case PROMPT_DELETE_ALL_MAIL: sub_8014248(gUnknown_80DE6D4, 0, 8, gUnknown_80DDA48, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); @@ -685,22 +685,22 @@ void sub_8028348(void) sub_8014248(gUnknown_80DE754, 0, 8, gUnknown_80DDA48, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case SAVING_ADVENTURE: - sub_80141B4(gUnknown_80DE7B8, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE7B8, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case FINISH_SAVING_ADVENTURE: - sub_80141B4(gUnknown_80DE7E8, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE7E8, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case PROMPT_DELETE_ANY_OTHER_MAIL: sub_8014248(gUnknown_80DE808, 0, 8, gUnknown_80DDA64, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case CONFIRM_DELETE_ALL_MAIL_2: - sub_80141B4(gUnknown_80DE830, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE830, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case DELETE_ALL_MAIL_SAVE_PRE: - sub_80141B4(gUnknown_80DE864, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE864, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case 0x16: - sub_80141B4(gUnknown_80DE7E8, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE7E8, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case INITIALIZE_FRIEND_RESCUE: sub_8014248(gUnknown_80DE8B4, 0, 0, gUnknown_80DD970, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); @@ -709,7 +709,7 @@ void sub_8028348(void) sub_8014248(gUnknown_80DE918, 0, 0, gUnknown_80DD970, 0, 4, 0, &sUnknown_203B2C0->faceFile,0xC); break; case 2: - sub_80141B4(gUnknown_80DE93C, 0, &sUnknown_203B2C0->faceFile,0x10d); + xxx_info_box_80141B4(gUnknown_80DE93C, 0, &sUnknown_203B2C0->faceFile,0x10d); break; case FRIEND_RESCUE_COUNTER_EXIT: break; @@ -733,37 +733,37 @@ void PrintFriendRescueCounterError(u32 errorCode) break; case 1: case COMMS_NO_RESPONSE: - sub_80141B4(gWonderMailErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_INCORRECT_NUM_SYSTEMS: - sub_80141B4(gWonderMailNumGBAsText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailNumGBAsText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_DIFFERENT_MODES: - sub_80141B4(gWonderMailWrongModeText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailWrongModeText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case 5: - sub_80141B4(gWonderMailErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_NO_ROOM_STORAGE: - sub_80141B4(gWonderMailStorageFullText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailStorageFullText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_DUPLICATE_MAIL: - sub_80141B4(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_NOT_ELIGIBLE_1: - sub_80141B4(gWonderMailNotEligibleReceiveText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailNotEligibleReceiveText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_NOT_ELIGIBLE_2: - sub_80141B4(gWonderMailNotEligibleReceiveText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailNotEligibleReceiveText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_NO_ROOM_MAIL: - sub_80141B4(gWonderMailNoRoomText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailNoRoomText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case 14: - sub_80141B4(gWonderMailErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; case COMMS_NOT_READY: - sub_80141B4(gWonderMailFriendErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailFriendErrorText, 0, &sUnknown_203B2C0->faceFile, 0x10d); break; default: break; @@ -1134,9 +1134,9 @@ void sub_8029044(void) case 4: sUnknown_203B2C0->fallbackState = 0x1F; sUnknown_203B2C0->mailIndex = sub_80307EC(); - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C0->mailIndex, 0); SetFriendRescueCounterState(0x21); break; @@ -1170,9 +1170,9 @@ void sub_80290F0(void) break; case INFO_ACTION: sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE; - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C0->mailIndex, 0); SetFriendRescueCounterState(0x21); break; @@ -1195,7 +1195,7 @@ void sub_80291AC(void) case 3: sub_8030DE4(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); sub_803092C(); if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) { @@ -1388,18 +1388,18 @@ void sub_80293F4(void) SetFriendRescueCounterState(0x28); break; case PASSWORD_ENTRY_NOT_SOS_MAIL: - sub_80141B4(gWonderMailSOSPasswordIncorrectText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailSOSPasswordIncorrectText, 0, &sUnknown_203B2C0->faceFile, 0x10d); SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); break; case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL: - sub_80141B4(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->faceFile, 0x10d); + xxx_info_box_80141B4(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->faceFile, 0x10d); SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); break; case PASSWORD_ENTRY_SOS_MAIL_SUCCESS: sub_8095274(mail.unk10.unk10); mail.mailType = 2; sub_80951BC(&mail); - sub_80141B4(gWonderMailAOKMailReceivedText, 0, &sUnknown_203B2C0->faceFile, 0x101); + xxx_info_box_80141B4(gWonderMailAOKMailReceivedText, 0, &sUnknown_203B2C0->faceFile, 0x101); SetFriendRescueCounterState(0x23); break; case 23: @@ -1412,7 +1412,7 @@ void sub_80293F4(void) case 2: sub_80155F0(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; default: @@ -1483,9 +1483,9 @@ void sub_80295D8(void) case 4: sUnknown_203B2C0->fallbackState = 0x2A; sUnknown_203B2C0->mailIndex = sub_80307EC(); - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C0->mailIndex, 0); SetFriendRescueCounterState(0x2C); break; @@ -1519,9 +1519,9 @@ void sub_8029684(void) break; case INFO_ACTION: sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE; - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C0->mailIndex, 0); SetFriendRescueCounterState(0x2C); break; @@ -1542,7 +1542,7 @@ void sub_8029740(void) case 3: sub_8030DE4(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); sub_803092C(); if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) { @@ -1593,9 +1593,9 @@ void sub_80297D4(void) case 4: sUnknown_203B2C0->fallbackState = SELECT_HELPER_POKEMON; sUnknown_203B2C0->speciesNum = sub_8023B44(); - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8024458(sUnknown_203B2C0->speciesNum, 0); SetFriendRescueCounterState(0x35); break; @@ -1619,9 +1619,9 @@ void sub_8029884(void) break; case INFO_ACTION: sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE; - sub_8006518(sUnknown_203B2C0->unk3BC); + RestoreUnkTextStruct_8006518(sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_8024458(sUnknown_203B2C0->speciesNum, 0); SetFriendRescueCounterState(0x35); break; @@ -1651,7 +1651,7 @@ void sub_8029944(void) case 3: sub_802453C(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); sub_8023B7C(1); if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) { @@ -1791,7 +1791,7 @@ void sub_8029AF4(void) case 3: sub_8031E10(); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2C0->unk3BC, TRUE, TRUE); SetFriendRescueCounterState(0x3C); break; case 1: diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 9c35b2f80..066441b9d 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -84,7 +84,7 @@ u32 sub_802B2D4(void) OpenedFile *faceFile; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sUnknown_203B2C8 = MemoryAlloc(sizeof(struct unkStruct_203B2C8),8); MemoryFill8((u8 *)sUnknown_203B2C8,0,sizeof(struct unkStruct_203B2C8)); sUnknown_203B2C8->unk1 = -1; @@ -163,7 +163,7 @@ void sub_802B3E0(void) // Print and expand placeholders? sprintfStatic(sUnknown_203B2C8->teamName,gUnknown_80DF9F8,teamNameBuffer); // Display to screen with Pelipper face - sub_80141B4(sUnknown_203B2C8->teamName, 0, &sUnknown_203B2C8->faceFile, 0x10d); + xxx_info_box_80141B4(sUnknown_203B2C8->teamName, 0, &sUnknown_203B2C8->faceFile, 0x10d); break; case 1: monName = GetMonSpecies(MONSTER_PELIPPER); @@ -184,12 +184,12 @@ void sub_802B3E0(void) case 2: // I hope you will keep on rescuing your friends // I must save your adventure - sub_80141B4(gUnknown_80DFAA8, 0, &sUnknown_203B2C8->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DFAA8, 0, &sUnknown_203B2C8->faceFile, 0x10d); break; case 4: // Oh yes, that's right. Please don't forget to send an A-OK Mail // to the friend you just rescued - sub_80141B4(gUnknown_80DFB14, 0, &sUnknown_203B2C8->faceFile, 0x10d); + xxx_info_box_80141B4(gUnknown_80DFB14, 0, &sUnknown_203B2C8->faceFile, 0x10d); case 3: case 5: break; diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c index c59cabf12..8853f8671 100644 --- a/src/wonder_mail_3_mid.c +++ b/src/wonder_mail_3_mid.c @@ -120,7 +120,7 @@ void sub_802F004(void) { s32 index; - sub_8006518(gUnknown_203B30C->unkF0); + RestoreUnkTextStruct_8006518(gUnknown_203B30C->unkF0); switch(gUnknown_203B30C->state) { case 2: @@ -135,7 +135,7 @@ void sub_802F004(void) } } ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B30C->unkF0, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B30C->unkF0, TRUE, TRUE); } void sub_802F088(void) diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c index 3704cd5c9..06d4a09c5 100644 --- a/src/wonder_mail_4.c +++ b/src/wonder_mail_4.c @@ -89,7 +89,7 @@ u32 sub_80306A8(u32 wonderMailType, u32 r1, UnkTextStruct2_sub *r2, u32 r3) gUnknown_203B320->s28.s0.unk34 = r1; gUnknown_203B320->s28.s0.unk38 = &gUnknown_203B320->s28.s0.unk3C[gUnknown_203B320->s28.s0.unk34]; - sub_8006518(gUnknown_203B320->s28.s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B320->s28.s0.unk3C); gUnknown_203B320->s28.s0.unk3C[gUnknown_203B320->s28.s0.unk34] = gUnknown_80E0854; gUnknown_203B320->s28.s0.unk38->unk14 = &gUnknown_203B320->s28.unk9C; @@ -99,7 +99,7 @@ u32 sub_80306A8(u32 wonderMailType, u32 r1, UnkTextStruct2_sub *r2, u32 r3) sub_8012D08(gUnknown_203B320->s28.s0.unk38, r3); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE); sub_8013818(&gUnknown_203B320->s28.s0.input, sub_8030A74(), r3, r1); sub_80308A0(); sub_803092C(); @@ -158,7 +158,7 @@ void sub_803084C() { gUnknown_203B320->s28.s0.unk3C[gUnknown_203B320->s28.s0.unk34] = gUnknown_80E083C; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B320); gUnknown_203B320 = NULL; } @@ -176,7 +176,7 @@ void sub_80308A0(void) gUnknown_203B320->s28.unk9C.f2 = 12; gUnknown_203B320->s28.unk9C.f3 = 0; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B320->s28.s0.unk3C, TRUE, TRUE); SUB_80095E4_CALL(gUnknown_203B320->s28.s0); } @@ -189,7 +189,7 @@ void sub_803092C(void) s32 index; unkStruct_802C39C local; - sub_8008C54(gUnknown_203B320->s28.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B320->s28.s0.unk34); sub_80073B8(gUnknown_203B320->s28.s0.unk34); r4 = gUnknown_203B320->s28.s0.input.unk1E * 8; r5 = r4; diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index b188671af..4423fe863 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -64,7 +64,7 @@ bool8 sub_8030D40(u8 mailIndex, s32 param_2) sub_801317C(&gUnknown_203B324->unk0); gUnknown_203B324->unk10 = param_2; gUnknown_203B324->unk14 = &gUnknown_203B324->unk18[param_2]; - sub_8006518(gUnknown_203B324->unk18); + RestoreUnkTextStruct_8006518(gUnknown_203B324->unk18); gUnknown_203B324->unk18[gUnknown_203B324->unk10] = gUnknown_80E091C; sub_8030DD4(); return TRUE; @@ -97,7 +97,7 @@ void sub_8030DE4(void) { gUnknown_203B324->unk18[gUnknown_203B324->unk10] = gUnknown_80E0900; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B324->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B324->unk18, TRUE, TRUE); MemoryFree(gUnknown_203B324); gUnknown_203B324 = NULL; } @@ -106,7 +106,7 @@ void sub_8030DE4(void) void sub_8030E2C(void) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B324->unk18, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B324->unk18, TRUE, TRUE); } void sub_8030E48(void) diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index 535810edb..1077e2f5f 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -115,7 +115,7 @@ bool8 sub_8030F58(u32 wonderMailType) OpenedFile *file; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); if (gUnknown_203B328 == NULL) { gUnknown_203B328 = MemoryAlloc(sizeof(struct unkStruct_203B328),8); MemoryFill8((u8 *)gUnknown_203B328,0,sizeof(struct unkStruct_203B328)); @@ -135,11 +135,11 @@ bool8 sub_8030F58(u32 wonderMailType) { case WONDER_MAIL_TYPE_SOS_1: // "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.\0" - sub_80141B4(gUnknown_80E09D8,0,&gUnknown_203B328->faceFile,0x101); + xxx_info_box_80141B4(gUnknown_80E09D8,0,&gUnknown_203B328->faceFile,0x101); break; case WONDER_MAIL_TYPE_AOK: // "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}.\0" - sub_80141B4(gUnknown_80E0A0C,0,&gUnknown_203B328->faceFile,0x101); + xxx_info_box_80141B4(gUnknown_80E0A0C,0,&gUnknown_203B328->faceFile,0x101); break; } gUnknown_203B328->state = 5; @@ -194,7 +194,7 @@ void sub_80310E4(u32 newState) void sub_80310FC(void) { - sub_8006518(gUnknown_203B328->unkA8); + RestoreUnkTextStruct_8006518(gUnknown_203B328->unkA8); switch(gUnknown_203B328->state) { case INIT_STATE: @@ -223,11 +223,11 @@ void sub_80310FC(void) case 6: default: ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); break; } ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B328->unkA8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B328->unkA8, TRUE, TRUE); } void sub_8031258(void) diff --git a/src/wonder_mail_802C10C.c b/src/wonder_mail_802C10C.c index d8a587cf7..7d01f2886 100644 --- a/src/wonder_mail_802C10C.c +++ b/src/wonder_mail_802C10C.c @@ -31,7 +31,7 @@ bool8 sub_802C10C(s32 a0, UnkTextStruct2_sub *a1, s32 a2) gUnknown_203B2E0->unk8.s0.unk34 = a0; gUnknown_203B2E0->unk8.s0.unk38 = &gUnknown_203B2E0->unk8.s0.unk3C[a0]; - sub_8006518(gUnknown_203B2E0->unk8.s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B2E0->unk8.s0.unk3C); gUnknown_203B2E0->unk8.s0.unk3C[gUnknown_203B2E0->unk8.s0.unk34] = sUnknown_80DFCB4; gUnknown_203B2E0->unk8.s0.unk38->unk14 = &gUnknown_203B2E0->unk8.unk9C; @@ -41,7 +41,7 @@ bool8 sub_802C10C(s32 a0, UnkTextStruct2_sub *a1, s32 a2) sub_8012D34(gUnknown_203B2E0->unk8.s0.unk38, a2); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE); sub_8013848(&gUnknown_203B2E0->unk8.s0.input, CountPelipperBoardSlots(), a2, a0); gUnknown_203B2E0->unk8.s0.input.menuIndex = gUnknown_203B2E4; sub_8013984(&gUnknown_203B2E0->unk8.s0.input); @@ -85,7 +85,7 @@ u8 sub_802C26C(void) void sub_802C28C(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B2E0->unk8.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E0->unk8.s0.unk3C, FALSE, FALSE); gUnknown_203B2E0->unk8.s0.input.unk22 = CountPelipperBoardSlots(); sub_8013984(&gUnknown_203B2E0->unk8.s0.input); sub_802C328(); @@ -101,7 +101,7 @@ void sub_802C2D4(void) gUnknown_203B2E4 = gUnknown_203B2E0->unk8.s0.input.menuIndex; gUnknown_203B2E0->unk8.s0.unk3C[gUnknown_203B2E0->unk8.s0.unk34] = sUnknown_80DFC9C; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E0->unk8.s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B2E0); gUnknown_203B2E0 = NULL; } @@ -126,7 +126,7 @@ void DrawPelipperBoardJobMenu(void) s32 i; unkStruct_802C39C local; - sub_8008C54(gUnknown_203B2E0->unk8.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B2E0->unk8.s0.unk34); sub_80073B8(gUnknown_203B2E0->unk8.s0.unk34); iVar4 = gUnknown_203B2E0->unk8.s0.input.unk1E * 8; x = iVar4; diff --git a/src/wonder_mail_802C4C8.c b/src/wonder_mail_802C4C8.c index 64a76c581..6164d918a 100644 --- a/src/wonder_mail_802C4C8.c +++ b/src/wonder_mail_802C4C8.c @@ -32,7 +32,7 @@ bool8 sub_802C4C8(s32 a0, UnkTextStruct2_sub *a1, u32 a2) gUnknown_203B2E8 = MemoryAlloc(sizeof(struct unkStruct_203B2E0), 8); gUnknown_203B2E8->unk8.s0.unk34 = a0; gUnknown_203B2E8->unk8.s0.unk38 = &gUnknown_203B2E8->unk8.s0.unk3C[a0]; - sub_8006518(gUnknown_203B2E8->unk8.s0.unk3C); + RestoreUnkTextStruct_8006518(gUnknown_203B2E8->unk8.s0.unk3C); gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCFC; gUnknown_203B2E8->unk8.s0.unk38->unk14 = &gUnknown_203B2E8->unk8.unk9C; @@ -42,7 +42,7 @@ bool8 sub_802C4C8(s32 a0, UnkTextStruct2_sub *a1, u32 a2) sub_8012D34(gUnknown_203B2E8->unk8.s0.unk38, a2); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE); sub_8013848(&gUnknown_203B2E8->unk8.s0.input, CountAcceptedJobs(), a2, a0); gUnknown_203B2E8->unk8.s0.input.menuIndex = gUnknown_203B2EC; sub_8013984(&gUnknown_203B2E8->unk8.s0.input); @@ -86,7 +86,7 @@ u8 GetPelipperBoardSlotIndex(void) void sub_802C640(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B2E8->unk8.s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E8->unk8.s0.unk3C, FALSE, FALSE); gUnknown_203B2E8->unk8.s0.input.unk22 = CountAcceptedJobs(); sub_8013984(&gUnknown_203B2E8->unk8.s0.input); sub_802C6DC(); @@ -102,7 +102,7 @@ void sub_802C688(void) gUnknown_203B2EC = gUnknown_203B2E8->unk8.s0.input.menuIndex; gUnknown_203B2E8->unk8.s0.unk3C[gUnknown_203B2E8->unk8.s0.unk34] = sUnknown_80DFCE4; ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B2E8->unk8.s0.unk3C, TRUE, TRUE); MemoryFree(gUnknown_203B2E8); gUnknown_203B2E8 = NULL; } @@ -126,7 +126,7 @@ void DrawJobListMenu(void) s32 x; unkStruct_802C39C local; - sub_8008C54(gUnknown_203B2E8->unk8.s0.unk34); + CallPrepareTextbox_8008C54(gUnknown_203B2E8->unk8.s0.unk34); sub_80073B8(gUnknown_203B2E8->unk8.s0.unk34); r4 = gUnknown_203B2E8->unk8.s0.input.unk1E * 8; x = r4; diff --git a/src/wonder_mail_802C860.c b/src/wonder_mail_802C860.c index 14a661afa..f8a4a470f 100644 --- a/src/wonder_mail_802C860.c +++ b/src/wonder_mail_802C860.c @@ -83,7 +83,7 @@ static void sub_802C928(void) { s32 i; - sub_8006518(sUnknown_203B2F0->unk19C); + RestoreUnkTextStruct_8006518(sUnknown_203B2F0->unk19C); switch (sUnknown_203B2F0->state) { case 2: @@ -101,7 +101,7 @@ static void sub_802C928(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2F0->unk19C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F0->unk19C, TRUE, TRUE); } static void sub_802C9D8(void) diff --git a/src/wonder_mail_802CDD4.c b/src/wonder_mail_802CDD4.c index 6c9716491..c4077caac 100644 --- a/src/wonder_mail_802CDD4.c +++ b/src/wonder_mail_802CDD4.c @@ -27,12 +27,12 @@ bool8 sub_802CDD4(u32 a0) sUnknown_203B2F4->s0.unk34 = a0; sUnknown_203B2F4->s0.unk38 = &sUnknown_203B2F4->s0.unk3C[sUnknown_203B2F4->s0.unk34]; - sub_8006518(sUnknown_203B2F4->s0.unk3C); + RestoreUnkTextStruct_8006518(sUnknown_203B2F4->s0.unk3C); sUnknown_203B2F4->s0.unk3C[sUnknown_203B2F4->s0.unk34] = sUnknown_80DFDA4; sUnknown_203B2F4->s0.unk38->unk14 = &sUnknown_203B2F4->unk9C; sub_8012D34(sUnknown_203B2F4->s0.unk38, 4); ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2F4->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F4->s0.unk3C, TRUE, TRUE); sub_8013848(&sUnknown_203B2F4->s0.input, 5, 4, a0); sub_802CF5C(); sub_802CFD0(); @@ -70,7 +70,7 @@ u8 sub_802CEBC(void) void sub_802CED8(bool8 cursorSprite) { ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2F4->s0.unk3C, FALSE, FALSE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F4->s0.unk3C, FALSE, FALSE); sub_8013984(&sUnknown_203B2F4->s0.input); sub_802CF5C(); sub_802CFD0(); @@ -84,7 +84,7 @@ void sub_802CF14(void) if (sUnknown_203B2F4 != NULL) { sUnknown_203B2F4->s0.unk3C[sUnknown_203B2F4->s0.unk34] = sUnknown_80DFD8C; ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2F4->s0.unk3C, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F4->s0.unk3C, TRUE, TRUE); MemoryFree(sUnknown_203B2F4); sUnknown_203B2F4 = NULL; } @@ -107,7 +107,7 @@ void sub_802CFD0(void) s32 r5; s32 r4; - sub_8008C54(sUnknown_203B2F4->s0.unk34); + CallPrepareTextbox_8008C54(sUnknown_203B2F4->s0.unk34); sub_80073B8(sUnknown_203B2F4->s0.unk34); r5 = r4 = (sUnknown_203B2F4->s0.input.unk1E * 8) + 10; diff --git a/src/wonder_mail_802D098.c b/src/wonder_mail_802D098.c index d5ef61a87..eaa41d6f8 100644 --- a/src/wonder_mail_802D098.c +++ b/src/wonder_mail_802D098.c @@ -140,7 +140,7 @@ static void sub_802D1B8(void) { s32 i; - sub_8006518(sUnknown_203B2F8->unk1A8); + RestoreUnkTextStruct_8006518(sUnknown_203B2F8->unk1A8); switch (sUnknown_203B2F8->state) { case 13: @@ -164,7 +164,7 @@ static void sub_802D1B8(void) } ResetUnusedInputStruct(); - sub_800641C(sUnknown_203B2F8->unk1A8, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(sUnknown_203B2F8->unk1A8, TRUE, TRUE); } static void sub_802D2A8(void) @@ -196,23 +196,23 @@ static void sub_802D2A8(void) break; case DUPLICATE_WONDER_MAIL: sUnknown_203B2F8->fallbackState = WONDER_MAIL_EXIT; - sub_80141B4(sMailAlreadyReceived, 0, NULL, 0x101); + xxx_info_box_80141B4(sMailAlreadyReceived, 0, NULL, 0x101); break; case DUPLICATE_WONDER_MAIL_1: sUnknown_203B2F8->fallbackState = WONDER_MAIL_EXIT; - sub_80141B4(sMailAlreadyReceivedMayNotReceiveAgain, 0, NULL, 0x101); + xxx_info_box_80141B4(sMailAlreadyReceivedMayNotReceiveAgain, 0, NULL, 0x101); break; case 5: sUnknown_203B2F8->fallbackState = WONDER_MAIL_EXIT; - sub_80141B4(sOnlyOneMailCanBeHeldPleaseCompleteFirst, 0, NULL, 0x101); + xxx_info_box_80141B4(sOnlyOneMailCanBeHeldPleaseCompleteFirst, 0, NULL, 0x101); break; case 6: sUnknown_203B2F8->fallbackState = WONDER_MAIL_EXIT; - sub_80141B4(sTeamQuicksavedCompleteFirst, 0, NULL, 0x101); + xxx_info_box_80141B4(sTeamQuicksavedCompleteFirst, 0, NULL, 0x101); break; case 7: sUnknown_203B2F8->fallbackState = DRAW_JOB_LIST_1; - sub_80141B4(sTeamQuicksavedCannotDelete, 0, NULL, 0x101); + xxx_info_box_80141B4(sTeamQuicksavedCannotDelete, 0, NULL, 0x101); break; case RECEIVE_WONDER_MAIL: sUnknown_203B2F8->wonderMailAccepted = TRUE; @@ -241,7 +241,7 @@ static void sub_802D2A8(void) } sUnknown_203B2F8->fallbackState = WONDER_MAIL_EXIT; - sub_80141B4(sReceivedWonderMail, 0, NULL, 0x101); + xxx_info_box_80141B4(sReceivedWonderMail, 0, NULL, 0x101); break; case 9: sub_802D690(); @@ -249,7 +249,7 @@ static void sub_802D2A8(void) break; case JOB_LIST_FULL: sUnknown_203B2F8->fallbackState = DRAW_JOB_LIST; - sub_80141B4(sJobListFullPleaseDelete, 0, NULL, 0x101); + xxx_info_box_80141B4(sJobListFullPleaseDelete, 0, NULL, 0x101); break; case DRAW_JOB_LIST: sub_802C4C8(0, NULL, 4); diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index f3b5da379..60626d15a 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -101,7 +101,7 @@ bool8 CreateWonderMailMenu(void) s32 index; ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); gUnknown_203B3E8 = MemoryAlloc(sizeof(struct unkStruct_203B3E8), 8); MemoryFill8((u8 *)gUnknown_203B3E8, 0, sizeof(struct unkStruct_203B3E8)); @@ -286,30 +286,30 @@ void PrintWonderMailMainMenuError(u32 status) break; case 1: // "Communication Error" - sub_80141B4(gUnknown_80E7914, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E7914, 0, 0, 0x101); break; case COMMS_INCORRECT_NUM_SYSTEMS: // Incorrect number of GBA Systems - sub_80141B4(gUnknown_80E7938, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E7938, 0, 0, 0x101); break; case COMMS_NO_RESPONSE: // No response from friend. Redo from start - sub_80141B4(gUnknown_80E7994, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E7994, 0, 0, 0x101); break; case COMMS_DIFFERENT_MODES: // Sender and receiver in different modes - sub_80141B4(gUnknown_80E79E4, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E79E4, 0, 0, 0x101); break; case 5: // "Communication Error" - sub_80141B4(gUnknown_80E7914, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E7914, 0, 0, 0x101); break; case 14: // "Communication Error" - sub_80141B4(gUnknown_80E7914, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E7914, 0, 0, 0x101); break; case COMMS_NOT_READY: // "No response from your friend. Make sure sender and receiver are ready" - sub_80141B4(gUnknown_80E7A48, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E7A48, 0, 0, 0x101); break; case COMMS_NO_ROOM_STORAGE: case COMMS_DUPLICATE_MAIL: @@ -321,7 +321,7 @@ void PrintWonderMailMainMenuError(u32 status) case COMMS_NO_ROOM_MAIL: default: // "Communication Error" - sub_80141B4(gUnknown_80E7914, 0, 0, 0x101); + xxx_info_box_80141B4(gUnknown_80E7914, 0, 0, 0x101); break; } @@ -337,7 +337,7 @@ void HandlePasswordEntryScreen(void) case 3: sub_80155F0(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE); if ( !DecodeWonderMailPassword(gUnknown_203B3E8->PasswordEntryBuffer, &gUnknown_203B3E8->UNK38.decodedMail) || !IsValidWonderMail(&gUnknown_203B3E8->UNK38.decodedMail) ) { // Invalid password @@ -355,7 +355,7 @@ void HandlePasswordEntryScreen(void) case 2: sub_80155F0(); ResetUnusedInputStruct(); - sub_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(gUnknown_203B3E8->unk1EC, TRUE, TRUE); SetWonderMailMainMenuState(EXIT_TO_MAIN_MENU); break; } @@ -462,7 +462,7 @@ void WonderMailMainMenuCallback(void) break; case 3: ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_802EF48(); break; case RECEIVE_WONDER_MAIL_MAIN_SCREEN: @@ -489,25 +489,25 @@ void WonderMailMainMenuCallback(void) { case WONDER_MAIL_GAME_LINK: case WONDER_MAIL_PASSWORD: - sub_80141B4(gUnknown_80E7B48,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E7B48,0,0,0x101); break; case 4: break; } } else - sub_80141B4(gUnknown_80E7B48,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E7B48,0,0,0x101); break; case WONDER_MAIL_SENT: - sub_80141B4(gUnknown_80E7B68,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E7B68,0,0,0x101); break; case WONDER_MAIL_ADDED: if (gUnknown_203B3E8->wonderMailAccepted) { - sub_80141B4(gUnknown_80E7B88,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E7B88,0,0,0x101); } else { // Wonder Mail was refused - sub_80141B4(gUnknown_80E7BC8,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E7BC8,0,0,0x101); } break; case GAME_LINK_CABLE_MENU: @@ -515,7 +515,7 @@ void WonderMailMainMenuCallback(void) break; case 6: nullsub_23(FALSE); - sub_80141B4(gUnknown_80E7C48,0,0,0); + xxx_info_box_80141B4(gUnknown_80E7C48,0,0,0); break; case 9: gUnknown_203B3E8->wonderMailStatus = COMMS_GOOD; @@ -561,12 +561,12 @@ void WonderMailMainMenuCallback(void) xxx_call_start_bg_music(); break; case PROMPT_PASSWORD_ENTRY: - sub_80141B4(gUnknown_80E7C98,0,0,0x101); + xxx_info_box_80141B4(gUnknown_80E7C98,0,0,0x101); break; case PASSWORD_ENTRY_SCREEN: - sub_8006518(gUnknown_203B3E8->unk1EC); + RestoreUnkTextStruct_8006518(gUnknown_203B3E8->unk1EC); ResetUnusedInputStruct(); - sub_800641C(NULL, TRUE, TRUE); + xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sub_80151C0(5,gUnknown_203B3E8->PasswordEntryBuffer); break; case PASSWORD_INVALID: diff --git a/sym_ewram.txt b/sym_ewram.txt index 63fdbddd0..a3a866a9c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -4,7 +4,7 @@ gUnknown_2000A80: /* 2000A80 (GameLoop) */ .space 0x8 -gUnknown_2000A88: /* 2000A88 (sub_800135C - sub_8002718) */ +gScriptVarBuffer: /* 2000A88 (ThouroughlyResetScriptVars - sub_8002718) */ .space 0x400 .include "src/memory.o" @@ -58,36 +58,36 @@ gUnknown_20274A6: /* 20274A6 (HandleTextFormat) */ .space 0x6 gCurrentCharmap: /* 20274AC (LoadCharmaps - xxx_draw_string) */ .space 0x4 -gUnknown_20274B0: /* 20274B0 (xxx_update_some_bg_tiles - sub_80063D8) */ +gUnknown_20274B0: /* 20274B0 (UpdateFadeInTile - SetCharacterMask) */ .space 0x4 -gUnknown_20274B4: /* 20274B4 (sub_8006438) */ +gUnknown_20274B4: /* 20274B4 (SaveUnkTextStructAndXXX_8006438) */ .space 0x3B00 gCharmapFiles: /* 202AFB4 (LoadCharmaps) */ .space 0xC -gUnknown_202AFC0: /* 202AFC0 (sub_8006438 - sub_8006518) */ +gUnknown_202AFC0: /* 202AFC0 (SaveUnkTextStructAndXXX_8006438 - RestoreUnkTextStruct_8006518) */ .space 0x60 gUnknown_202B020: /* 202B020 (LoadCharmaps - sub_80095CC) */ .space 0x4 gUnknown_202B024: /* 202B024 (LoadCharmaps - sub_80095CC) */ .space 0x4 -gUnknown_202B028: /* 202B028 (LoadCharmaps - xxx_draw_char) */ +gCharHeight: /* 202B028 (LoadCharmaps - xxx_draw_char) */ .space 0x8 -gUnknown_202B030: /* 202B030 (LoadCharmaps - sub_80078E8) */ +gTextShadowMask: /* 202B030 (LoadCharmaps - sub_80078E8) */ .space 0x4 -gUnknown_202B034: /* 202B034 (LoadCharmaps - xxx_draw_char) */ +gDrawTextShadow: /* 202B034 (LoadCharmaps - xxx_draw_char) */ .space 0x4 gUnknown_202B038: /* 202B038 (LoadTitleScreen - sub_80A2B40) */ .space 0x1000 -gUnknown_202C038: /* 202C038 (sub_8010858 - sub_804A728) */ +gFontTiles_202C038: /* 202C038 (sub_8010858 - sub_804A728) */ .space 0x800 -gUnknown_202C838: /* 202C838 (sub_8010858 - sub_804A49C) */ +gFontTilesExtra_202C838: /* 202C838 (sub_8010858 - sub_804A49C) */ .space 0x720 gUnknown_202CF58: /* 202CF58 (xxx_format_string) */ .space 0xE0 -gUnknown_202D038: /* 202D038 (sub_80097B0 - sub_8052FB8) */ +gFontPalette: /* 202D038 (sub_80097B0 - sub_8052FB8) */ .space 0x4 gUnknown_202D03C: /* 202D03C (sub_8040238) */ @@ -99,7 +99,7 @@ gUnknown_202D068: /* 202D068 (sub_803FB74) */ gUnknown_202D06C: /* 202D06C (sub_803F38C) */ .space 0xC -gUnknown_202D078: /* 202D078 (sub_8099690) */ +gFontPaletteAlt: /* 202D078 (sub_8099690) */ .space 0x20 gUnknown_202D098: /* 202D098 (xxx_format_string) */ @@ -189,7 +189,7 @@ gUnknown_202DE19: /* 202DE19 (sub_800F990 - sub_8010014) */ gFormatData_202DE30: /* 202DE30 [used everywhere tbh] */ .space 0x28 /* Seems to be a general u8 buffer for text, mostly used with item names */ -gUnknown_202DE58: /* 202DE58 [used everywhere tbh] */ +gFormatItems: /* 202DE58 [used everywhere tbh] */ .space 80 gUnknown_202DEA8: /* 202DEA8 [used everywhere tbh] */ .space 240 @@ -516,7 +516,7 @@ gMonsterParameters: /* 202F3E0 (LoadMonsterParameters - IsPokemonDialogueSpriteA .space 0x4 gMonsterParametersFile: /* 202F3E4 (LoadMonsterParameters) */ .space 0x4 -gUnknown_202F3E8: /* 202F3E8 (sub_808E53C - sub_808E668) */ +gShadowSprites: /* 202F3E8 (InitShadowSprites - AddShadowSprite) */ .space 0x18 gRecruitedPokemon: /* 202F400 [used everywhere tbh] */ .space 0x90E8 @@ -585,15 +585,15 @@ gUnknown_2039A32: /* 2039A32 (sub_809D4B0 - ExecuteScriptCommand) */ .space 0x2 gUnknown_2039A34: /* 2039A34 (sub_809D4B0 - ExecuteScriptCommand) */ .space 0x2 -gUnknown_2039A36: /* 2039A36 (sub_809D4B0 - GroundScript_Unlock) */ +gAnyScriptLocked: /* 2039A36 (sub_809D4B0 - GroundScript_Unlock) */ .space 0x2 -gUnknown_2039A38: /* 2039A38 (sub_809D4B0 - GroundScript_Unlock) */ +gScriptLocks: /* 2039A38 (sub_809D4B0 - GroundScript_Unlock) */ .space 0x88 -gUnknown_2039AC0: /* 2039AC0 (sub_809D4B0 - GroundScript_Unlock) */ +gScriptLockConds: /* 2039AC0 (sub_809D4B0 - GroundScript_Unlock) */ .space 0x88 -gUnknown_2039B48: /* 2039B48 (sub_809D4B0 - HandleAction) */ +gUnlockBranchLabels: /* 2039B48 (sub_809D4B0 - HandleAction) */ .space 0x208 -gUnknown_2039D50: /* 2039D50 (ExecuteScriptCommand) */ +gChoices: /* 2039D50 (ExecuteScriptCommand) */ .space 0x48 gUnknown_2039D98: /* 2039D98 (HandleAction - sub_80A14E8) [seems to be storage for strings.. used for both Team Name and Player Name] */ .space 0xC diff --git a/sym_ewram2.txt b/sym_ewram2.txt index 5a9399188..459d4873f 100644 --- a/sym_ewram2.txt +++ b/sym_ewram2.txt @@ -12,7 +12,7 @@ gTitlePaletteFile: /* 203B038 (GameLoop) */ .space 0x4 gUnknown_203B03C: /* 203B03C */ .space 0x4 -gUnknown_203B040: /* 203B040 */ +gPersonalityRelated_203B040: /* 203B040 */ .space 0x30 .include "src/other_random.o" @@ -20,7 +20,7 @@ gUnknown_203B040: /* 203B040 */ .include "src/sprite.o" -gUnknown_203B078: /* 203B078 (sub_80057E8 - sub_8006438) */ +gUnknown_203B078: /* 203B078 (sub_80057E8 - SaveUnkTextStructAndXXX_8006438) */ .space 0x4 .include "src/random.o" @@ -234,7 +234,7 @@ gUnknown_203B414: /* 203B414 (sub_8042B34 - sub_8042D7C) */ gDungeon: /* 203B418 */ .space 0x4 -gUnknown_203B41C: /* 203B41C (xxx_dungeon_8042F6C) */ +gSerializedData_203B41C: /* 203B41C (xxx_dungeon_8042F6C) */ .space 0x4 gUnknown_203B420: /* 203B420 (sub_80462AC) */ @@ -284,7 +284,7 @@ gLeaderPointer: /* 203B450 (xxx_dungeon_8042F6C - sub_8082280) */ gUnknown_203B4A0: /* 203B4A0 (sub_809CCDC) */ .space 0xC -gUnknown_203B4AC: /* 203B4AC (ExecuteScriptCommand) */ +gNumChoices: /* 203B4AC (ExecuteScriptCommand) */ .space 0x4 gUnknown_203B4B0: /* 203B4B0 (sub_809D490 - HandleAction) */ diff --git a/sym_iwram.txt b/sym_iwram.txt index 8aebecf7f..e0b7064f9 100644 --- a/sym_iwram.txt +++ b/sym_iwram.txt @@ -33,19 +33,19 @@ gUnknown_3001B5A: /* 3001B5A */ .include "src/ground_map_2.o" .include "src/ground_sprite.o" -gUnknown_3001B80: /* 3001B80 */ +gGroundLivesMeta: /* 3001B80 */ .space 0x4 -gUnknown_3001B84: /* 3001B84 */ +gGroundLives: /* 3001B84 */ .space 0x4 -gUnknown_3001B88: /* 3001B88 */ +gGroundObjects: /* 3001B88 */ .space 0x4 -gUnknown_3001B8C: /* 3001B8C */ +gGroundEffects: /* 3001B8C */ .space 0x4 -gUnknown_3001B90: /* 3001B90 */ +gGroundEvents: /* 3001B90 */ .space 0x2470 .include "src/code_80001DC.o" From 4b9cc03736b747457d339ffb3e158e38e78da147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 15 Sep 2024 20:36:20 +0200 Subject: [PATCH 4/8] GroundScript callbacks --- include/ground_script.h | 38 +++++------ src/ground_script.c | 8 +-- src/ground_script_1.c | 144 ++++++++++++++++++++-------------------- 3 files changed, 95 insertions(+), 95 deletions(-) diff --git a/include/ground_script.h b/include/ground_script.h index 5a70a1d9f..a91addeeb 100644 --- a/include/ground_script.h +++ b/include/ground_script.h @@ -79,26 +79,26 @@ typedef struct CallbackData /* 0x00 */ u16 maybeId; // padding // (almost?) all callbacks take the parentObject as first parameter - /* 0x04 */ s16 (*func04)(void*); // id related - /* 0x08 */ u32 (*func08)(); - /* 0x0C */ u32 (*func0C)(); - /* 0x10 */ u32 (*func10)(); - /* 0x14 */ u32 (*func14)(); - /* 0x18 */ u32 (*func18)(); - /* 0x1C */ u32 (*func1C)(); - /* 0x20 */ u32 (*func20)(); - /* 0x24 */ u32 (*func24)(); - /* 0x28 */ u32 (*func28)(); - /* 0x2C */ u32 (*func2C)(); - /* 0x30 */ u32 (*func30)(); - /* 0x34 */ u32 (*func34)(); + /* 0x04 */ s16 (*getIndex)(void*); // id related + /* 0x08 */ u32 (*getSize)(); + /* 0x0C */ u32 (*getHitboxCenter)(); + /* 0x10 */ u32 (*getPosHeightAndUnk)(); + /* 0x14 */ u32 (*getDirection)(); + /* 0x18 */ u32 (*getFlags)(); + /* 0x1C */ u32 (*setHitboxPos)(); + /* 0x20 */ u32 (*setPositionBounds)(); + /* 0x24 */ u32 (*moveReal)(); + /* 0x28 */ u32 (*setPosHeight)(); + /* 0x2C */ u32 (*setDirection)(); + /* 0x30 */ u32 (*setEventIndex)(); + /* 0x34 */ u32 (*livesOnlyNullsub)(); /* 0x38 */ u32 (*func38)(); - /* 0x3C */ u32 (*func3C)(); - /* 0x40 */ u32 (*func40)(); - /* 0x44 */ u32 (*func44)(); - /* 0x48 */ u32 (*func48)(); - /* 0x4C */ u32 (*func4C)(); - /* 0x50 */ u32 (*func50)(); + /* 0x3C */ u32 (*setFlags)(); + /* 0x40 */ u32 (*clearFlags)(); + /* 0x44 */ u32 (*func44_livesOnlySpriteRelated)(); + /* 0x48 */ u32 (*moveRelative)(); + /* 0x4C */ u32 (*func4C_spriteRelatedCheck)(); + /* 0x50 */ u32 (*func50_spriteRelated)(); } CallbackData; typedef struct Action diff --git a/src/ground_script.c b/src/ground_script.c index b7ae7cc4c..cc68452da 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -106,8 +106,8 @@ void InitActionWithParams(Action *action, const CallbackData *callbacks, void *p action->sector = sector_s32; action->unk8[0] = callbacks->maybeId; - if(callbacks->func04) - action->unk8[1] = callbacks->func04(parent); + if(callbacks->getIndex) + action->unk8[1] = callbacks->getIndex(parent); else action->unk8[1] = 0; } @@ -265,8 +265,8 @@ bool8 GroundScript_ExecutePP(Action *action, s32 *param_2, ScriptInfoSmall *para action->scriptData.savedScript.ptr = 0; action->scriptData.savedScript.ptr2 = NULL; - if (action->callbacks->func14 != 0) { - action->callbacks->func14(action->parentObject, &action->scriptData.unk26); + if (action->callbacks->getDirection != 0) { + action->callbacks->getDirection(action->parentObject, &action->scriptData.unk26); } return TRUE; } diff --git a/src/ground_script_1.c b/src/ground_script_1.c index c854d4e89..c8b046341 100644 --- a/src/ground_script_1.c +++ b/src/ground_script_1.c @@ -453,7 +453,7 @@ s32 ExecuteScriptCommand(Action *action) { s16 res; s32 group; s32 sector; - action->callbacks->func14(action->parentObject, unk); + action->callbacks->getDirection(action->parentObject, unk); obj = ({ GroundObjectData obj = { .unk1 = *unk, .widthTiles = 1, @@ -468,7 +468,7 @@ s32 ExecuteScriptCommand(Action *action) { }); res = GroundObject_Add(-1, obj, group, sector); if (res >= 0) { - action->callbacks->func0C(action->parentObject, &pos); + action->callbacks->getHitboxCenter(action->parentObject, &pos); sub_80AC49C(res, &pos); } break; @@ -480,7 +480,7 @@ s32 ExecuteScriptCommand(Action *action) { s16 res; s32 group; s32 sector; - action->callbacks->func14(action->parentObject, &unk); + action->callbacks->getDirection(action->parentObject, &unk); eff = ({ GroundEffectData eff = { .unk1 = unk, .widthTiles = 1, @@ -495,7 +495,7 @@ s32 ExecuteScriptCommand(Action *action) { }); res = GroundEffect_Add(-1, eff, group, sector); if (res >= 0) { - action->callbacks->func0C(action->parentObject, &pos); + action->callbacks->getHitboxCenter(action->parentObject, &pos); sub_80AD3B4(res, &pos); } break; @@ -595,8 +595,8 @@ s32 ExecuteScriptCommand(Action *action) { if (ret >= 0) { sub_80A8BD8(ret, &unk); if (unk & 0x200) { - action->callbacks->func0C(action->parentObject, &pos1); - action->callbacks->func08(action->parentObject, &pos2); + action->callbacks->getHitboxCenter(action->parentObject, &pos1); + action->callbacks->getSize(action->parentObject, &pos2); sub_80A8FD8(ret, &pos3); sub_80A8F9C(ret, &pos4); if ((tmp = (s8)SizedDeltaDirection8(&pos3, &pos4, &pos1, &pos2)) != -1 || @@ -904,7 +904,7 @@ s32 ExecuteScriptCommand(Action *action) { if (action->scriptData2.state == 1) { InitScriptData(&action->scriptData2); } - action->callbacks->func1C(action->parentObject, 0); + action->callbacks->setHitboxPos(action->parentObject, 0); break; } case 0x50: { @@ -916,11 +916,11 @@ s32 ExecuteScriptCommand(Action *action) { ptr = tmp; } if (ptr) { - ptr->callbacks->func0C(action->parentObject, &pos); - ptr->callbacks->func14(action->parentObject, &c); - action->callbacks->func24(action->parentObject, &pos); + ptr->callbacks->getHitboxCenter(action->parentObject, &pos); + ptr->callbacks->getDirection(action->parentObject, &c); + action->callbacks->moveReal(action->parentObject, &pos); action->scriptData.unk26 = c; - action->callbacks->func2C(action->parentObject, c); + action->callbacks->setDirection(action->parentObject, c); } break; } @@ -928,32 +928,32 @@ s32 ExecuteScriptCommand(Action *action) { Position32 posIn; Position32 posOut1; Position32 posOut2; - action->callbacks->func0C(action->parentObject, &posIn); + action->callbacks->getHitboxCenter(action->parentObject, &posIn); GroundLink_GetArea(curCmd.argShort, &posOut1, &posOut2, &posIn); - action->callbacks->func20(action->parentObject, &posOut1, &posOut2); + action->callbacks->setPositionBounds(action->parentObject, &posOut1, &posOut2); break; } case 0x52: { - action->callbacks->func3C(action->parentObject, curCmd.arg1); + action->callbacks->setFlags(action->parentObject, curCmd.arg1); break; } case 0x53: { if (curCmd.arg1 & 0x400 && action->scriptData2.state == 1) { InitScriptData(&action->scriptData2); } - action->callbacks->func40(action->parentObject, curCmd.arg1); + action->callbacks->clearFlags(action->parentObject, curCmd.arg1); break; } case 0x54: { - action->callbacks->func14(action->parentObject, &action->scriptData.unk26); + action->callbacks->getDirection(action->parentObject, &action->scriptData.unk26); if (curCmd.argShort) { action->scriptData.unk24 = curCmd.argShort; } - action->callbacks->func30(action->parentObject, (u16)curCmd.argShort); + action->callbacks->setEventIndex(action->parentObject, (u16)curCmd.argShort); break; } case 0x55: { - action->callbacks->func34(action->parentObject, (u16)curCmd.argShort); + action->callbacks->livesOnlyNullsub(action->parentObject, (u16)curCmd.argShort); break; } case 0x56: { @@ -961,14 +961,14 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x57: { - action->callbacks->func44(action->parentObject, curCmd.argShort); + action->callbacks->func44_livesOnlySpriteRelated(action->parentObject, curCmd.argShort); break; } case 0x58: { u32 unk[2]; unk[0] = curCmd.arg1 << 8; unk[1] = curCmd.arg2 << 8; - action->callbacks->func24(action->parentObject, unk); + action->callbacks->moveReal(action->parentObject, unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -976,7 +976,7 @@ s32 ExecuteScriptCommand(Action *action) { u32 unk[2]; unk[0] = curCmd.argShort << 8; unk[1] = curCmd.arg1 << 8; - action->callbacks->func48(action->parentObject, unk); + action->callbacks->moveRelative(action->parentObject, unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -984,25 +984,25 @@ s32 ExecuteScriptCommand(Action *action) { u32 unk[2]; unk[0] = OtherRandInt(curCmd.argShort) << 8; unk[1] = OtherRandInt(curCmd.arg1) << 8; - action->callbacks->func48(action->parentObject, unk); + action->callbacks->moveRelative(action->parentObject, unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x5b: { Position32 unk; - action->callbacks->func0C(action->parentObject, &unk); + action->callbacks->getHitboxCenter(action->parentObject, &unk); GroundLink_GetPos((s16)curCmd.arg1, &unk); - action->callbacks->func24(action->parentObject, &unk); // landing end of unwanted tailmerge + action->callbacks->moveReal(action->parentObject, &unk); // landing end of unwanted tailmerge scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x5c: { Position32 pos, pos1, pos2; - action->callbacks->func0C(action->parentObject, &pos); + action->callbacks->getHitboxCenter(action->parentObject, &pos); GroundLink_GetArea((s16)curCmd.arg1, &pos1, &pos2, &pos); pos.x = pos1.x + OtherRandInt(pos2.x - pos1.x); pos.y = pos1.y + OtherRandInt(pos2.y - pos1.y); - action->callbacks->func24(action->parentObject, &pos); + action->callbacks->moveReal(action->parentObject, &pos); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -1011,7 +1011,7 @@ s32 ExecuteScriptCommand(Action *action) { s16 res = sub_80A7AE8((s16)curCmd.arg1); if (res >= 0) { sub_80A8FD8(res, &unk); - action->callbacks->func24(action->parentObject, &unk); + action->callbacks->moveReal(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -1025,10 +1025,10 @@ s32 ExecuteScriptCommand(Action *action) { pos.y = GetScriptVarArrayValue(0, 0x33, (u16)curCmd.arg1); // POSITION_Y height = GetScriptVarArrayValue(0, 0x34, (u16)curCmd.arg1); // POSITION_HEIGHT dir = (s8)GetScriptVarArrayValue(0, 0x35, (u16)curCmd.arg1); // POSITION_DIRECTION - action->callbacks->func24(action->parentObject, &pos); - action->callbacks->func28(action->parentObject, height); + action->callbacks->moveReal(action->parentObject, &pos); + action->callbacks->setPosHeight(action->parentObject, height); action->scriptData.unk26 = dir; - action->callbacks->func2C(action->parentObject, dir); + action->callbacks->setDirection(action->parentObject, dir); // NONMATCHING: unwanted tailmerge #ifndef NONNMATCHING asm(""); @@ -1041,9 +1041,9 @@ s32 ExecuteScriptCommand(Action *action) { u32 height; u32 wat; s8 dir; - action->callbacks->func0C(action->parentObject, &pos); - action->callbacks->func10(action->parentObject, &height, &wat); - action->callbacks->func14(action->parentObject, &dir); + action->callbacks->getHitboxCenter(action->parentObject, &pos); + action->callbacks->getPosHeightAndUnk(action->parentObject, &height, &wat); + action->callbacks->getDirection(action->parentObject, &dir); SetScriptVarArrayValue(0, 0x32, (u16)curCmd.arg1, pos.x); SetScriptVarArrayValue(0, 0x33, (u16)curCmd.arg1, pos.y); SetScriptVarArrayValue(0, 0x34, (u16)curCmd.arg1, height); @@ -1051,7 +1051,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x60: { - action->callbacks->func28(action->parentObject, curCmd.arg1 << 8); + action->callbacks->setPosHeight(action->parentObject, curCmd.arg1 << 8); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -1064,7 +1064,7 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x62: case 0x6a: { u32 pos[2]; - action->callbacks->func0C(action->parentObject, pos); + action->callbacks->getHitboxCenter(action->parentObject, pos); scriptData->pos2.x = pos[0] + (curCmd.arg1 << 8); scriptData->pos2.y = pos[1] + (curCmd.arg2 << 8); scriptData->unk30 = curCmd.argShort; @@ -1072,21 +1072,21 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } case 0x63: case 0x6b: { - action->callbacks->func0C(action->parentObject, &scriptData->pos2); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos2); GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = -1; return 2; } case 0x64: case 0x6c: { - action->callbacks->func0C(action->parentObject, &scriptData->pos2); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos2); GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x65: case 0x6d: { - action->callbacks->func0C(action->parentObject, &scriptData->pos2); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos2); GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = OtherRandInt((u8)curCmd.argByte); @@ -1103,7 +1103,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x71: case 0x77: case 0x7d: case 0x83: { - action->callbacks->func0C(action->parentObject, &scriptData->pos1); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos1); scriptData->pos2.x = curCmd.arg1 << 8; scriptData->pos2.y = curCmd.arg2 << 8; if (curCmd.op == 0x7d || curCmd.op == 0x83) { @@ -1115,7 +1115,7 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } case 0x72: case 0x78: case 0x7e: case 0x84: { - action->callbacks->func0C(action->parentObject, &scriptData->pos1); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos1); scriptData->pos2.x = scriptData->pos1.x + (curCmd.arg1 << 8); scriptData->pos2.y = scriptData->pos1.y + (curCmd.arg2 << 8); if (curCmd.op == 0x7e || curCmd.op == 0x84) { @@ -1129,7 +1129,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x73: case 0x79: case 0x7f: case 0x85: { s32 cap1 = curCmd.arg1 * 2 - 1; s32 cap2 = curCmd.arg2 * 2 - 1; - action->callbacks->func0C(action->parentObject, &scriptData->pos1); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos1); scriptData->pos2.x = scriptData->pos1.x + ((OtherRandInt(cap1) - curCmd.argShort) << 8); scriptData->pos2.y = scriptData->pos1.y + ((OtherRandInt(cap2) - curCmd.arg1) << 8); if (curCmd.op == 0x7f || curCmd.op == 0x85) { @@ -1141,7 +1141,7 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } case 0x74: case 0x7a: case 0x80: case 0x86: { - action->callbacks->func0C(action->parentObject, &scriptData->pos1); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos1); scriptData->pos2 = scriptData->pos1; GroundLink_GetPos((s16)curCmd.arg1, &scriptData->pos2); if (curCmd.op == 0x80 || curCmd.op == 0x86) { @@ -1154,7 +1154,7 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x75: case 0x7b: case 0x81: case 0x87: { s32 cap = curCmd.arg1 * 2 - 1; - action->callbacks->func0C(action->parentObject, &scriptData->pos2); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos2); GroundLink_GetPos((s16)curCmd.arg2, &scriptData->pos2); scriptData->pos2.x = scriptData->pos2.x + ((OtherRandInt(cap) - curCmd.argShort) << 8); scriptData->pos2.y = scriptData->pos2.y + ((OtherRandInt(cap) - curCmd.argShort) << 8); @@ -1169,7 +1169,7 @@ s32 ExecuteScriptCommand(Action *action) { case 0x76: case 0x7c: case 0x82: case 0x88: { s16 ret = sub_80A7AE8((s16)curCmd.arg1); if (ret >= 0) { - action->callbacks->func0C(action->parentObject, &scriptData->pos1); + action->callbacks->getHitboxCenter(action->parentObject, &scriptData->pos1); sub_80A8FD8(ret, &scriptData->pos2); if (curCmd.op == 0x82 || curCmd.op == 0x88) { scriptData->unk2A = sub_8009FB8(scriptData->pos2.x - scriptData->pos1.x, scriptData->pos2.y - scriptData->pos1.y) / curCmd.argShort; @@ -1189,23 +1189,23 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x89: { action->scriptData.unk26 = curCmd.arg1; - action->callbacks->func2C(action->parentObject, (s8) curCmd.arg1); + action->callbacks->setDirection(action->parentObject, (s8) curCmd.arg1); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x8a: { s8 dir; - action->callbacks->func14(action->parentObject, &dir); + action->callbacks->getDirection(action->parentObject, &dir); action->scriptData.unk26 = sub_8002984(dir, (s8)curCmd.arg1); - action->callbacks->func2C(action->parentObject, action->scriptData.unk26); + action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x8b: { action->scriptData.unk26 = curCmd.argShort; - action->callbacks->func2C(action->parentObject, action->scriptData.unk26); + action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -1215,16 +1215,16 @@ s32 ExecuteScriptCommand(Action *action) { if (ret >= 0) { sub_80A9050(ret, &dir); action->scriptData.unk26 = sub_8002984(dir, curCmd.argShort); - action->callbacks->func2C(action->parentObject, action->scriptData.unk26); + action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); } scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x8d: { s8 dir; - action->callbacks->func14(action->parentObject, &dir); + action->callbacks->getDirection(action->parentObject, &dir); action->scriptData.unk26 = sub_8002984(dir, curCmd.argShort); - action->callbacks->func2C(action->parentObject, action->scriptData.unk26); + action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -1253,8 +1253,8 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x90: { flag = TRUE; - action->callbacks->func0C(action->parentObject, &pos1); - action->callbacks->func08(action->parentObject, &pos2); + action->callbacks->getHitboxCenter(action->parentObject, &pos1); + action->callbacks->getSize(action->parentObject, &pos2); GroundLink_GetPos((s16)curCmd.arg1, &pos1); break; } @@ -1262,8 +1262,8 @@ s32 ExecuteScriptCommand(Action *action) { if (flag) { s8 ret; int tmp; - action->callbacks->func0C(action->parentObject, &pos3); - action->callbacks->func08(action->parentObject, &pos4); + action->callbacks->getHitboxCenter(action->parentObject, &pos3); + action->callbacks->getSize(action->parentObject, &pos4); ret = SizedDeltaDirection8(&pos3, &pos4, &pos1, &pos2); // wtf *&dir = ret; @@ -1272,10 +1272,10 @@ s32 ExecuteScriptCommand(Action *action) { dir = SizedDeltaDirection4(&pos3, &gUnknown_81164DC, &pos1, &gUnknown_81164DC); } if (dir == tmp) { - action->callbacks->func14(action->parentObject, &dir); + action->callbacks->getDirection(action->parentObject, &dir); } action->scriptData.unk26 = sub_8002984(dir, (s8)curCmd.argShort); - action->callbacks->func2C(action->parentObject, action->scriptData.unk26); + action->callbacks->setDirection(action->parentObject, action->scriptData.unk26); } scriptData->unk2A = (u8)curCmd.argByte; return 2; @@ -1291,7 +1291,7 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x92: { s8 unk; - action->callbacks->func14(action->parentObject, &unk); + action->callbacks->getDirection(action->parentObject, &unk); action->scriptData.unk4D = sub_8002984(unk, (s8)curCmd.arg1); scriptData->unk2A = 0; return 2; @@ -1301,7 +1301,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x98: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); switch(action->unk8[0]) { case 1: sub_809D170(1, id); @@ -1316,7 +1316,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x99: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); Position32 unk; switch(action->unk8[0]) { case 1: @@ -1339,7 +1339,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x9b: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); if (id < 0) break; switch(action->unk8[0]) { case 1: @@ -1355,7 +1355,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x9c: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); Position32 unk; switch(action->unk8[0]) { case 1: @@ -1378,7 +1378,7 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } case 0x9e: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); if (id < 0) break; switch(action->unk8[0]) { case 1: @@ -1394,7 +1394,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x9f: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); Position32 unk; switch(action->unk8[0]) { case 1: @@ -1417,7 +1417,7 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } case 0xa1: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); if (id < 0) break; switch(action->unk8[0]) { case 1: @@ -1433,7 +1433,7 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0xa2: { - s32 id = action->callbacks->func04(action->parentObject); + s32 id = action->callbacks->getIndex(action->parentObject); Position32 unk; switch(action->unk8[0]) { case 1: @@ -1644,12 +1644,12 @@ s32 ExecuteScriptCommand(Action *action) { } case 0xc7: { s8 dir; - action->callbacks->func14(action->parentObject, &dir); + action->callbacks->getDirection(action->parentObject, &dir); val = dir; break; } case 0xca: { - action->callbacks->func0C(action->parentObject, &pos); + action->callbacks->getHitboxCenter(action->parentObject, &pos); pos2 = pos; GroundLink_GetPos((s16)curCmd.arg1, &pos2); pos3.x = pos2.x - pos.x; @@ -1661,8 +1661,8 @@ s32 ExecuteScriptCommand(Action *action) { s16 tmp = (s16)sub_80A7AE8((s16)curCmd.arg1); if (tmp >= 0) { Position32 pos1, pos2, pos3, pos4; - action->callbacks->func0C(action->parentObject, &pos1); - action->callbacks->func08(action->parentObject, &pos2); + action->callbacks->getHitboxCenter(action->parentObject, &pos1); + action->callbacks->getSize(action->parentObject, &pos2); sub_80A8FD8(tmp, &pos3); sub_80A8F9C(tmp, &pos4); val = (s8)SizedDeltaDirection8(&pos1, &pos2, &pos3, &pos4); @@ -1678,8 +1678,8 @@ s32 ExecuteScriptCommand(Action *action) { s16 tmp = (s16)sub_80A7AE8((s16)curCmd.arg1); if (tmp >= 0) { Position32 pos1, pos2, pos3; - action->callbacks->func0C(action->parentObject, &pos1); - action->callbacks->func08(action->parentObject, &pos2); + action->callbacks->getHitboxCenter(action->parentObject, &pos1); + action->callbacks->getSize(action->parentObject, &pos2); sub_80A8FD8(tmp, &pos3); val = (s8)SizedDeltaDirection8(&pos1, &pos2, &pos3, &gUnknown_81164DC); if (val == -1) { From be0463ab7578b86528d2df343735770e7aa2ba1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 15 Sep 2024 21:07:06 +0200 Subject: [PATCH 5/8] Properly typed callbacks --- include/ground_script.h | 40 ++++++++++++++++++++-------------------- src/ground_script_1.c | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/ground_script.h b/include/ground_script.h index a91addeeb..8db1c3766 100644 --- a/include/ground_script.h +++ b/include/ground_script.h @@ -78,27 +78,27 @@ typedef struct CallbackData // size: 0x54 /* 0x00 */ u16 maybeId; // padding - // (almost?) all callbacks take the parentObject as first parameter + // All callbacks take the parentObject as first parameter /* 0x04 */ s16 (*getIndex)(void*); // id related - /* 0x08 */ u32 (*getSize)(); - /* 0x0C */ u32 (*getHitboxCenter)(); - /* 0x10 */ u32 (*getPosHeightAndUnk)(); - /* 0x14 */ u32 (*getDirection)(); - /* 0x18 */ u32 (*getFlags)(); - /* 0x1C */ u32 (*setHitboxPos)(); - /* 0x20 */ u32 (*setPositionBounds)(); - /* 0x24 */ u32 (*moveReal)(); - /* 0x28 */ u32 (*setPosHeight)(); - /* 0x2C */ u32 (*setDirection)(); - /* 0x30 */ u32 (*setEventIndex)(); - /* 0x34 */ u32 (*livesOnlyNullsub)(); - /* 0x38 */ u32 (*func38)(); - /* 0x3C */ u32 (*setFlags)(); - /* 0x40 */ u32 (*clearFlags)(); - /* 0x44 */ u32 (*func44_livesOnlySpriteRelated)(); - /* 0x48 */ u32 (*moveRelative)(); - /* 0x4C */ u32 (*func4C_spriteRelatedCheck)(); - /* 0x50 */ u32 (*func50_spriteRelated)(); + /* 0x08 */ void (*getSize)(void*, Position32 *out); + /* 0x0C */ void (*getHitboxCenter)(void*, Position32 *out); + /* 0x10 */ void (*getPosHeightAndUnk)(void*, u32 *height, u32 *unk); + /* 0x14 */ void (*getDirection)(void*, s8 *dir); + /* 0x18 */ void (*getFlags)(void*, u32 *flags); + /* 0x1C */ void (*setHitboxPos)(void*, Position32 *posOrNull); + /* 0x20 */ void (*setPositionBounds)(void*, Position32 *from, Position32 *to); + /* 0x24 */ bool8 (*moveReal)(void*, Position32*); + /* 0x28 */ void (*setPosHeight)(void*, u32 height); + /* 0x2C */ void (*setDirection)(void*, s8 dir); // direction must be signed char! + /* 0x30 */ void (*setEventIndex)(void*, u16); + /* 0x34 */ void (*livesOnlyNullsub)(void*, u16); + /* 0x38 */ void (*func38)(void*, s16, u32); + /* 0x3C */ void (*setFlags)(void*, u32 bits); + /* 0x40 */ void (*clearFlags)(void*, u32 bits); + /* 0x44 */ void (*func44_livesOnlySpriteRelated)(void*, u32); + /* 0x48 */ void (*moveRelative)(void*, Position32*); + /* 0x4C */ bool8 (*func4C_spriteRelatedCheck)(void*); + /* 0x50 */ bool8 (*func50_spriteRelated)(void*); } CallbackData; typedef struct Action diff --git a/src/ground_script_1.c b/src/ground_script_1.c index c8b046341..21c6bbfba 100644 --- a/src/ground_script_1.c +++ b/src/ground_script_1.c @@ -968,7 +968,7 @@ s32 ExecuteScriptCommand(Action *action) { u32 unk[2]; unk[0] = curCmd.arg1 << 8; unk[1] = curCmd.arg2 << 8; - action->callbacks->moveReal(action->parentObject, unk); + action->callbacks->moveReal(action->parentObject, (Position32*)unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -976,7 +976,7 @@ s32 ExecuteScriptCommand(Action *action) { u32 unk[2]; unk[0] = curCmd.argShort << 8; unk[1] = curCmd.arg1 << 8; - action->callbacks->moveRelative(action->parentObject, unk); + action->callbacks->moveRelative(action->parentObject, (Position32*)unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -984,7 +984,7 @@ s32 ExecuteScriptCommand(Action *action) { u32 unk[2]; unk[0] = OtherRandInt(curCmd.argShort) << 8; unk[1] = OtherRandInt(curCmd.arg1) << 8; - action->callbacks->moveRelative(action->parentObject, unk); + action->callbacks->moveRelative(action->parentObject, (Position32*)unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -1064,7 +1064,7 @@ s32 ExecuteScriptCommand(Action *action) { } case 0x62: case 0x6a: { u32 pos[2]; - action->callbacks->getHitboxCenter(action->parentObject, pos); + action->callbacks->getHitboxCenter(action->parentObject, (Position32*)pos); scriptData->pos2.x = pos[0] + (curCmd.arg1 << 8); scriptData->pos2.y = pos[1] + (curCmd.arg2 << 8); scriptData->unk30 = curCmd.argShort; From d57ec58b5bbb59eca3e045baaa6dd93a868b033a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 15 Sep 2024 21:08:44 +0200 Subject: [PATCH 6/8] Minor cleanup --- src/ground_script_1.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ground_script_1.c b/src/ground_script_1.c index 21c6bbfba..1baa80253 100644 --- a/src/ground_script_1.c +++ b/src/ground_script_1.c @@ -965,18 +965,18 @@ s32 ExecuteScriptCommand(Action *action) { break; } case 0x58: { - u32 unk[2]; - unk[0] = curCmd.arg1 << 8; - unk[1] = curCmd.arg2 << 8; - action->callbacks->moveReal(action->parentObject, (Position32*)unk); + Position32 unk; + unk.x = curCmd.arg1 << 8; + unk.y = curCmd.arg2 << 8; + action->callbacks->moveReal(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } case 0x59: { - u32 unk[2]; - unk[0] = curCmd.argShort << 8; - unk[1] = curCmd.arg1 << 8; - action->callbacks->moveRelative(action->parentObject, (Position32*)unk); + Position32 unk; + unk.x = curCmd.argShort << 8; + unk.y = curCmd.arg1 << 8; + action->callbacks->moveRelative(action->parentObject, &unk); scriptData->unk2A = (u8)curCmd.argByte; return 2; } @@ -1063,10 +1063,10 @@ s32 ExecuteScriptCommand(Action *action) { return 2; } case 0x62: case 0x6a: { - u32 pos[2]; - action->callbacks->getHitboxCenter(action->parentObject, (Position32*)pos); - scriptData->pos2.x = pos[0] + (curCmd.arg1 << 8); - scriptData->pos2.y = pos[1] + (curCmd.arg2 << 8); + Position32 pos; + action->callbacks->getHitboxCenter(action->parentObject, &pos); + scriptData->pos2.x = pos.x + (curCmd.arg1 << 8); + scriptData->pos2.y = pos.y + (curCmd.arg2 << 8); scriptData->unk30 = curCmd.argShort; scriptData->unk2A = -1; return 2; From 842729f6652cd1a5025cb242b80fadb819c5846b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 15 Sep 2024 21:40:33 +0200 Subject: [PATCH 7/8] Fix typo --- src/code.c | 2 +- src/code_2.c | 4 ++-- src/save.c | 4 ++-- sym_ewram.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/code.c b/src/code.c index 2eb831642..2f4e4091a 100644 --- a/src/code.c +++ b/src/code.c @@ -55,7 +55,7 @@ extern void SetScriptVarValue(u32, u32, u32); extern void sub_80972F4(void); extern void nullsub_128(void); -void ThouroughlyResetScriptVars(void) +void ThoroughlyResetScriptVars(void) { s32 iVar1; s32 iVar3; diff --git a/src/code_2.c b/src/code_2.c index 2d2ae2fd2..9a4484abb 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -34,7 +34,7 @@ extern void NDS_LoadOverlay_GroundMain(void); extern void sub_8014144(void); extern void sub_800DAAC(void); -extern void ThouroughlyResetScriptVars(void); +extern void ThoroughlyResetScriptVars(void); extern void xxx_script_related_8001334(u32); extern void LoadTitleScreen(void); extern void sub_80095CC(u32, u32); @@ -84,7 +84,7 @@ void GameLoop(void) SetSavingIconCoords(NULL); tmp = 0; if (ReadSaveFromPak(&tmp)) - ThouroughlyResetScriptVars(); + ThoroughlyResetScriptVars(); xxx_script_related_8001334(14); xxx_script_related_8001334(15); ClearScriptVarArray(0, 57); diff --git a/src/save.c b/src/save.c index cb0b3008e..73014617b 100644 --- a/src/save.c +++ b/src/save.c @@ -49,7 +49,7 @@ extern u32 sub_80954CC(void* a, s32 b); extern u32 sub_8095624(u8 *, u32); extern u32 RestoreMailInfo(void* a, s32 b); extern u32 SaveMailInfo(u8 *, u32); -extern void ThouroughlyResetScriptVars(void); +extern void ThoroughlyResetScriptVars(void); extern void sub_80958E4(u32 *a, u32 b); extern void sub_80972F4(void); extern void sub_80974E8(void); @@ -458,7 +458,7 @@ void sub_80122D0(void) void sub_80122F4(void) { - ThouroughlyResetScriptVars(); + ThoroughlyResetScriptVars(); } void InitializePlayerData(void) diff --git a/sym_ewram.txt b/sym_ewram.txt index a3a866a9c..4782ed256 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -4,7 +4,7 @@ gUnknown_2000A80: /* 2000A80 (GameLoop) */ .space 0x8 -gScriptVarBuffer: /* 2000A88 (ThouroughlyResetScriptVars - sub_8002718) */ +gScriptVarBuffer: /* 2000A88 (ThoroughlyResetScriptVars - sub_8002718) */ .space 0x400 .include "src/memory.o" From 676504f0ab2ea86384880f6b59947ee3bf137fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Wed, 18 Sep 2024 16:59:25 +0200 Subject: [PATCH 8/8] Address review comments --- asm/code_800DAC0.s | 4 ++-- asm/code_800F990.s | 18 +++++++++--------- asm/code_8010F28.s | 8 ++++---- asm/code_8069E0C.s | 18 +++++++++--------- asm/ground_sprite.s | 6 +++--- asm/text.s | 10 +++++----- include/sprite.h | 8 ++++---- src/code_800558C.c | 2 +- src/code_806CD90.c | 4 ++-- src/sprite.c | 30 +++++++++++++++--------------- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/asm/code_800DAC0.s b/asm/code_800DAC0.s index 9238d4df3..896200b15 100644 --- a/asm/code_800DAC0.s +++ b/asm/code_800DAC0.s @@ -56,7 +56,7 @@ _0800DD60: b _0800DE28 _0800DD64: mov r0, r8 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame movs r4, 0 ldr r0, [r5, 0x8] movs r1, 0x7 @@ -633,7 +633,7 @@ _0800E1D2: adds r4, 0x55 ldrb r4, [r4] str r4, [sp, 0x4] - bl AxResInitUnorientedFile_800543C + bl AxResInitUnorientedFile b _0800E200 _0800E1E4: adds r0, r5, 0 diff --git a/asm/code_800F990.s b/asm/code_800F990.s index fe0743c69..1cd89a760 100644 --- a/asm/code_800F990.s +++ b/asm/code_800F990.s @@ -439,7 +439,7 @@ _0800FD08: str r4, [sp, 0x8] adds r0, r3, 0 movs r3, 0 - bl AxResInitFile_80053AC + bl AxResInitFile b _0800FD32 .align 2, 0 _0800FD1C: .4byte gUnknown_203B0E4 @@ -758,7 +758,7 @@ _0800FF60: str r2, [sp, 0x8] movs r2, 0 movs r3, 0 - bl AxResInitFile_80053AC + bl AxResInitFile ldr r2, [r4] ldr r1, _0800FFD4 adds r0, r2, r1 @@ -948,7 +948,7 @@ sub_80100C0: str r1, [sp, 0x8] adds r1, r2, 0 movs r2, 0 - bl AxResInitFile_80053AC + bl AxResInitFile bl sub_8011168 ldr r0, [r4] ldr r2, _080101E8 @@ -1053,7 +1053,7 @@ _0801018A: str r2, [sp, 0x8] movs r2, 0 movs r3, 0 - bl AxResInitFile_80053AC + bl AxResInitFile add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -1318,7 +1318,7 @@ _080103B0: movs r2, 0x1 str r2, [sp, 0x8] movs r2, 0 - bl AxResInitFile_80053AC + bl AxResInitFile movs r7, 0 cmp r7, r4 bge _08010448 @@ -1458,7 +1458,7 @@ _080104E6: str r6, [sp, 0x8] adds r0, r3, 0 movs r3, 0 - bl AxResInitFile_80053AC + bl AxResInitFile ldr r1, _08010508 lsls r0, r5, 2 adds r0, r1 @@ -1490,7 +1490,7 @@ _0801050E: str r2, [sp, 0x8] movs r2, 0 movs r3, 0 - bl AxResInitFile_80053AC + bl AxResInitFile ldr r2, [r4] ldr r4, _08010588 adds r3, r2, r4 @@ -2148,7 +2148,7 @@ sub_8010A88: ldr r5, [r1] ldr r3, _08010B64 adds r0, r3 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame mov r0, r9 cmp r0, 0 beq _08010AF6 @@ -2194,7 +2194,7 @@ _08010B04: adds r5, r4, 0 adds r5, 0x8 adds r0, r5, 0 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame mov r2, r9 cmp r2, 0 beq _08010B40 diff --git a/asm/code_8010F28.s b/asm/code_8010F28.s index 57a2c1fe1..5c8fcb239 100644 --- a/asm/code_8010F28.s +++ b/asm/code_8010F28.s @@ -29,7 +29,7 @@ sub_8010F28: mov r8, r1 ldr r4, _0801108C adds r0, r4 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame ldr r3, [r6] adds r4, r3, r4 ldr r7, _08011090 @@ -74,7 +74,7 @@ _08010F98: beq _08010FD8 adds r4, 0x14 adds r0, r4, 0 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame movs r2, 0x4 ldrsh r1, [r5, r2] mov r3, r9 @@ -114,7 +114,7 @@ _08010FEC: cmp r0, 0 beq _08011062 adds r0, r1, r6 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame ldr r0, _080110A8 ldrh r0, [r0] movs r2, 0x80 @@ -557,7 +557,7 @@ _0801132E: movs r3, 0x1 str r3, [sp, 0x8] movs r3, 0 - bl AxResInitFile_80053AC + bl AxResInitFile _08011370: adds r6, 0x3C adds r5, 0x3C diff --git a/asm/code_8069E0C.s b/asm/code_8069E0C.s index fcd6ad410..e20ccf580 100644 --- a/asm/code_8069E0C.s +++ b/asm/code_8069E0C.s @@ -4677,7 +4677,7 @@ _0806C6A8: ldr r4, [sp, 0x38] str r4, [sp, 0x8] adds r0, r5, 0 - bl AxResInitFile_80053AC + bl AxResInitFile mov r10, r5 b _0806C704 _0806C6D6: @@ -4699,7 +4699,7 @@ _0806C6D6: str r1, [sp, 0x8] adds r0, r4, 0 adds r1, r5, 0 - bl AxResInitFile_80053AC + bl AxResInitFile mov r10, r4 _0806C704: mov r2, r9 @@ -4749,12 +4749,12 @@ _0806C73C: cmp r0, 0 beq _0806C76A mov r0, r10 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame mov r0, r10 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame _0806C76A: mov r0, r10 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame b _0806C7E2 .align 2, 0 _0806C774: .4byte 0x000001a5 @@ -4780,9 +4780,9 @@ _0806C784: cmp r0, 0 bne _0806C7BC mov r0, r10 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame mov r0, r10 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame b _0806C7DC .align 2, 0 _0806C7B4: .4byte 0x0000066c @@ -4803,10 +4803,10 @@ _0806C7C8: cmp r0, 0x1 ble _0806C7DC mov r0, r10 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame _0806C7DC: mov r0, r10 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame _0806C7E2: ldr r1, [r6, 0xC] ldr r0, [r6, 0x14] diff --git a/asm/ground_sprite.s b/asm/ground_sprite.s index 52cac0d6e..1bd86debc 100644 --- a/asm/ground_sprite.s +++ b/asm/ground_sprite.s @@ -1429,7 +1429,7 @@ _080A7016: str r0, [sp, 0x8] adds r0, r4, 0 adds r1, r5, 0 - bl AxResInit_80053D0 + bl AxResInit _080A7038: add sp, 0xC pop {r4-r7} @@ -1772,7 +1772,7 @@ sub_80A72B8: movs r0, 0 strh r0, [r1] adds r0, r6, 0 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame b _080A7304 _080A72D2: adds r5, r6, 0 @@ -1795,7 +1795,7 @@ _080A72EE: adds r0, r7, r1 strh r0, [r5] adds r0, r6, 0 - bl RunAxAnimationFrame_80054BC + bl RunAxAnimationFrame movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0xFF diff --git a/asm/text.s b/asm/text.s index 145649fc4..908647389 100644 --- a/asm/text.s +++ b/asm/text.s @@ -1095,8 +1095,8 @@ _08008624: _0800862C: .4byte gUnknown_80B86A4 thumb_func_end GetCharacter - thumb_func_start HexdigitValue -HexdigitValue: + thumb_func_start HexDigitValue +HexDigitValue: push {lr} lsls r0, 24 lsrs r1, r0, 24 @@ -1124,7 +1124,7 @@ _08008658: _0800865C: pop {r1} bx r1 - thumb_func_end HexdigitValue + thumb_func_end HexDigitValue thumb_func_start xxx_get_next_char_from_string xxx_get_next_char_from_string: @@ -1136,10 +1136,10 @@ xxx_get_next_char_from_string: bne _08008696 adds r5, 0x1 ldrb r0, [r5] - bl HexdigitValue + bl HexDigitValue adds r4, r0, 0 ldrb r0, [r5, 0x1] - bl HexdigitValue + bl HexDigitValue lsls r4, 4 adds r4, r0 ldrb r0, [r5] diff --git a/include/sprite.h b/include/sprite.h index 92294cdc0..8f5fa5d54 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -84,9 +84,9 @@ void sub_8004E8C(unkStruct_2039DB0 *); void sub_8005180(void); void sub_8005304(void); void sub_800533C(ax_pose **, UnkSpriteMem **, axdata1 *, u16 *, bool8); -void AxResInitFile_80053AC(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, u32, bool8); -void AxResInit_80053D0(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, u32, bool8); -void AxResInitUnorientedFile_800543C(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, bool8); -void RunAxAnimationFrame_80054BC(struct axPokemon *); +void AxResInitFile(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, u32, bool8); +void AxResInit(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, u32, bool8); +void AxResInitUnorientedFile(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, bool8); +void RunAxAnimationFrame(struct axPokemon *); #endif // GUARD_SPRITE_H \ No newline at end of file diff --git a/src/code_800558C.c b/src/code_800558C.c index 4116a165a..db1ce36c3 100644 --- a/src/code_800558C.c +++ b/src/code_800558C.c @@ -40,7 +40,7 @@ void DoAxFrame_800558C(struct axPokemon *a0, s32 spriteX, s32 spriteY, u32 a3, u return; if (a0->axdata.sub1.poseId < 0) - RunAxAnimationFrame_80054BC(a0); + RunAxAnimationFrame(a0); if (!(a0->axdata.flags >> 15)) return; diff --git a/src/code_806CD90.c b/src/code_806CD90.c index 747e81a6e..e190b6f35 100644 --- a/src/code_806CD90.c +++ b/src/code_806CD90.c @@ -69,9 +69,9 @@ void sub_806CCB4(Entity *entity, u8 a1) sVar1 = entity->unk68; if (info->waitingStruct.waitingStatus != STATUS_DECOY && !flag) - AxResInitFile_80053AC(&entity->spriteInfo, entity->sprite, entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); + AxResInitFile(&entity->spriteInfo, entity->sprite, entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); else - AxResInitFile_80053AC(&entity->spriteInfo, GetSpriteData(MONSTER_DECOY), entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); + AxResInitFile(&entity->spriteInfo, GetSpriteData(MONSTER_DECOY), entity->unk6A, entity->direction, sVar1, Rand32Bit() & 3, FALSE); entity->unk6E = 0; } diff --git a/src/sprite.c b/src/sprite.c index 48ddf797e..93e49bd8c 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -5,11 +5,11 @@ static EWRAM_DATA u16 sOAMSpriteCount = {0}; // 2025670 Written to but never read #ifndef NONMATCHING -UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite is done #endif static EWRAM_DATA s16 sUnknown_2025672[8] = {0}; #ifndef NONMATCHING -UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite is done #endif static EWRAM_DATA s16 sUnknown_2025682[9] = {0}; static EWRAM_DATA Position sUnknown_2025694 = {0}; @@ -30,11 +30,11 @@ static EWRAM_DATA_2 unkStruct_20266B0 *sUnknown_203B074 = {0}; extern void nullsub_3(s32, s32); #ifndef NONMATCHING -UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite is done #endif static void RegisterSpriteParts_80052BC(UnkSpriteMem *); -static void AxResInitUnoriented_800545C(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, bool8); +static void AxResInitUnoriented(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, bool8); void InitSprites(void) { @@ -156,7 +156,7 @@ void sub_8004E8C(unkStruct_2039DB0 *a0) // https://decomp.me/scratch/VYqKb // spriteMasks is a u16[6] #ifdef NONMATCHING -static void AddAxSprite_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) +static void AddAxSprite(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) { // size: 0xC struct UnkStackFor8004EA8 @@ -258,7 +258,7 @@ static void AddAxSprite_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 } #else NAKED -static void AddAxSprite_8004EA8(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) +static void AddAxSprite(ax_pose *a0, axdata1 *a1, UnkSpriteMem *a2, u16 *spriteMasks) { asm_unified( "push {r4-r7,lr}\n" @@ -829,7 +829,7 @@ static void RegisterSpriteParts_80052BC(UnkSpriteMem *a0) } } #else -UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite_8004EA8 is done +UNUSED // TODO: Remove the "UNUSED" attribute after AddAxSprite is done NAKED static void RegisterSpriteParts_80052BC(UnkSpriteMem *a0) { @@ -897,16 +897,16 @@ void sub_800533C(ax_pose **a0, UnkSpriteMem **a1, axdata1 *a2, u16 *spriteMasks, if (a4 != 0 && r4->sprite > -1) mem = a1[r4->sprite]; - AddAxSprite_8004EA8(r4, a2, mem, spriteMasks); + AddAxSprite(r4, a2, mem, spriteMasks); } } -void AxResInitFile_80053AC(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 a4, u32 spriteAnimIndex, bool8 a6) +void AxResInitFile(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 a4, u32 spriteAnimIndex, bool8 a6) { - AxResInit_80053D0(a0, (Dungeon_ax *)a1->data, a2, a3, a4, spriteAnimIndex, a6); + AxResInit(a0, (Dungeon_ax *)a1->data, a2, a3, a4, spriteAnimIndex, a6); } -void AxResInit_80053D0(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6) +void AxResInit(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 direction, u32 a4, u32 spriteAnimIndex, bool8 a6) { a0->unk0 = 0x8000; if (a6) @@ -929,12 +929,12 @@ void AxResInit_80053D0(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 directi a0->unk30 = a1->unk10; } -void AxResInitUnorientedFile_800543C(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) +void AxResInitUnorientedFile(EntitySpriteInfo *a0, OpenedFile *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) { - AxResInitUnoriented_800545C(a0, (Dungeon_ax *)a1->data, a2, a3, spriteAnimIndex, a5); + AxResInitUnoriented(a0, (Dungeon_ax *)a1->data, a2, a3, spriteAnimIndex, a5); } -static void AxResInitUnoriented_800545C(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) +static void AxResInitUnoriented(EntitySpriteInfo *a0, Dungeon_ax *a1, u32 a2, u32 a3, u32 spriteAnimIndex, bool8 a5) { a0->unk0 = 0x8000; if (a5) @@ -964,7 +964,7 @@ static inline s16 check_flag_for_80054BC(u16 flags) { } -void RunAxAnimationFrame_80054BC(struct axPokemon *a0) +void RunAxAnimationFrame(struct axPokemon *a0) { ax_anim *aData;