From e2b834d21d96332c5bcf788b390a09e285c7a5cb Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 3 Feb 2017 16:44:06 -0800 Subject: [PATCH] begin decompiling main.s --- asm/battle_anim.s | 2 +- asm/battle_anim_80FE840.s | 2 +- asm/battle_anim_8170478.s | 22 +- asm/battle_setup.s | 30 +-- asm/battle_transition.s | 2 +- asm/berry_blender.s | 14 +- asm/berry_tag_screen.s | 6 +- asm/cable_car.s | 22 +- asm/cable_club.s | 22 +- asm/clear_save_data_screen.s | 8 +- asm/clock.s | 2 +- asm/contest.s | 6 +- asm/contest_link_80F57C4.s | 2 +- asm/contest_painting.s | 14 +- asm/credits.s | 12 +- asm/crt0.s | 43 ++-- asm/daycare.s | 6 +- asm/decoration.s | 12 +- asm/diploma.s | 2 +- asm/easy_chat.s | 16 +- asm/egg_hatch.s | 4 +- asm/evolution_scene.s | 22 +- asm/field_effect.s | 4 +- asm/field_player_avatar.s | 4 +- asm/field_tasks.s | 4 +- asm/fldeff_teleport.s | 6 +- asm/hall_of_fame.s | 24 +- asm/intro.s | 6 +- asm/intro_credits_graphics.s | 4 +- asm/item_use.s | 4 +- asm/link.s | 146 ++++++------ asm/load_save.s | 6 +- asm/mail.s | 6 +- asm/main.s | 283 +++------------------- asm/main_menu.s | 12 +- asm/mauville_old_man.s | 8 +- asm/menu_helpers.s | 6 +- asm/mon_markings.s | 2 +- asm/mystery_event_menu.s | 30 +-- asm/naming_screen.s | 10 +- asm/option_menu.s | 34 +-- asm/play_time.s | 6 +- asm/player_pc.s | 10 +- asm/pokeblock_feed.s | 18 +- asm/pokedex.s | 110 ++++----- asm/pokedex_area_screen.s | 2 +- asm/pokemon_1.s | 12 +- asm/pokemon_3.s | 28 +-- asm/porthole.s | 2 +- asm/region_map.s | 8 +- asm/reset_rtc_screen.s | 10 +- asm/rom4.s | 16 +- asm/rom6.s | 40 ++-- asm/rom_8034C54.s | 156 ++++++------ asm/rom_8072304.s | 4 +- asm/rom_80C6FA0.s | 68 +++--- asm/rom_813C5BC.s | 8 +- asm/rom_8158B30.s | 32 +-- asm/rom_81700F8.s | 2 +- asm/rom_8184DA4.s | 208 ++++++++-------- asm/rom_81BAD84.s | 122 +++++----- asm/roulette.s | 16 +- asm/rtc.s | 6 +- asm/save.s | 14 +- asm/save_failed_screen.s | 10 +- asm/scrcmd.s | 2 +- asm/script_menu.s | 2 +- asm/script_pokemon_util_80F87D8.s | 6 +- asm/shop.s | 8 +- asm/slot_machine.s | 22 +- asm/sound.s | 18 +- asm/sprite.s | 8 +- asm/start_menu.s | 14 +- asm/starter_choose.s | 4 +- asm/text.s | 6 +- asm/title_screen.s | 20 +- asm/trade.s | 178 +++++++------- asm/trainer_card.s | 26 +- asm/tv.s | 62 ++--- asm/wallclock.s | 8 +- data/main.s | 31 --- include/main.h | 63 +++++ ld_script.txt | 5 +- src/main.c | 380 ++++++++++++++++++++++++++++++ sym_common.txt | 6 +- sym_ewram.txt | 2 +- 86 files changed, 1423 insertions(+), 1226 deletions(-) delete mode 100644 data/main.s create mode 100644 include/main.h create mode 100644 src/main.c diff --git a/asm/battle_anim.s b/asm/battle_anim.s index e5c27293e..e9333c6e5 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -2444,7 +2444,7 @@ ma13_goto: @ 80A4DCC thumb_func_start sub_80A4DF0 sub_80A4DF0: @ 80A4DF0 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index 9e6820215..47a689afa 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -50474,7 +50474,7 @@ _08118230: ands r2, r0 cmp r2, 0 beq _08118250 - ldr r0, =gUnknown_82E9530 + ldr r0, =gGameVersion ldrb r0, [r0] cmp r0, 0x2 beq _08118250 diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s index e5e958051..57d945cc3 100644 --- a/asm/battle_anim_8170478.s +++ b/asm/battle_anim_8170478.s @@ -3075,7 +3075,7 @@ sub_8171D98: @ 8171D98 thumb_func_start sub_8171E20 sub_8171E20: @ 8171E20 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -3185,7 +3185,7 @@ _08171EEC: adds r2, r0, 0 cmp r1, 0xF bne _08171F48 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r4, =0x00000439 adds r0, r4 ldrb r1, [r0] @@ -3367,7 +3367,7 @@ _0817206A: lsrs r7, r0, 24 cmp r7, 0x7 bls _0817200A - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -3485,7 +3485,7 @@ _0817216E: lsrs r7, r0, 24 cmp r7, 0x7 bls _0817210E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -3601,7 +3601,7 @@ _0817226E: lsrs r7, r0, 24 cmp r7, 0x7 bls _08172212 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -3721,7 +3721,7 @@ _08172376: lsrs r7, r0, 24 cmp r7, 0x9 bls _08172312 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -3862,7 +3862,7 @@ _0817248C: asrs r2, r0, 16 cmp r2, 0x2 bne _081724D6 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r4, =0x00000439 adds r0, r4 ldrb r1, [r0] @@ -4022,7 +4022,7 @@ _081725FE: lsrs r7, r0, 24 cmp r7, 0xB bls _081725A6 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -4208,7 +4208,7 @@ _08172790: mov r8, r0 cmp r0, 0x1 bls _08172700 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r2, =0x00000439 adds r0, r2 ldrb r1, [r0] @@ -4319,7 +4319,7 @@ _08172880: lsrs r7, r0, 24 cmp r7, 0x7 bls _0817282E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -4402,7 +4402,7 @@ _0817293C: sub_8172944: @ 8172944 push {r4-r7,lr} adds r7, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 4307a77d5..3002f1342 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -111,7 +111,7 @@ sub_80B06BC: @ 80B06BC bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0AF8 str r0, [r1, 0x8] ldr r4, =gBattleTypeFlags @@ -153,7 +153,7 @@ sub_80B072C: @ 80B072C bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0AF8 str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags @@ -182,7 +182,7 @@ sub_80B077C: @ 80B077C bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80FC190 str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags @@ -204,7 +204,7 @@ sub_80B07B4: @ 80B07B4 bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0AF8 str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags @@ -284,7 +284,7 @@ sub_80B086C: @ 80B086C movs r2, 0x5 bl sub_8067FF8 bl script_env_2_enable - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags @@ -303,7 +303,7 @@ sub_80B086C: @ 80B086C sub_80B08A8: @ 80B08A8 push {lr} bl script_env_2_enable - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags @@ -329,7 +329,7 @@ sub_80B08A8: @ 80B08A8 sub_80B08EC: @ 80B08EC push {lr} bl script_env_2_enable - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags @@ -356,7 +356,7 @@ sub_80B08EC: @ 80B08EC sub_80B0934: @ 80B0934 push {r4,lr} bl script_env_2_enable - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r4, =gBattleTypeFlags @@ -458,14 +458,14 @@ _080B09FE: sub_80B0A18: @ 80B0A18 push {lr} bl script_env_2_enable - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags movs r0, 0xC0 lsls r0, 6 str r0, [r1] - ldr r0, =gUnknown_82E9530 + ldr r0, =gGameVersion ldrb r0, [r0] cmp r0, 0x2 bne _080B0A50 @@ -495,7 +495,7 @@ _080B0A5A: sub_80B0A74: @ 80B0A74 push {lr} bl script_env_2_enable - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =gBattleTypeFlags @@ -1330,7 +1330,7 @@ sub_80B1138: @ 80B1138 push {lr} ldr r0, =set_256color_bg_bg0 bl SetMainCallback2 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B1158 str r0, [r1, 0x8] pop {r0} @@ -1383,7 +1383,7 @@ sub_80B11A8: @ 80B11A8 ldr r1, =gBattleTypeFlags movs r0, 0x10 str r0, [r1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B1204 str r0, [r1, 0x8] bl FreeAllWindowBuffers @@ -2195,7 +2195,7 @@ _080B18B8: ldr r1, =gUnknown_03006080 movs r0, 0 strh r0, [r1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B1918 str r0, [r1, 0x8] bl InBattlePyramid @@ -2311,7 +2311,7 @@ sub_80B19EC: @ 80B19EC ldr r1, =gBattleTypeFlags movs r0, 0x8 str r0, [r1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B1994 str r0, [r1, 0x8] bl task_add_01_battle_start_with_music_and_stats diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 613460c39..64b9e3260 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -10,7 +10,7 @@ sub_8145EF4: @ 8145EF4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, =sub_8085E50 str r1, [r2, 0x4] bl sub_8145F6C diff --git a/asm/berry_blender.s b/asm/berry_blender.s index c3711015c..16c04e024 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -3657,7 +3657,7 @@ _0808175A: ldrb r0, [r0, 0x13] cmp r0, 0x2 bne _080817A8 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -3672,7 +3672,7 @@ _0808175A: b _080817BA .pool _080817A8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -3758,7 +3758,7 @@ _0808185A: ldrb r0, [r0] cmp r0, 0 beq _0808187E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 lsls r0, 2 @@ -5367,7 +5367,7 @@ _08082558: ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r1, =gUnknown_03002700 + ldr r1, =gSoftResetDisabled movs r0, 0x1 strb r0, [r1] b _0808263C @@ -5456,7 +5456,7 @@ _0808261A: str r0, [r1] cmp r0, 0x5 ble _0808263C - ldr r1, =gUnknown_03002700 + ldr r1, =gSoftResetDisabled movs r0, 0 strb r0, [r1] movs r0, 0x1 @@ -7540,7 +7540,7 @@ _0808361A: b _08083898 .pool _08083790: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -8296,7 +8296,7 @@ _08083DC8: strb r0, [r2] b _08083E12 _08083DE2: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index 2b1a2e7d6..b1827de8b 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -80,7 +80,7 @@ _08177CAA: sub_8177CB0: @ 8177CB0 push {lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -202,7 +202,7 @@ _08177DC2: _08177DDA: strb r0, [r2, 0x8] _08177DDC: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1164,7 +1164,7 @@ sub_8178654: @ 8178654 ands r0, r1 cmp r0, 0 bne _081786A6 - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldrh r0, [r3, 0x30] movs r1, 0xF0 ands r1, r0 diff --git a/asm/cable_car.s b/asm/cable_car.s index 16eac4fb1..dfd5e5751 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -57,7 +57,7 @@ sub_814FCC8: @ 814FCC8 sub sp, 0x18 movs r4, 0 str r4, [sp, 0x14] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -156,7 +156,7 @@ _0814FD4E: ldr r0, =0x00004110 bl AllocZeroed str r0, [r4] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -186,7 +186,7 @@ _0814FDFC: lsrs r4, r0, 24 cmp r4, 0x13 bls _0814FDFC - bl sound_sources_off + bl InitMapMusic bl map_music_set_to_zero movs r0, 0 bl ResetBgsAndClearDma3BusyFlags @@ -219,7 +219,7 @@ _0814FDFC: movs r0, 0 strh r0, [r1] strh r0, [r2] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -282,7 +282,7 @@ _0814FE96: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -301,7 +301,7 @@ _0814FF5C: movs r1, 0 movs r2, 0x80 bl gpu_pal_apply - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -312,7 +312,7 @@ _0814FF5C: _0814FF7C: bl sub_8150D28 bl RunTasks - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -426,7 +426,7 @@ _0814FFF8: movs r2, 0 movs r3, 0x2 bl CopyToBgTilemapBufferRect_ChangePalette - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -539,7 +539,7 @@ _08150090: movs r2, 0x18 movs r3, 0x17 bl CopyToBgTilemapBufferRect_ChangePalette - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -561,7 +561,7 @@ _08150190: bl sub_80A3194 movs r0, 0x1 bl sub_8150B6C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -621,7 +621,7 @@ mainloop: @ 815023C bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably - bl sound_something + bl MapMusicMain pop {r0} bx r0 thumb_func_end mainloop diff --git a/asm/cable_club.s b/asm/cable_club.s index a1e99e9ea..079f51cb7 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -233,7 +233,7 @@ sub_80B252C: @ 80B252C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -276,7 +276,7 @@ sub_80B2578: @ 80B2578 movs r0, 0x1 bl sub_800B330 _080B258E: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -525,7 +525,7 @@ sub_80B275C: @ 80B275C adds r0, r4, 0 adds r1, r6, 0 bl sub_80B243C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -590,7 +590,7 @@ sub_80B2804: @ 80B2804 lsls r0, 24 cmp r4, r0 bne _080B2852 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x2 ands r0, r1 @@ -1874,7 +1874,7 @@ _080B3378: strh r0, [r1] ldr r0, =sub_8036760 bl SetMainCallback2 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B360C str r0, [r1, 0x8] adds r0, r5, 0 @@ -2047,7 +2047,7 @@ _080B3504: strh r0, [r1] ldr r0, =sub_8036760 bl SetMainCallback2 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B360C str r0, [r1, 0x8] adds r0, r4, 0 @@ -2062,7 +2062,7 @@ _080B3532: thumb_func_start sub_80B3554 sub_80B3554: @ 80B3554 push {r4,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -2109,7 +2109,7 @@ _080B35AC: cmp r4, 0 beq _080B35C8 _080B35B0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -2119,7 +2119,7 @@ _080B35B0: .pool _080B35C8: bl sub_800AC34 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -2218,12 +2218,12 @@ _080B36B2: bl InUnionRoom cmp r0, 0x1 bne _080B36CC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B3554 b _080B36D0 .pool _080B36CC: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =c2_8056854 _080B36D0: str r0, [r1, 0x8] diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 76c21278f..8d37f4d5a 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -158,7 +158,7 @@ sub_817ADF4: @ 817ADF4 sub_817AE00: @ 817AE00 push {r4,lr} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -301,7 +301,7 @@ _0817AEEC: bl EnableInterrupts ldr r0, =sub_817ADF4 bl SetVBlankCallback - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -335,7 +335,7 @@ _0817AFCA: sub_817AFD4: @ 817AFD4 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -364,7 +364,7 @@ _0817B008: cmp r0, 0 bne _0817B020 bl FreeAllWindowBuffers - bl Reset + bl DoSoftReset _0817B020: add sp, 0x4 pop {r4} diff --git a/asm/clock.s b/asm/clock.s index 21b7a18c2..fff679dfc 100644 --- a/asm/clock.s +++ b/asm/clock.s @@ -164,7 +164,7 @@ Special_StartWallClock: @ 809E8C8 push {lr} ldr r0, =Cb2_StartWallClock bl SetMainCallback2 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_809E8B4 str r0, [r1, 0x8] pop {r0} diff --git a/asm/contest.s b/asm/contest.s index d7440df0c..def1a558e 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -523,7 +523,7 @@ sub_80D7A5C: @ 80D7A5C thumb_func_start sub_80D7B24 sub_80D7B24: @ 80D7B24 push {r4-r6,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -1463,7 +1463,7 @@ sub_80D8424: @ 80D8424 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1677,7 +1677,7 @@ sub_80D8610: @ 80D8610 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0 - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldr r1, =gUnknown_02039E00 ldr r0, =gUnknown_02039F25 ldrb r0, [r0] diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index 3790a1da9..88bf2364b 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -1616,7 +1616,7 @@ sub_80F66B4: @ 80F66B4 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 diff --git a/asm/contest_painting.s b/asm/contest_painting.s index d44a87a1e..410fbb8ce 100644 --- a/asm/contest_painting.s +++ b/asm/contest_painting.s @@ -54,7 +54,7 @@ sub_812FDF8: @ 812FDF8 thumb_func_start sub_812FE0C sub_812FE0C: @ 812FE0C push {r4,r5,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 ldr r4, =gUnknown_030061C4 @@ -83,7 +83,7 @@ sub_812FE0C: @ 812FE0C sub_812FE58: @ 812FE58 push {r4-r7,lr} sub sp, 0x4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -117,7 +117,7 @@ _0812FE94: movs r0, 0x1 bl sub_8130238 bl sub_81301EC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -161,7 +161,7 @@ _0812FEE2: _0812FF14: ldrh r0, [r4, 0x20] bl SeedRng - bl InitKeypadData + bl InitKeys bl sub_8130098 movs r0, 0x87 lsls r0, 3 @@ -174,7 +174,7 @@ _0812FF2A: ldrb r1, [r1] bl sub_8130884 _0812FF36: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -265,7 +265,7 @@ _0812FFFA: b _08130080 .pool _0813001C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x2E] ands r1, r2 cmp r1, 0 @@ -961,7 +961,7 @@ sub_8130688: @ 8130688 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldr r1, =gUnknown_085B0830 ldr r2, [r1, 0x4] ldr r1, [r1] diff --git a/asm/credits.s b/asm/credits.s index 88c8739e4..0365a34d7 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -20,7 +20,7 @@ sub_81754DC: @ 81754DC push {lr} bl RunTasks bl CallObjectCallbacks - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x2 ands r0, r1 @@ -474,7 +474,7 @@ sub_81758E4: @ 81758E4 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r1, r0 @@ -556,7 +556,7 @@ _0817596E: bl LoadObjectPic ldr r0, =gUnknown_085E702C bl LoadTaggedObjectPalette - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -857,7 +857,7 @@ sub_8175C34: @ 8175C34 ldrsh r1, [r4, r0] cmp r1, 0 beq _08175C62 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] cmp r0, 0 beq _08175C94 @@ -2600,7 +2600,7 @@ sub_8176AB0: @ 8176AB0 lsrs r4, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -2756,7 +2756,7 @@ _08176C2C: adds r0, r6 ldr r1, =gUnknown_085E7010 str r1, [r0] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 diff --git a/asm/crt0.s b/asm/crt0.s index 65aa8ed4b..a65ae1b7e 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -41,9 +41,9 @@ Init: @ 8000204 msr cpsr_cf, r0 ldr sp, sp_sys ldr r1, =INTR_VECTOR - adr r0, InterruptMain + adr r0, IntrMain str r0, [r1] - ldr r1, =Main + 1 + ldr r1, =AgbMain + 1 mov lr, pc bx r1 b Init @@ -56,8 +56,8 @@ sp_irq: .word IWRAM_END - 0x60 .arm .align 2, 0 - .global InterruptMain -InterruptMain: @ 8000248 + .global IntrMain +IntrMain: @ 8000248 mov r3, REG_BASE add r3, r3, 0x200 ldr r2, [r3, OFFSET_REG_IE - 0x200] @@ -69,51 +69,50 @@ InterruptMain: @ 8000248 and r1, r2, r2, lsr 16 mov r12, 0 ands r0, r1, INTR_FLAG_VCOUNT - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 mov r0, 0x1 strh r0, [r3, OFFSET_REG_IME - 0x200] ands r0, r1, INTR_FLAG_SERIAL - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER3 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_HBLANK - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_VBLANK - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER0 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER1 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER2 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA0 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA1 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA2 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA3 - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_KEYPAD - bne InterruptMain_FoundIntr + bne IntrMain_FoundIntr add r12, r12, 0x4 ands r0, r1, INTR_FLAG_GAMEPAK strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200] -InterruptMain_Loop: - bne InterruptMain_Loop -InterruptMain_FoundIntr: + bne . @ spin +IntrMain_FoundIntr: strh r0, [r3, OFFSET_REG_IF - 0x200] bic r2, r2, r0 ldr r0, =gUnknown_03007868 @@ -133,9 +132,9 @@ InterruptMain_FoundIntr: add r1, r1, r12 ldr r0, [r1] stmdb sp!, {lr} - adr lr, InterruptMain_RetAddr + adr lr, IntrMain_RetAddr bx r0 -InterruptMain_RetAddr: +IntrMain_RetAddr: ldmia sp!, {lr} mrs r3, cpsr bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK diff --git a/asm/daycare.s b/asm/daycare.s index 48d7afcd9..b3cd33184 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -899,7 +899,7 @@ sub_8070114: @ 8070114 push {r4-r7,lr} adds r5, r0, 0 movs r6, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x24] bl SeedRng2 adds r0, r5, 0 @@ -3062,7 +3062,7 @@ c3_080469FC: @ 8071204 ldrb r0, [r4, 0x8] bl ListMenuHandleInput adds r1, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x2E] movs r0, 0x1 ands r0, r2 @@ -3182,7 +3182,7 @@ sub_80712C0: @ 80712C0 sub_8071330: @ 8071330 push {lr} bl sub_81B9328 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =c2_exit_to_overworld_2_switch str r0, [r1, 0x8] pop {r0} diff --git a/asm/decoration.s b/asm/decoration.s index b303106c7..56334c528 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -1991,7 +1991,7 @@ sub_8127A5C: @ 8127A5C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -4339,7 +4339,7 @@ _08128DAE: thumb_func_start sub_8128DB4 sub_8128DB4: @ 8128DB4 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2C] movs r1, 0xF0 ands r1, r0 @@ -4440,7 +4440,7 @@ _08128E76: b _08128FBA .pool _08128E88: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r7, 0xF0 adds r0, r7, 0 @@ -4582,7 +4582,7 @@ _08128F94: ldrsh r0, [r4, r1] cmp r0, 0 bne _08128FBA - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldrh r1, [r3, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -4644,7 +4644,7 @@ sub_8129020: @ 8129020 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -6247,7 +6247,7 @@ sub_8129D64: @ 8129D64 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 diff --git a/asm/diploma.s b/asm/diploma.s index c36fca270..e4ecf51af 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -196,7 +196,7 @@ sub_8177A50: @ 8177A50 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 026791117..512a82f5d 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -638,7 +638,7 @@ _0811A7D4: sub_811A7E4: @ 811A7E4 push {lr} bl fade_and_return_progress_probably - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -672,7 +672,7 @@ _0811A80E: b _0811A84E .pool _0811A840: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1084,7 +1084,7 @@ _0811AB64: thumb_func_start sub_811AB68 sub_811AB68: @ 811AB68 push {r4-r7,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1274,7 +1274,7 @@ _0811ACCC: thumb_func_start sub_811ACDC sub_811ACDC: @ 811ACDC push {r4-r6,lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1456,7 +1456,7 @@ _0811AE32: thumb_func_start sub_811AE44 sub_811AE44: @ 811AE44 push {lr} - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x2E] movs r0, 0x2 ands r0, r2 @@ -1557,7 +1557,7 @@ _0811AEFA: thumb_func_start sub_811AF00 sub_811AF00: @ 811AF00 push {lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 @@ -1769,7 +1769,7 @@ _0811B086: thumb_func_start sub_811B08C sub_811B08C: @ 811B08C push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1797,7 +1797,7 @@ _0811B0B8: thumb_func_start sub_811B0BC sub_811B0BC: @ 811B0BC push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 8b198e78f..c41fcdcc5 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -510,7 +510,7 @@ _08071788: c1_hatching_egg: @ 80717A0 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -696,7 +696,7 @@ _08071970: movs r0, 0x1 bl CopyBgTilemapBufferToVram _080719A6: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index b44a06c73..35fc5abf6 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -591,7 +591,7 @@ sub_813DF70: @ 813DF70 ldr r1, =gUnknown_020244EC adds r4, r2, r1 ldrh r6, [r0, 0xC] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r3, 0x87 lsls r3, 3 adds r0, r3 @@ -657,7 +657,7 @@ _0813E050: bl SetHBlankCallback ldr r0, =sub_813FD64 bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -679,7 +679,7 @@ _0813E07E: bl FillBgTilemapBufferRect movs r0, 0x1 bl CopyBgTilemapBufferToVram - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -745,7 +745,7 @@ _0813E0F0: movs r2, 0x20 orrs r0, r2 strb r0, [r1, 0x5] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -771,7 +771,7 @@ _0813E174: movs r2, 0 bl sub_80A2A20 _0813E180: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1204,7 +1204,7 @@ evovle_mon_maybe: @ 813E570 ldr r0, =gUnknown_020244EC adds r1, r0 mov r9, r1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] adds r5, r2, 0 adds r6, r0, 0 @@ -2104,7 +2104,7 @@ _0813EDEA: b _0813F1A4 .pool _0813EE34: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -2122,7 +2122,7 @@ _0813EE34: strb r0, [r4, 0x1] bl sub_8056B74 _0813EE5C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -2140,7 +2140,7 @@ _0813EE5C: strb r0, [r4, 0x1] bl sub_8056B74 _0813EE84: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -2188,7 +2188,7 @@ _0813EECC: movs r3, 0x10 bl pal_fade_maybe _0813EEF2: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -3406,7 +3406,7 @@ _0813FAA8: beq _0813FAB6 b _0813FCC4 _0813FAB6: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_813E3C0 cmp r1, r0 diff --git a/asm/field_effect.s b/asm/field_effect.s index cb549efed..ea7a3dadf 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -5325,7 +5325,7 @@ sub_80B8584: @ 80B8584 strh r0, [r4, 0x20] adds r0, r4, 0 adds r0, 0x22 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r1, [r1, 0xC] bl StoreWordInTwoHalfwords ldr r1, =0x0000f0f1 @@ -5734,7 +5734,7 @@ sub_80B88E4: @ 80B88E4 bl SetGpuReg adds r0, r4, 0 adds r0, 0x22 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r1, [r1, 0xC] bl StoreWordInTwoHalfwords ldr r0, =sub_80B8AE0 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 9f3e78cd4..ccac4a7b4 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -4238,7 +4238,7 @@ fish4: @ 808CA20 ldrh r0, [r4, 0xA] adds r1, r0, 0x1 strh r1, [r4, 0xA] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] movs r5, 0x1 adds r2, r5, 0 @@ -4445,7 +4445,7 @@ fish7: @ 808CBA4 b _0808CBEC .pool _0808CBDC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 diff --git a/asm/field_tasks.s b/asm/field_tasks.s index bee4df22d..7368eed85 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -39,7 +39,7 @@ sub_809D8B8: @ 809D8B8 beq _0809D8E8 b _0809D8FC _0809D8CA: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x20] movs r1, 0x80 lsls r1, 5 @@ -52,7 +52,7 @@ _0809D8CA: b _0809D8FA .pool _0809D8E8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x20] movs r1, 0x80 lsls r1, 5 diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s index 4648c2e51..bbca5095f 100644 --- a/asm/fldeff_teleport.s +++ b/asm/fldeff_teleport.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_817C8BC -sub_817C8BC: @ 817C8BC + thumb_func_start SetUpFieldMove_Teleport +SetUpFieldMove_Teleport: @ 817C8BC push {lr} ldr r0, =gUnknown_02037318 ldrb r0, [r0, 0x17] @@ -30,7 +30,7 @@ _0817C8E6: pop {r1} bx r1 .pool - thumb_func_end sub_817C8BC + thumb_func_end SetUpFieldMove_Teleport thumb_func_start hm_teleport_run_dp02scr hm_teleport_run_dp02scr: @ 817C8FC diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 58f1812d2..8fbf772c5 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -31,7 +31,7 @@ sub_8173560: @ 8173560 sub_817357C: @ 817357C push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -61,7 +61,7 @@ _081735B8: ldr r0, =0x00002014 bl AllocZeroed str r0, [r4] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -106,7 +106,7 @@ _08173620: movs r3, 0 bl pal_fade_maybe _08173642: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1265,7 +1265,7 @@ sub_8174028: @ 8174028 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1426,7 +1426,7 @@ sub_8174184: @ 8174184 thumb_func_start sub_8174194 sub_8174194: @ 8174194 push {r4,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -1455,7 +1455,7 @@ _081741D0: ldr r0, =0x00002014 bl AllocZeroed str r0, [r4] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -1465,7 +1465,7 @@ _081741D0: .pool _08174200: bl sub_8174F70 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -1482,7 +1482,7 @@ _08174214: movs r1, 0 bl SetGpuReg bl sub_8174FAC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r4, 0x87 lsls r4, 3 adds r1, r4 @@ -1505,7 +1505,7 @@ _08174240: bl sub_80F9BCC ldr r0, =sub_817354C bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r4, 0x87 lsls r4, 3 adds r1, r4 @@ -1520,7 +1520,7 @@ _08174280: lsls r0, 24 cmp r0, 0 bne _08174308 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -2046,7 +2046,7 @@ sub_8174728: @ 8174728 push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x2E] movs r0, 0x1 ands r0, r2 @@ -2363,7 +2363,7 @@ sub_8174A08: @ 8174A08 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 diff --git a/asm/intro.s b/asm/intro.s index c2459326a..a2bd92649 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -23,7 +23,7 @@ sub_816CC00: @ 816CC00 bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] cmp r0, 0 beq _0816CC3C @@ -114,7 +114,7 @@ SerialCb_CopyrightScreen: @ 816CCB8 do_copyright_screen: @ 816CCC8 push {r4-r6,lr} sub sp, 0x10 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r5, r0, r1 @@ -216,7 +216,7 @@ _0816CCF4: bl GameCubeMultiBoot_Init _0816CDBC: bl fade_and_return_progress_probably - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 diff --git a/asm/intro_credits_graphics.s b/asm/intro_credits_graphics.s index 2503767c9..9a933c66b 100644 --- a/asm/intro_credits_graphics.s +++ b/asm/intro_credits_graphics.s @@ -473,7 +473,7 @@ sub_817B540: @ 817B540 cmp r0, 0x2 beq _0817B5B8 _0817B554: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r2, [r0, 0x20] movs r0, 0x3 ands r0, r2 @@ -517,7 +517,7 @@ _0817B596: b _0817B620 .pool _0817B5B8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r2, [r0, 0x20] movs r0, 0x3 ands r0, r2 diff --git a/asm/item_use.s b/asm/item_use.s index e612f1cbb..a375da5a1 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -1938,7 +1938,7 @@ task08_0809AD8C: @ 80FDFBC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -2407,7 +2407,7 @@ sub_80FE408: @ 80FE408 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/link.s b/asm/link.s index d96bc6377..98052ec68 100644 --- a/asm/link.s +++ b/asm/link.s @@ -211,7 +211,7 @@ sub_8009570: @ 8009570 adds r0, r2, 0 strh r0, [r1] bl sub_8009734 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 @@ -294,10 +294,10 @@ sub_8009638: @ 8009638 ldr r0, =gUnknown_020229C6 ldrh r0, [r0] str r0, [r5, 0x14] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strh r0, [r5, 0x1A] - ldr r0, =gUnknown_82E9530 + ldr r0, =gGameVersion ldrb r0, [r0] movs r2, 0x80 lsls r2, 7 @@ -573,7 +573,7 @@ _080098CE: sub_8009900: @ 8009900 push {r4,r5,lr} sub sp, 0x4 - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1192,7 +1192,7 @@ _08009E38: _08009E4C: ldr r0, =gUnknown_03003110 strh r2, [r0] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r1, [r1, 0x2C] b _08009F04 .pool @@ -3423,14 +3423,14 @@ _0800AF8C: movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, =gUnknown_03002700 + ldr r1, =gSoftResetDisabled movs r0, 0 strb r0, [r1] ldr r0, =sub_8009404 movs r1, 0 bl CreateTask bl sub_80A2F30 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0 str r0, [r1] bl RunTasks @@ -3561,7 +3561,7 @@ sub_800B138: @ 800B138 sub_800B1A0: @ 800B1A0 push {r4,lr} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -3647,7 +3647,7 @@ _0800B244: movs r3, 0x14 bl box_print _0800B260: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 @@ -3682,9 +3682,9 @@ _0800B2A8: beq _0800B2C2 bl rfu_REQ_stopMode bl rfu_waitREQComplete - bl Reset + bl DoSoftReset _0800B2C2: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 @@ -9524,7 +9524,7 @@ sub_800E084: @ 800E084 lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeTiles - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain movs r0, 0x84 lsls r0, 3 adds r3, r0 @@ -9780,7 +9780,7 @@ _0800E2AC: adds r0, 0x1 strh r0, [r6, 0x34] _0800E2B2: - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain movs r1, 0x84 lsls r1, 3 adds r0, r4, r1 @@ -13026,7 +13026,7 @@ _0800FE00: .pool _0800FE14: strh r1, [r5] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2C] b _0800FE44 .pool @@ -14973,7 +14973,7 @@ sub_8010DB4: @ 8010DB4 ldrb r0, [r2, 0x2] cmp r0, 0 bne _08010E5C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8018438 cmp r1, r0 @@ -14990,7 +14990,7 @@ _08010DE4: ldr r4, =c2_800ACD4 adds r0, r4, 0 bl SetMainCallback2 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain str r4, [r0, 0x8] ldr r5, =gUnknown_03005000 ldrh r0, [r5, 0xA] @@ -16614,7 +16614,7 @@ sub_8011AFC: @ 8011AFC strh r0, [r1] bl sub_800B488 bl sub_8009734 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 @@ -18337,7 +18337,7 @@ _08012A6C: movs r1, 0x7 movs r2, 0xA bl sub_801320C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -18381,7 +18381,7 @@ _08012AA8: bl sub_8012240 cmp r0, 0 beq _08012ADE - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x8 ands r0, r1 @@ -19771,7 +19771,7 @@ _080136F2: ldrb r0, [r6, 0xE] bl ListMenuHandleInput adds r4, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -19825,7 +19825,7 @@ _08013768: bl audio_play b _08013B82 _08013770: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -20068,7 +20068,7 @@ _080139EC: beq _080139F8 b _08013B82 _080139F8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -20876,7 +20876,7 @@ _08014070: strb r7, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =c2_exit_to_overworld_2_switch str r0, [r1, 0x8] ldr r0, =sub_807AE50 @@ -20988,7 +20988,7 @@ _0801419E: thumb_func_start sub_80141A4 sub_80141A4: @ 80141A4 push {r4,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -21071,7 +21071,7 @@ sub_8014210: @ 8014210 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x18] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80B360C str r0, [r1, 0x8] ldr r0, =gBattleTypeFlags @@ -21196,7 +21196,7 @@ sub_8014304: @ 8014304 thumb_func_start sub_8014384 sub_8014384: @ 8014384 push {r4,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -21394,7 +21394,7 @@ _08014494: .4byte _080145D8 _080145D8: bl overworld_free_bg_tilemaps - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_801AC54 str r0, [r1, 0x8] movs r0, 0x3 @@ -21659,7 +21659,7 @@ _08014854: bl pokemon_getattr mov r2, r9 strh r0, [r2, 0x2] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain mov r1, r8 str r1, [r0, 0x8] movs r0, 0x4 @@ -22016,7 +22016,7 @@ _08014BFC: movs r1, 0x5 movs r2, 0x6 bl sub_801320C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -22551,7 +22551,7 @@ _080150D6: ldrb r0, [r7, 0xE] bl ListMenuHandleInput adds r2, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -22610,7 +22610,7 @@ _08015160: bl audio_play b _080152A0 _08015168: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -22972,7 +22972,7 @@ _080154B4: strb r0, [r5, 0x8] b _080154D4 _080154C0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -23536,7 +23536,7 @@ _08015A0A: bne _08015A1A bl _08016878 _08015A1A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -24310,7 +24310,7 @@ _08016178: bne _0801618A b _08016878 _0801618A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -26297,7 +26297,7 @@ _08017228: ldrb r0, [r3] bl ListMenuHandleInput mov r8, r0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] ands r4, r1 cmp r4, 0 @@ -26413,7 +26413,7 @@ _0801731C: ldrb r0, [r3] bl ListMenuHandleInput adds r1, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x2E] movs r0, 0x3 ands r0, r2 @@ -28605,7 +28605,7 @@ sub_8018450: @ 8018450 push {r4-r7,lr} sub sp, 0xC adds r7, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -29165,7 +29165,7 @@ _08018920: movs r2, 0x14 movs r3, 0x1 bl DrawDownArrow - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -29261,7 +29261,7 @@ sub_80189DC: @ 80189DC b _08018A14 _080189EC: bl sub_801898C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -29868,7 +29868,7 @@ _08018ED4: b _08018EEC .pool _08018EE0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -30750,7 +30750,7 @@ _0801963C: ldrb r0, [r5, 0xC] cmp r0, 0 bne _08019664 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -30769,7 +30769,7 @@ _0801965E: b _08019682 .pool _08019664: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] bl sub_801CCD0 cmp r0, 0 @@ -32979,7 +32979,7 @@ _0801A7DE: movs r1, 0x3 bl CopyWindowToVram _0801A7F8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -33550,7 +33550,7 @@ sub_801AC40: @ 801AC40 sub_801AC54: @ 801AC54 push {r4,lr} sub sp, 0xC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -33676,7 +33676,7 @@ _0801AD8C: bl sub_819789C ldr r0, =sub_801AC40 bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -33692,7 +33692,7 @@ _0801ADFC: bne _0801AE0E b _0801AFAE _0801AE0E: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -33708,7 +33708,7 @@ _0801AE24: bl pal_fade_maybe movs r0, 0 bl ShowBg - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -33742,7 +33742,7 @@ _0801AE7A: movs r0, 0 movs r2, 0x20 bl link_0800A448 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -33773,7 +33773,7 @@ _0801AEA6: movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -33790,7 +33790,7 @@ _0801AEE0: ldrh r0, [r0] cmp r0, 0x52 bne _0801AF0C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -33798,7 +33798,7 @@ _0801AEE0: b _0801AF16 .pool _0801AF0C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -33814,7 +33814,7 @@ _0801AF24: cmp r0, 0 bne _0801AFAE bl sub_800ADF8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -39749,7 +39749,7 @@ sub_801DE30: @ 801DE30 c2_081284E0: @ 801DE54 push {r4-r6,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -39978,7 +39978,7 @@ sub_801E030: @ 801E030 b _0801E118 .pool _0801E048: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x2E] movs r0, 0x8 ands r0, r2 @@ -40151,7 +40151,7 @@ _0801E17C: b _0801E1DC .pool _0801E1B4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -40971,7 +40971,7 @@ _0801E890: b _0801E966 .pool _0801E8A4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -41046,7 +41046,7 @@ _0801E934: b _0801E966 .pool _0801E94C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -41353,7 +41353,7 @@ sub_801EBD4: @ 801EBD4 thumb_func_start sub_801EBE4 sub_801EBE4: @ 801EBE4 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x30] movs r0, 0x40 ands r0, r2 @@ -48321,7 +48321,7 @@ _08022444: b _080224BA .pool _08022480: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -49490,7 +49490,7 @@ _08022DC0: strb r0, [r7, 0xC] b _08022E08 _08022DD8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] ands r4, r0 cmp r4, 0 @@ -50640,7 +50640,7 @@ sub_80236B8: @ 80236B8 mov r7, r8 push {r7} adds r5, r0, 0 - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldrh r1, [r3, 0x2E] movs r4, 0x1 adds r0, r4, 0 @@ -51900,7 +51900,7 @@ _0802409C: strb r0, [r1] b _0802412A _080240AE: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -53733,7 +53733,7 @@ sub_8024F38: @ 8024F38 ldrb r0, [r0] cmp r0, 0 bne _08024FEE - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -53819,7 +53819,7 @@ sub_8024FFC: @ 8024FFC ldrb r0, [r0] cmp r0, 0x9 bhi _080250C4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -58513,7 +58513,7 @@ sub_8027554: @ 8027554 ldrb r0, [r2] cmp r0, 0 bne _080275FC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x2E] movs r0, 0x40 ands r0, r2 @@ -59341,7 +59341,7 @@ _08027B94: bne _08027BE2 b _08027BBA _08027BA0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -63294,7 +63294,7 @@ _08029BB8: bhi _08029BD0 b _08029FF8 _08029BD0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -63410,7 +63410,7 @@ _08029CE0: bhi _08029CF8 b _08029FF8 _08029CF8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -63646,7 +63646,7 @@ _08029F5C: lsrs r0, 16 cmp r0, 0x1D bls _08029FF8 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -63959,7 +63959,7 @@ _0802A1DC: ldrb r0, [r0] movs r1, 0x3 bl CopyWindowToVram - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r5, 0x1 movs r2, 0x1 @@ -66741,7 +66741,7 @@ _0802B902: adds r0, 0x1 strh r0, [r1, 0xA] _0802B914: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -66958,7 +66958,7 @@ _0802BAD0: ldrh r0, [r1, 0x3C] adds r2, r0, 0x1 strh r2, [r1, 0x3C] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -72338,7 +72338,7 @@ _0802E4A8: bne _0802E4F6 b _0802E4CE _0802E4B4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/load_save.s b/asm/load_save.s index 7d1ea5efa..9bf3e44b2 100644 --- a/asm/load_save.s +++ b/asm/load_save.s @@ -13,14 +13,14 @@ CheckForFlashMemory: @ 8076B68 lsls r0, 16 cmp r0, 0 bne _08076B84 - ldr r1, =gUnknown_03005D88 + ldr r1, =gFlashMemoryPresent movs r0, 0x1 str r0, [r1] bl StartFlashMemoryTimer b _08076B8A .pool _08076B84: - ldr r1, =gUnknown_03005D88 + ldr r1, =gFlashMemoryPresent movs r0, 0 str r0, [r1] _08076B8A: @@ -102,7 +102,7 @@ saveblock_randomize_and_relocate: @ 8076C2C mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldr r0, [r5, 0xC] str r0, [sp] ldr r1, [r5, 0x10] diff --git a/asm/mail.s b/asm/mail.s index 9b407e854..94d5b81c0 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -167,7 +167,7 @@ _081215BA: sub_81215EC: @ 81215EC push {r4-r6,lr} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -574,7 +574,7 @@ _08121980: b _081219E4 .pool _081219D4: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -939,7 +939,7 @@ _08121CB2: sub_8121CC0: @ 8121CC0 push {lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/main.s b/asm/main.s index e7be46910..3d02e3869 100644 --- a/asm/main.s +++ b/asm/main.s @@ -5,223 +5,6 @@ .text - thumb_func_start Main -Main: @ 80003A4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r0, 0xFF - bl RegisterRamReset - movs r1, 0xA0 - lsls r1, 19 - ldr r2, =0x00007fff - adds r0, r2, 0 - strh r0, [r1] - bl InitGpuRegManager - ldr r1, =0x04000204 - ldr r3, =0x00004014 - adds r0, r3, 0 - strh r0, [r1] - bl InitKeypadData - bl InitIntrHandlers - bl m4aSoundInit - bl EnableVCountIntrAtLine150 - bl sub_800E6D0 - bl GameFreakRTC_Init - bl CheckForFlashMemory - bl InitVariablesAndSetCopyrightScreenCallback - bl sound_sources_off - bl ClearDma3Requests - bl ResetBgs - bl SetDefaultFontsPointer - ldr r0, =0x02000000 - movs r1, 0xE0 - lsls r1, 9 - bl InitHeap - ldr r0, =gUnknown_03002700 - movs r4, 0 - strb r4, [r0] - ldr r0, =gUnknown_03005D88 - ldr r0, [r0] - cmp r0, 0x1 - beq _08000414 - movs r0, 0 - bl SetMainCallback2 -_08000414: - ldr r2, =gUnknown_030022B4 - strb r4, [r2] - ldr r1, =gUnknown_03000000 - movs r3, 0xFC - lsls r3, 4 - adds r0, r3, 0 - strh r0, [r1] - ldr r7, =gUnknown_030022C0 - movs r0, 0 - mov r8, r0 - adds r6, r2, 0 -_0800042A: - bl ReadKeypad - ldr r0, =gUnknown_03002700 - ldrb r0, [r0] - cmp r0, 0 - bne _08000454 - ldrh r1, [r7, 0x28] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08000454 - movs r0, 0xE - ands r0, r1 - cmp r0, 0xE - bne _08000454 - bl rfu_REQ_stopMode - bl rfu_waitREQComplete - bl Reset -_08000454: - bl sub_8087634 - cmp r0, 0x1 - bne _0800048C - strb r0, [r6] - bl HandleLinkConnectionAndCallMainCallbacks - movs r0, 0 - strb r0, [r6] - b _080004B2 - .pool -_0800048C: - ldr r5, =gUnknown_030022B4 - movs r0, 0 - strb r0, [r5] - bl HandleLinkConnectionAndCallMainCallbacks - bl sub_80875C8 - adds r4, r0, 0 - cmp r4, 0x1 - bne _080004B2 - movs r0, 0 - strh r0, [r7, 0x2E] - bl ClearObjectCopyRequests - strb r4, [r5] - bl HandleLinkConnectionAndCallMainCallbacks - mov r2, r8 - strb r2, [r5] -_080004B2: - bl gametime_increment - bl sound_something - bl WaitForVBlankIntr - b _0800042A - .pool - thumb_func_end Main - - thumb_func_start HandleLinkConnectionAndCallMainCallbacks -@ void HandleLinkConnectionAndCallMainCallbacks() -HandleLinkConnectionAndCallMainCallbacks: @ 80004C4 - push {lr} - bl HandleLinkConnection - lsls r0, 24 - cmp r0, 0 - bne _080004D4 - bl CallMainCallbacks -_080004D4: - pop {r0} - bx r0 - thumb_func_end HandleLinkConnectionAndCallMainCallbacks - - thumb_func_start InitVariablesAndSetCopyrightScreenCallback -@ void InitVariablesAndSetCopyrightScreenCallback() -InitVariablesAndSetCopyrightScreenCallback: @ 80004D8 - push {lr} - ldr r2, =gUnknown_030022C0 - movs r0, 0 - str r0, [r2, 0x20] - ldr r1, =gUnknown_0203CF5C - str r0, [r1] - str r0, [r2, 0x24] - str r0, [r2] - ldr r0, =c2_copyright_1 - bl SetMainCallback2 - ldr r1, =gSaveBlock2Ptr - ldr r0, =gUnknown_02024A54 - str r0, [r1] - ldr r1, =gUnknown_03005D94 - ldr r0, =gUnknown_02029808 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end InitVariablesAndSetCopyrightScreenCallback - - thumb_func_start CallMainCallbacks -@ void CallMainCallbacks() -CallMainCallbacks: @ 800051C - push {r4,lr} - ldr r4, =gUnknown_030022C0 - ldr r0, [r4] - cmp r0, 0 - beq _0800052A - bl _call_via_r0 -_0800052A: - ldr r0, [r4, 0x4] - cmp r0, 0 - beq _08000534 - bl _call_via_r0 -_08000534: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end CallMainCallbacks - - thumb_func_start SetMainCallback2 -@ void SetMainCallback2(void ( *func)()) -SetMainCallback2: @ 8000540 - ldr r1, =gUnknown_030022C0 - str r0, [r1, 0x4] - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - movs r0, 0 - strb r0, [r1] - bx lr - .pool - thumb_func_end SetMainCallback2 - - thumb_func_start StartTimer1 -@ void StartTimer1() -StartTimer1: @ 8000554 - ldr r1, =0x04000106 - movs r0, 0x80 - strh r0, [r1] - bx lr - .pool - thumb_func_end StartTimer1 - - thumb_func_start SeedRngAndSetTrainerId -@ void SeedRngAndSetTrainerId() -SeedRngAndSetTrainerId: @ 8000560 - push {r4,lr} - ldr r0, =0x04000104 - ldrh r4, [r0] - adds r0, r4, 0 - bl SeedRng - ldr r1, =0x04000106 - movs r0, 0 - strh r0, [r1] - ldr r0, =gUnknown_02020000 - strh r4, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end SeedRngAndSetTrainerId - - thumb_func_start GetTrainerId -@ u16 GetTrainerId() -GetTrainerId: @ 8000588 - ldr r0, =gUnknown_02020000 - ldrh r0, [r0] - bx lr - .pool - thumb_func_end GetTrainerId - thumb_func_start EnableVCountIntrAtLine150 @ void EnableVCountIntrAtLine150() EnableVCountIntrAtLine150: @ 8000594 @@ -244,16 +27,16 @@ EnableVCountIntrAtLine150: @ 8000594 bx r0 thumb_func_end EnableVCountIntrAtLine150 - thumb_func_start InitKeypadData + thumb_func_start InitKeys @ void InitKeypadData() -InitKeypadData: @ 80005BC +InitKeys: @ 80005BC ldr r1, =gUnknown_030026FC movs r0, 0x5 strh r0, [r1] ldr r1, =gUnknown_030022B0 movs r0, 0x28 strh r0, [r1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0 strh r0, [r1, 0x2C] strh r0, [r1, 0x2E] @@ -262,11 +45,11 @@ InitKeypadData: @ 80005BC strh r0, [r1, 0x2A] bx lr .pool - thumb_func_end InitKeypadData + thumb_func_end InitKeys - thumb_func_start ReadKeypad + thumb_func_start ReadKeys @ void ReadKeypad() -ReadKeypad: @ 80005E4 +ReadKeys: @ 80005E4 push {lr} ldr r0, =0x04000130 ldrh r1, [r0] @@ -274,7 +57,7 @@ ReadKeypad: @ 80005E4 adds r0, r2, 0 adds r3, r0, 0 eors r3, r1 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x28] adds r0, r3, 0 bics r0, r2 @@ -341,15 +124,15 @@ _08000676: pop {r0} bx r0 .pool - thumb_func_end ReadKeypad + thumb_func_end ReadKeys thumb_func_start InitIntrHandlers @ void InitIntrHandlers() InitIntrHandlers: @ 8000684 push {r4,r5,lr} - ldr r5, =InterruptMain + ldr r5, =IntrMain ldr r4, =gUnknown_03002750 - ldr r3, =gRomInterruptTable + ldr r3, =gIntrTableTemplate ldr r2, =gUnknown_03002710 movs r1, 0xD _08000690: @@ -386,7 +169,7 @@ _08000690: thumb_func_start SetVBlankCallback @ void SetVBlankCallback(void ( *func)()) SetVBlankCallback: @ 80006F0 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain str r0, [r1, 0xC] bx lr .pool @@ -395,7 +178,7 @@ SetVBlankCallback: @ 80006F0 thumb_func_start SetHBlankCallback @ void SetHBlankCallback(void ( *func)()) SetHBlankCallback: @ 80006FC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain str r0, [r1, 0x10] bx lr .pool @@ -404,7 +187,7 @@ SetHBlankCallback: @ 80006FC thumb_func_start SetVCountCallback @ void SetVCountCallback(void ( *func)()) SetVCountCallback: @ 8000708 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain str r0, [r1, 0x14] bx lr .pool @@ -425,7 +208,7 @@ RestoreSerialTimer3IntrHandlers: @ 8000714 thumb_func_start SetSerialCallback @ void SetSerialCallback(void ( *func)()) SetSerialCallback: @ 800072C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain str r0, [r1, 0x18] bx lr .pool @@ -449,7 +232,7 @@ _0800074C: bne _08000758 bl sub_800B9B8 _08000758: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x20] adds r1, 0x1 str r1, [r0, 0x20] @@ -504,7 +287,7 @@ _080007BE: movs r1, 0x1 orrs r0, r1 strh r0, [r2] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x1C] ldrh r3, [r0, 0x1C] orrs r1, r2 @@ -531,7 +314,7 @@ StartFlashMemoryTimer: @ 8000800 @ void HBlankIntr() HBlankIntr: @ 8000814 push {r4,lr} - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldr r0, [r4, 0x10] cmp r0, 0 beq _08000822 @@ -556,7 +339,7 @@ _08000822: @ void VCountIntr() VCountIntr: @ 8000844 push {r4,lr} - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldr r0, [r4, 0x14] cmp r0, 0 beq _08000852 @@ -582,7 +365,7 @@ _08000852: @ void SerialIntr() SerialIntr: @ 8000878 push {r4,lr} - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldr r0, [r4, 0x18] cmp r0, 0 beq _08000886 @@ -603,17 +386,17 @@ _08000886: .pool thumb_func_end SerialIntr - thumb_func_start DummyIntrHandler -@ void DummyIntrHandler() -DummyIntrHandler: @ 80008A8 + thumb_func_start IntrDummy +@ void IntrDummy() +IntrDummy: @ 80008A8 bx lr - thumb_func_end DummyIntrHandler + thumb_func_end IntrDummy - thumb_func_start WaitForVBlankIntr + thumb_func_start WaitForVBlank @ void WaitForVBlankIntr() -WaitForVBlankIntr: @ 80008AC +WaitForVBlank: @ 80008AC push {lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x1C] ldr r0, =0x0000fffe ands r0, r1 @@ -635,7 +418,7 @@ _080008D0: pop {r0} bx r0 .pool - thumb_func_end WaitForVBlankIntr + thumb_func_end WaitForVBlank thumb_func_start sub_80008DC sub_80008DC: @ 80008DC @@ -654,9 +437,9 @@ sub_80008E8: @ 80008E8 .pool thumb_func_end sub_80008E8 - thumb_func_start Reset + thumb_func_start DoSoftReset @ void Reset() -Reset: @ 80008F4 +DoSoftReset: @ 80008F4 push {r4,lr} ldr r1, =0x04000208 movs r0, 0 @@ -700,10 +483,10 @@ Reset: @ 80008F4 pop {r0} bx r0 .pool - thumb_func_end Reset + thumb_func_end DoSoftReset - thumb_func_start sub_8000964 -sub_8000964: @ 8000964 + thumb_func_start ClearPokemonCrySongs +ClearPokemonCrySongs: @ 8000964 push {lr} sub sp, 0x4 mov r1, sp @@ -717,6 +500,6 @@ sub_8000964: @ 8000964 pop {r0} bx r0 .pool - thumb_func_end sub_8000964 + thumb_func_end ClearPokemonCrySongs .align 2, 0 @ Don't pad with nop. diff --git a/asm/main_menu.s b/asm/main_menu.s index dd7bb3d41..f91017929 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -421,7 +421,7 @@ Task_WaitForSaveFileErrorWindow: @ 802FA5C lsls r0, 16 cmp r0, 0 bne _0802FA98 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -523,7 +523,7 @@ Task_WaitForBatteryDryErrorWindow: @ 802FB50 lsls r0, 16 cmp r0, 0 bne _0802FB8C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1078,7 +1078,7 @@ HandleMainMenuInput: @ 80300E0 lsls r4, r1, 3 ldr r7, =gTasks + 0x8 adds r5, r4, r7 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x2E] movs r0, 0x1 ands r0, r2 @@ -1484,7 +1484,7 @@ _08030444: b _0803048A .pool _08030460: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =CB2_ReinitMainMenu str r1, [r0, 0x8] ldr r0, =CB2_OptionsMenu @@ -1714,7 +1714,7 @@ _08030658: strh r0, [r4, 0xA] b _08030688 _08030664: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] ands r1, r0 cmp r1, 0 @@ -2878,7 +2878,7 @@ task_new_game_prof_birch_speech_16: @ 8031040 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index b943c2e13..213a24e2b 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -17,7 +17,7 @@ sub_81200A0: @ 81200A0 ldr r3, =0x00002e51 adds r0, r2, r3 strb r1, [r0] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r1, [r0] adds r3, 0x1 adds r0, r2, r3 @@ -53,7 +53,7 @@ sub_81200F8: @ 81200F8 movs r0, 0x1 strb r0, [r1] strb r2, [r1, 0x1] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r1, 0x2] bx lr @@ -78,7 +78,7 @@ sub_8120128: @ 8120128 movs r0, 0x4 strb r0, [r2] strb r3, [r2, 0x1] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] ldr r2, =0x00002e48 adds r1, r2 @@ -2016,7 +2016,7 @@ sub_8120FDC: @ 8120FDC ldr r0, [r1] adds r0, 0x34 add r0, r8 - ldr r1, =gUnknown_82E9531 + ldr r1, =gGameLanguage ldrb r1, [r1] strb r1, [r0] pop {r3,r4} diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index d936c5085..32ed2997e 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -326,7 +326,7 @@ AdjustQuantityAccordingToDPadInput: @ 8122034 adds r5, r1, 0 ldrh r4, [r2] adds r6, r4, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x30] movs r3, 0xF0 ands r3, r0 @@ -414,7 +414,7 @@ GetLRKeysState: @ 81220D0 ldrb r0, [r0, 0x13] cmp r0, 0x1 bne _08122106 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 lsls r0, 2 @@ -447,7 +447,7 @@ sub_812210C: @ 812210C ldrb r0, [r0, 0x13] cmp r0, 0x1 bne _08122142 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0x80 lsls r0, 2 diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 1082d7a86..0270a71a6 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -337,7 +337,7 @@ _0811FB9A: thumb_func_start sub_811FBA4 sub_811FBA4: @ 811FBA4 push {r4,r5,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index 865c27288..66e05b8ee 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -140,7 +140,7 @@ _08178A66: sub_8178A78: @ 8178A78 push {r4-r6,lr} sub sp, 0x8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -211,7 +211,7 @@ _08178B20: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -225,7 +225,7 @@ _08178B48: beq _08178B56 b _08178E58 _08178B56: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -263,7 +263,7 @@ _08178B98: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -287,7 +287,7 @@ _08178BDC: lsrs r2, r0, 24 cmp r2, 0x2 bne _08178CD0 - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -362,7 +362,7 @@ _08178C68: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -396,7 +396,7 @@ _08178CD0: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -406,7 +406,7 @@ _08178CF2: b _08178E58 .pool _08178D00: - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x2 ands r0, r1 @@ -442,7 +442,7 @@ _08178D38: b _08178E58 _08178D44: bl sub_800A5B4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -455,7 +455,7 @@ _08178D58: b _08178E3C _08178D60: bl sub_800AC34 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -495,7 +495,7 @@ _08178DBC: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -508,7 +508,7 @@ _08178DE0: lsrs r2, r0, 16 cmp r2, 0 bne _08178E58 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -541,7 +541,7 @@ _08178E24: _08178E30: bl pal_fade_maybe _08178E34: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -558,7 +558,7 @@ _08178E48: ands r0, r1 cmp r0, 0 bne _08178E58 - bl Reset + bl DoSoftReset _08178E58: ldr r0, =gUnknown_030030E0 ldr r0, [r0] @@ -582,7 +582,7 @@ _08178E58: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 diff --git a/asm/naming_screen.s b/asm/naming_screen.s index c5cd6fa7b..6585a4f43 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -70,7 +70,7 @@ _080E2DE2: thumb_func_start c2_choose_name_or_words_screen c2_choose_name_or_words_screen: @ 80E2E04 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -121,7 +121,7 @@ _080E2E7A: bl fade_and_return_progress_probably bl sub_80E501C _080E2E86: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -939,7 +939,7 @@ sub_80E3604: @ 80E3604 lsls r0, 16 cmp r0, 0 bne _080E362E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -2992,7 +2992,7 @@ sub_80E4692: @ 80E4692 adds r2, r0, 0 movs r0, 0 strh r0, [r2, 0xA] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -3079,7 +3079,7 @@ sub_80E46F0: @ 80E46F0 adds r0, r4, 0 adds r1, r5, 0 bl sub_80E3DFC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x30] movs r0, 0x40 ands r0, r2 diff --git a/asm/option_menu.s b/asm/option_menu.s index da3a80bb8..aaa44b485 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -32,7 +32,7 @@ CB2_OptionsMenu: @ 80BA4DC mov r7, r8 push {r7} sub sp, 0xC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -63,7 +63,7 @@ _080BA508: _080BA538: movs r0, 0 bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -213,7 +213,7 @@ _080BA69C: bl remove_some_task bl ResetTasks bl ResetAllObjectData - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -248,7 +248,7 @@ _080BA6E0: movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -265,7 +265,7 @@ _080BA728: movs r0, 0 bl PutWindowTilemap bl sub_80BB0D0 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -280,7 +280,7 @@ _080BA748: movs r0, 0x1 bl PutWindowTilemap bl sub_80BB104 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -289,7 +289,7 @@ _080BA748: strb r0, [r1] _080BA760: bl sub_80BB154 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -348,7 +348,7 @@ _080BA774: movs r1, 0x3 bl CopyWindowToVram _080BA7EC: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -409,7 +409,7 @@ sub_80BA86C: @ 80BA86C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -742,7 +742,7 @@ sub_80BAB08: @ 80BAB08 adds r0, r2, 0 bl DestroyTask bl FreeAllWindowBuffers - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _080BAB2C: @@ -845,7 +845,7 @@ sub_80BABDC: @ 80BABDC push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 @@ -970,7 +970,7 @@ sub_80BACE0: @ 80BACE0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -1031,7 +1031,7 @@ sub_80BAD5C: @ 80BAD5C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -1092,7 +1092,7 @@ sub_80BADD8: @ 80BADD8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -1156,7 +1156,7 @@ sub_80BAE5C: @ 80BAE5C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 @@ -1191,7 +1191,7 @@ _080BAE82: movs r0, 0x1 strb r0, [r1] _080BAEAE: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x20 ands r0, r1 @@ -1333,7 +1333,7 @@ sub_80BAFCC: @ 80BAFCC push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 diff --git a/asm/play_time.s b/asm/play_time.s index 3502cbca0..8dc5aa53f 100644 --- a/asm/play_time.s +++ b/asm/play_time.s @@ -52,8 +52,8 @@ sub_8084230: @ 8084230 .pool thumb_func_end sub_8084230 - thumb_func_start gametime_increment -gametime_increment: @ 808423C + thumb_func_start PlayTimeCounter_Update +PlayTimeCounter_Update: @ 808423C push {lr} ldr r0, =gUnknown_03000E08 ldrb r0, [r0] @@ -101,7 +101,7 @@ _08084294: pop {r0} bx r0 .pool - thumb_func_end gametime_increment + thumb_func_end PlayTimeCounter_Update thumb_func_start set_max_playtime set_max_playtime: @ 80842A4 diff --git a/asm/player_pc.s b/asm/player_pc.s index 6e82c0081..e90ec1d95 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -2466,7 +2466,7 @@ sub_816C30C: @ 816C30C lsls r0, 3 ldr r1, =gTasks + 0x8 adds r4, r0, r1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -2682,7 +2682,7 @@ sub_816C4FC: @ 816C4FC lsls r0, 3 ldr r1, =gTasks + 0x8 adds r4, r0, r1 - ldr r7, =gUnknown_030022C0 + ldr r7, =gMain ldrh r1, [r7, 0x2E] movs r0, 0x4 ands r0, r1 @@ -3066,7 +3066,7 @@ sub_816C818: @ 816C818 b _0816C8EC .pool _0816C888: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -3342,7 +3342,7 @@ sub_816CB04: @ 816CB04 lsls r0, 3 ldr r1, =gTasks + 0x8 adds r5, r0, r1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -3384,7 +3384,7 @@ sub_816CB74: @ 816CB74 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s index 5842d18b8..dfcca703c 100644 --- a/asm/pokeblock_feed.s +++ b/asm/pokeblock_feed.s @@ -31,7 +31,7 @@ sub_8179B84: @ 8179B84 sub_8179B98: @ 8179B98 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -69,7 +69,7 @@ _08179BF8: str r0, [r4] bl SetVBlankHBlankCallbacksToNull bl clear_scheduled_bg_copies_to_vram - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -85,7 +85,7 @@ _08179C20: .pool _08179C34: bl ResetAllObjectData - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -96,7 +96,7 @@ _08179C48: b _08179D32 _08179C4E: bl init_uns_table_pokemon_copy - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -107,7 +107,7 @@ _08179C60: b _08179D32 _08179C66: bl sub_8179FAC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -156,7 +156,7 @@ _08179CDC: movs r2, 0x1 movs r3, 0xE bl SetWindowBorderStyle - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -171,7 +171,7 @@ _08179CFE: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -192,7 +192,7 @@ _08179D18: _08179D30: strb r0, [r2, 0x8] _08179D32: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -788,7 +788,7 @@ sub_817A2C0: @ 817A2C0 movs r2, 0x80 lsls r2, 1 bl m4aMPlayVolumeControl - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 adds r0, r4, 0 diff --git a/asm/pokedex.s b/asm/pokedex.s index 21212a4af..d5df5301e 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -288,7 +288,7 @@ sub_80BB534: @ 80BB534 mov r7, r8 push {r7} sub sp, 0x8 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -370,7 +370,7 @@ _080BB582: orrs r3, r0 str r3, [r2, 0x8] ldr r0, [r2, 0x8] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -472,7 +472,7 @@ _080BB6E4: adds r0, r1 movs r1, 0x8 strb r1, [r0] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -584,7 +584,7 @@ sub_80BB7D4: @ 80BB7D4 b _080BBA06 .pool _080BB810: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 mov r9, r0 @@ -857,7 +857,7 @@ sub_80BBA78: @ 80BBA78 b _080BBBE8 .pool _080BBAB0: - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 @@ -933,7 +933,7 @@ _080BBB34: movs r0, 0x3 bl audio_play _080BBB58: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0xA ands r0, r1 @@ -1317,7 +1317,7 @@ sub_80BBEB8: @ 80BBEB8 b _080BC08A .pool _080BBEEC: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r7, 0x1 adds r0, r7, 0 @@ -1553,7 +1553,7 @@ sub_80BC0F8: @ 80BC0F8 b _080BC2C8 .pool _080BC130: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1617,7 +1617,7 @@ _080BC1B2: movs r1, 0xE bl sub_80BD2B4 _080BC1C2: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x8 orrs r0, r1 @@ -1661,7 +1661,7 @@ _080BC214: movs r0, 0x3 bl audio_play _080BC238: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0xA ands r0, r1 @@ -1977,7 +1977,7 @@ sub_80BC514: @ 80BC514 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -2127,7 +2127,7 @@ _080BC682: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -2203,7 +2203,7 @@ _080BC768: bl pal_fade_maybe ldr r0, =sub_80BB370 bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -2249,7 +2249,7 @@ _080BC790: movs r0, 0x3 bl ShowBg _080BC7F8: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -4018,7 +4018,7 @@ sub_80BD69C: @ 80BD69C lsrs r4, r1, 16 movs r0, 0 mov r10, r0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -4305,7 +4305,7 @@ sub_80BD930: @ 80BD930 ldr r1, =0x0000060e adds r0, r1 ldrh r4, [r0] - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x40 ands r0, r1 @@ -6291,7 +6291,7 @@ sub_80BEA24: @ 80BEA24 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -6397,7 +6397,7 @@ _080BEAF0: movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -6420,7 +6420,7 @@ _080BEB50: lsls r0, 31 lsrs r0, 31 bl sub_80BC844 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -6468,7 +6468,7 @@ _080BEBD0: bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -6505,7 +6505,7 @@ _080BEC08: ands r0, r2 strb r0, [r1, 0x5] _080BEC44: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -6575,7 +6575,7 @@ _080BECBC: bl ShowBg movs r0, 0x3 bl ShowBg - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -6626,7 +6626,7 @@ _080BED5E: cmp r0, 0 bne _080BEDA0 _080BED68: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -6724,7 +6724,7 @@ sub_80BEDF4: @ 80BEDF4 b _080BEFBA .pool _080BEE34: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x2E] movs r0, 0x2 ands r0, r2 @@ -7018,7 +7018,7 @@ sub_80BF0AC: @ 80BF0AC push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain movs r0, 0x87 lsls r0, 3 adds r7, r2, r0 @@ -7192,7 +7192,7 @@ sub_80BF250: @ 80BF250 sub sp, 0x14 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -7237,7 +7237,7 @@ _080BF2B6: movs r1, 0x6 strb r1, [r0] ldr r1, =gUnknown_030060B4 - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldr r0, [r4, 0xC] str r0, [r1] movs r0, 0 @@ -7279,7 +7279,7 @@ _080BF310: bl PutWindowTilemap movs r0, 0x2 bl PutWindowTilemap - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -7303,7 +7303,7 @@ _080BF360: .pool _080BF38C: bl sub_80A1A74 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7321,7 +7321,7 @@ _080BF3A0: movs r2, 0x52 movs r3, 0x31 bl sub_80C0B44 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -7394,7 +7394,7 @@ _080BF41C: bne _080BF462 b _080BF5B2 _080BF462: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7431,7 +7431,7 @@ _080BF498: lsls r0, 24 cmp r0, 0 beq _080BF4D8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -7466,7 +7466,7 @@ _080BF514: ldr r0, =gUnknown_030060B4 ldr r0, [r0] bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r4, 0x87 lsls r4, 3 adds r1, r4 @@ -7495,7 +7495,7 @@ _080BF540: movs r0, 0x3 bl ShowBg _080BF57A: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -7550,7 +7550,7 @@ _080BF5EC: movs r0, 0 bl sub_80BF7FC _080BF5F2: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x2E] movs r0, 0x1 ands r0, r2 @@ -7794,7 +7794,7 @@ sub_80BF82C: @ 80BF82C sub sp, 0x44 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -7910,7 +7910,7 @@ _080BF93C: add r0, sp, 0x4 movs r2, 0x79 bl sub_80BE8DC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -7986,7 +7986,7 @@ _080BF982: lsls r0, 3 adds r0, r1 strh r6, [r0, 0x12] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8077,7 +8077,7 @@ _080BFAE8: ldr r0, =gUnknown_030060B4 ldr r0, [r0] bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8106,7 +8106,7 @@ _080BFB14: movs r0, 0x3 bl ShowBg _080BFB4E: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -8156,7 +8156,7 @@ sub_80BFBB0: @ 80BFBB0 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -8504,7 +8504,7 @@ _080BFE84: b _080C0074 _080BFE92: ldr r1, =gUnknown_030060B4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0xC] str r0, [r1] movs r0, 0 @@ -8707,7 +8707,7 @@ sub_80C0088: @ 80C0088 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -11062,7 +11062,7 @@ sub_80C12E0: @ 80C12E0 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -11163,7 +11163,7 @@ _080C13F0: movs r1, 0x1 movs r2, 0x7E bl gpu_pal_apply - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -11219,7 +11219,7 @@ _080C1480: movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -11248,7 +11248,7 @@ _080C14A0: movs r0, 0x3 bl ShowBg _080C14DA: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -11351,7 +11351,7 @@ sub_80C15B0: @ 80C15B0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -11442,7 +11442,7 @@ _080C1640: movs r0, 0x3 bl CopyBgTilemapBufferToVram _080C167C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 @@ -11534,7 +11534,7 @@ _080C1740: bne _080C174C ldr r6, =gUnknown_0856EDD4 _080C174C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -11677,7 +11677,7 @@ _080C1870: movs r0, 0x3 bl CopyBgTilemapBufferToVram _080C18B6: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 @@ -11711,7 +11711,7 @@ _080C18B6: movs r0, 0x3 bl CopyBgTilemapBufferToVram _080C1900: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -11745,7 +11745,7 @@ _080C1900: movs r0, 0x3 bl CopyBgTilemapBufferToVram _080C194A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -11913,7 +11913,7 @@ sub_80C1AB8: @ 80C1AB8 lsls r0, 24 lsrs r4, r0, 24 adds r2, r4, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -12052,7 +12052,7 @@ sub_80C1BCC: @ 80C1BCC subs r0, 0x1 lsls r0, 16 lsrs r2, r0, 16 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain mov r12, r0 ldrh r1, [r0, 0x2E] movs r0, 0x1 diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 851ca44f4..7dfc1778b 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1451,7 +1451,7 @@ _0813D5E2: b _0813D698 .pool _0813D5F8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x2E] movs r3, 0x2 adds r0, r3, 0 diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s index 762762b88..bd5ed49e1 100644 --- a/asm/pokemon_1.s +++ b/asm/pokemon_1.s @@ -297,7 +297,7 @@ _08067C8A: movs r1, 0x2 mov r2, sp bl pokemon_setattr_encrypted - ldr r2, =gUnknown_82E9531 + ldr r2, =gGameLanguage adds r0, r7, 0 movs r1, 0x3 bl pokemon_setattr_encrypted @@ -354,7 +354,7 @@ _08067C8A: movs r1, 0x24 add r2, sp, 0x10 bl pokemon_setattr_encrypted - ldr r2, =gUnknown_82E9530 + ldr r2, =gGameVersion adds r0, r7, 0 movs r1, 0x25 bl pokemon_setattr_encrypted @@ -1791,7 +1791,7 @@ _0806892C: ands r0, r1 cmp r0, 0 beq _080689CE - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -1808,7 +1808,7 @@ _08068958: ands r0, r1 cmp r0, 0 beq _080689CE - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -1832,7 +1832,7 @@ _08068990: ands r0, r3 cmp r0, 0 beq _080689E4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -1861,7 +1861,7 @@ _080689CE: b _08068A02 .pool _080689E4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index e000d3427..3f957cc94 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -67,7 +67,7 @@ ExecuteTableBasedItemEffect: @ 806BD28 lsrs r0, 16 cmp r0, 0xAF bne _0806BDBC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -103,7 +103,7 @@ _0806BDC4: ldr r0, =gUnknown_020244B8 ldrb r2, [r0] strb r2, [r1] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r3, =0x00000439 adds r0, r3 ldrb r1, [r0] @@ -191,7 +191,7 @@ _0806BE94: cmp r1, 0xAF bne _0806BEF6 _0806BE9A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r2, =0x00000439 adds r0, r2 ldrb r1, [r0] @@ -261,7 +261,7 @@ _0806BF2C: adds r6, r2, 0 cmp r0, 0 beq _0806BF76 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r5, =0x00000439 adds r0, r5 ldrb r1, [r0] @@ -677,7 +677,7 @@ _0806C286: bne _0806C294 bl _0806CD4C _0806C294: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r5, =0x00000439 adds r0, r5 ldrb r1, [r0] @@ -952,7 +952,7 @@ _0806C4DC: lsls r0, 24 b _0806C83E _0806C4FC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r2, =0x00000439 adds r0, r2 ldrb r1, [r0] @@ -1112,7 +1112,7 @@ _0806C65E: movs r1, 0x39 mov r2, sp bl pokemon_setattr - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -1275,7 +1275,7 @@ _0806C7CC: mov r1, r9 mov r2, sp bl pokemon_setattr - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -1426,7 +1426,7 @@ _0806C914: adds r1, r6, 0 mov r2, sp bl pokemon_setattr - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -1986,7 +1986,7 @@ HealStatusConditions: @ 806CD6C movs r1, 0x37 mov r2, sp bl pokemon_setattr - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -2232,7 +2232,7 @@ sub_806CF78: @ 806CF78 lsrs r0, 16 cmp r0, 0xAF bne _0806CFCC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -3541,7 +3541,7 @@ _0806D94A: lsrs r0, 16 cmp r0, 0xAF bne _0806D9A0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -3847,7 +3847,7 @@ _0806DBC8: lsrs r0, 16 cmp r0, 0xAF bne _0806DC14 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -6519,7 +6519,7 @@ _0806F0F8: thumb_func_start sub_806F104 sub_806F104: @ 806F104 push {lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] diff --git a/asm/porthole.s b/asm/porthole.s index d2889abad..50a92d71c 100644 --- a/asm/porthole.s +++ b/asm/porthole.s @@ -92,7 +92,7 @@ _080FB62E: b _080FB6E2 .pool _080FB648: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] adds r0, r2, 0 ands r0, r1 diff --git a/asm/region_map.s b/asm/region_map.s index ece8d17f6..45a8d6a16 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -481,7 +481,7 @@ sub_81230C4: @ 81230C4 ldr r0, [r2] adds r0, 0x7C strb r4, [r0] - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldrh r1, [r3, 0x2C] movs r0, 0x40 ands r0, r1 @@ -692,7 +692,7 @@ sub_8123254: @ 8123254 mov r5, r12 adds r5, 0x68 strh r4, [r5] - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -3308,7 +3308,7 @@ _0812468C: sub_8124690: @ 8124690 push {r4,lr} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -3498,7 +3498,7 @@ _0812486C: ldr r0, =sub_81248D4 bl SetMainCallback2 _0812489C: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index 11b345d6f..6e0d72f1b 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -657,7 +657,7 @@ sub_809EDE8: @ 809EDE8 lsls r0, 2 ldr r1, =gUnknown_0851041C adds r2, r0, r1 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r3, [r1, 0x2E] movs r0, 0x2 ands r0, r3 @@ -1073,7 +1073,7 @@ _0809F11C: adds r0, 0x1 strh r0, [r6] _0809F1B2: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -1081,7 +1081,7 @@ _0809F1B2: beq _0809F1E4 adds r0, r7, 0 bl DestroyTask - bl Reset + bl DoSoftReset b _0809F1F8 .pool _0809F1E4: @@ -1289,7 +1289,7 @@ _0809F3C4: movs r0, 0x5 strh r0, [r5] _0809F3C8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1315,7 +1315,7 @@ _0809F3EA: adds r0, r4, 0 bl DestroyTask bl FreeAllWindowBuffers - bl Reset + bl DoSoftReset _0809F404: add sp, 0x4 pop {r4,r5} diff --git a/asm/rom4.s b/asm/rom4.s index 1b4829c12..bb941093b 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -2981,7 +2981,7 @@ ResetSafariZoneFlag_: @ 8085D80 @ _BOOL4 is_c1_link_related_active() is_c1_link_related_active: @ 8085D8C push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0] ldr r0, =c1_link_related cmp r1, r0 @@ -3041,7 +3041,7 @@ _08085DFA: thumb_func_start c1_overworld c1_overworld: @ 8085E04 push {lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, [r2, 0x4] ldr r0, =c2_overworld cmp r1, r0 @@ -3105,7 +3105,7 @@ _08085E7C: thumb_func_start set_callback1 set_callback1: @ 8085E88 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain str r0, [r1] bx lr .pool @@ -3196,7 +3196,7 @@ CB2_NewGame: @ 8085EF8 c2_whiteout: @ 8085F58 push {lr} sub sp, 0x4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -3244,7 +3244,7 @@ c2_load_new_map: @ 8085FCC bl set_callback1 ldr r0, =c2_change_map bl SetMainCallback2 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =c2_load_new_map_2 str r0, [r1, 0x8] pop {r0} @@ -3270,7 +3270,7 @@ c2_load_new_map_2: @ 8085FFC thumb_func_start sub_8086024 sub_8086024: @ 8086024 push {r4,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -5064,7 +5064,7 @@ _08086FFC: thumb_func_start sub_808700C sub_808700C: @ 808700C push {lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -5284,7 +5284,7 @@ sub_8087170: @ 8087170 ldrb r0, [r0] cmp r0, 0x82 bne _080871A0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 diff --git a/asm/rom6.s b/asm/rom6.s index 938c1d618..b4701f5eb 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -616,7 +616,7 @@ _08135972: sub_8135978: @ 8135978 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -658,7 +658,7 @@ _081359EC: b _08135B9E _081359F6: bl remove_some_task - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -674,7 +674,7 @@ _08135A0E: movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -713,7 +713,7 @@ _08135A70: bne _08135A7C b _08135BD0 _08135A7C: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -734,7 +734,7 @@ _08135A9A: ldr r2, =0x00000e74 adds r1, r2 strb r0, [r1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -754,7 +754,7 @@ _08135ADC: ldrh r0, [r0, 0x4] ldr r1, =0x00001005 bl sub_8136110 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -765,7 +765,7 @@ _08135AFC: b _08135B9E _08135B02: bl sub_8135E2C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -794,7 +794,7 @@ _08135B1A: lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x8] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -809,7 +809,7 @@ _08135B6A: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -829,7 +829,7 @@ _08135B84: ands r0, r1 strb r0, [r2, 0x8] _08135B9E: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -2056,7 +2056,7 @@ _081365F4: bne _08136602 b _08136708 _08136602: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -2186,7 +2186,7 @@ sub_813671C: @ 813671C bne _08136742 b _08136848 _08136742: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -2275,7 +2275,7 @@ _081367CA: _08136810: movs r0, 0x5 bl audio_play - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -2683,7 +2683,7 @@ sub_8136BC0: @ 8136BC0 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -3521,7 +3521,7 @@ c2_change_map: @ 8137200 lsls r0, 24 cmp r0, 0 bne _081372D2 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _081372D2: @@ -3851,7 +3851,7 @@ sub_8137574: @ 8137574 b _081375A0 .pool _08137598: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _081375A0: @@ -4019,7 +4019,7 @@ _08137714: movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _08137726: @@ -4716,7 +4716,7 @@ sub_8137CB4: @ 8137CB4 thumb_func_start Special_ViewWallClock Special_ViewWallClock: @ 8137CC8 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =c2_exit_to_overworld_2_switch str r1, [r0, 0x8] ldr r0, =Cb2_ViewWallClock @@ -4750,7 +4750,7 @@ sub_8137D0C: @ 8137D0C movs r0, 0 strb r0, [r1] ldr r1, =gUnknown_0203AB58 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x20] str r0, [r1] bx lr @@ -4910,7 +4910,7 @@ _08137E5C: thumb_func_start sub_8137E6C sub_8137E6C: @ 8137E6C push {r4,r5,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =gUnknown_0203AB58 ldr r4, [r0, 0x20] ldr r0, [r1] diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s index e2cd2a933..b5d60e749 100644 --- a/asm/rom_8034C54.s +++ b/asm/rom_8034C54.s @@ -387,7 +387,7 @@ sub_8034EFC: @ 8034EFC mov r9, r2 _08034F46: lsls r0, r5, 3 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain adds r3, r0, r1 ldrh r1, [r4, 0xE] adds r0, r3, 0 @@ -456,7 +456,7 @@ _08034F46: bcc _08034F46 _08034FCE: subs r5, 0x1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain lsls r3, r5, 3 adds r3, r0 movs r2, 0xC @@ -576,7 +576,7 @@ sub_80350B0: @ 80350B0 str r2, [sp] ldr r5, [r0, 0x14] ldrb r7, [r0, 0x1] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain mov r10, r0 cmp r5, 0 beq _0803511A @@ -676,7 +676,7 @@ sub_8035164: @ 8035164 str r0, [r1] adds r7, r3, 0 mov r10, r1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain mov r9, r0 cmp r5, 0 beq _0803524C @@ -840,7 +840,7 @@ _080352E0: lsls r0, r3, 3 adds r1, r0, 0 adds r1, 0x39 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain adds r7, r1, r2 adds r0, 0x3C adds r6, r0, r2 @@ -903,7 +903,7 @@ _0803535A: ldrb r0, [r0, 0x3] cmp r9, r0 bge _0803538A - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x4 negs r5, r5 movs r4, 0x2 @@ -929,7 +929,7 @@ _0803538A: cmp r1, 0 beq _080353B0 lsls r0, r3, 3 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain adds r0, r2 adds r0, 0x39 ldrb r2, [r0] @@ -941,7 +941,7 @@ _0803538A: .pool _080353B0: lsls r2, r3, 3 - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain adds r2, r4 adds r2, 0x39 ldrb r1, [r2] @@ -985,7 +985,7 @@ sub_80353DC: @ 80353DC ldrb r2, [r2, 0x1] cmp r0, 0 beq _08035426 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r7, 0x4 negs r7, r7 movs r6, 0x2 @@ -1071,7 +1071,7 @@ sub_803547C: @ 803547C beq _080354D8 cmp r1, 0 beq _0803550C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x4 negs r5, r5 movs r4, 0x2 @@ -1094,7 +1094,7 @@ _080354BC: _080354D8: cmp r1, 0 beq _080354FA - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x4 negs r5, r5 adds r3, 0x1 @@ -2833,7 +2833,7 @@ _0803653A: ands r0, r1 cmp r0, 0 beq _08036568 - ldr r0, =gUnknown_82E9530 + ldr r0, =gGameVersion ldrb r0, [r0] cmp r0, 0x2 bne _08036560 @@ -2944,7 +2944,7 @@ _08036646: ands r0, r1 cmp r0, 0 beq _08036674 - ldr r0, =gUnknown_82E9530 + ldr r0, =gGameVersion ldrb r0, [r0] cmp r0, 0x2 bne _0803666C @@ -3308,7 +3308,7 @@ _080369AE: _080369E4: bl sub_806EA68 _080369E8: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r2, =0x00000439 adds r1, r2 ldrb r0, [r1] @@ -4450,7 +4450,7 @@ _080373E0: cmp r0, 0 beq _0803744C ldr r2, =gUnknown_03005D00 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, [r1] str r0, [r2] ldr r0, =sub_8039EF0 @@ -5050,7 +5050,7 @@ _080379A0: beq _080379D6 bl sub_8166188 ldr r2, =gUnknown_03005D00 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, [r1] str r0, [r2] ldr r0, =sub_8039EF0 @@ -5338,7 +5338,7 @@ _08037C2E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, [r1, 0x8] ldr r2, [sp] str r0, [r2] @@ -5387,7 +5387,7 @@ _08037C9E: mov r1, r10 ldr r0, [r1] str r0, [r6] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r2, [sp] ldr r0, [r2] str r0, [r1, 0x8] @@ -5408,7 +5408,7 @@ _08037CE4: mov r1, r10 ldr r0, [r1] str r0, [r6] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r2, [sp] ldr r0, [r2] str r0, [r1, 0x8] @@ -5463,7 +5463,7 @@ _08037D64: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, [r1, 0x8] mov r2, r8 str r0, [r2] @@ -5489,7 +5489,7 @@ _08037DA4: ldr r1, =gBattleTypeFlags ldr r0, [r7] str r0, [r1] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain mov r2, r8 ldr r0, [r2] str r0, [r1, 0x8] @@ -6181,7 +6181,7 @@ _080383BC: cmp r0, 0 beq _080383F8 ldr r2, =gUnknown_03005D00 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, [r1] str r0, [r2] ldr r0, =sub_8039EF0 @@ -6221,7 +6221,7 @@ sub_8038420: @ 8038420 bl RunTextPrinters bl fade_and_return_progress_probably bl RunTasks - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x2 ands r0, r1 @@ -6264,7 +6264,7 @@ _08038482: thumb_func_start sub_803849C sub_803849C: @ 803849C push {lr} - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =gUnknown_03005D00 ldr r0, [r0] str r0, [r1] @@ -6305,7 +6305,7 @@ sub_80384E4: @ 80384E4 bl m4aMPlayStop bl sub_803849C bl FreeAllWindowBuffers - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _08038512: @@ -7355,7 +7355,7 @@ sub_8038D64: @ 8038D64 ands r0, r1 cmp r0, 0 beq _08038DAC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 bl sub_8057028 @@ -7569,7 +7569,7 @@ _08038FC2: b _080391C6 _08038FD0: bl sub_8185FAC - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, =0x00000439 adds r2, r1 movs r1, 0x1 @@ -7632,7 +7632,7 @@ _08039022: b _080391C6 .pool _08039074: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] @@ -7654,7 +7654,7 @@ _08039090: b _08039172 .pool _080390AC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] _080390B0: bl SetMainCallback2 @@ -7748,7 +7748,7 @@ _08039174: b _080391C6 .pool _08039184: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] @@ -8008,7 +8008,7 @@ _080393F4: b _0803975C .pool _08039414: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -8084,7 +8084,7 @@ _080394AC: b _080396EA .pool _080394D8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -8175,7 +8175,7 @@ _0803958A: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -8202,7 +8202,7 @@ _080395CC: beq _080395DA b _0803975E _080395DA: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -8222,7 +8222,7 @@ _080395F6: b _0803975C .pool _08039610: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] @@ -8301,7 +8301,7 @@ _080396A8: lsls r0, 24 cmp r0, 0 bne _0803975E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -8326,7 +8326,7 @@ _08039704: lsrs r4, r0, 16 cmp r4, 0 bne _0803975E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -16530,7 +16530,7 @@ _0803DF34: thumb_func_start sub_803DF48 sub_803DF48: @ 803DF48 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -16573,7 +16573,7 @@ _0803DF9E: ldr r5, =gUnknown_0202433A ldrb r0, [r5] strh r0, [r1] - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] @@ -16603,7 +16603,7 @@ _0803DFDA: _0803DFDE: movs r0, 0x5A bl m4aSongNumStop - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _0803DFEC: @@ -45493,7 +45493,7 @@ _0804E084: b _0804E3B8 .pool _0804E0BC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -45511,7 +45511,7 @@ _0804E0BC: strb r0, [r4, 0x1] bl sub_8056B74 _0804E0E4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -45529,7 +45529,7 @@ _0804E0E4: strb r0, [r4, 0x1] bl sub_8056B74 _0804E10C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r5, 0x1 adds r0, r5, 0 @@ -45607,7 +45607,7 @@ _0804E1B8: beq _0804E1C6 b _0804E3B8 _0804E1C6: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -45627,7 +45627,7 @@ _0804E1E4: beq _0804E1F2 b _0804E3B8 _0804E1F2: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -45856,7 +45856,7 @@ _0804E3E0: b _0804E4FA .pool _0804E410: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -45874,7 +45874,7 @@ _0804E410: strb r0, [r4, 0x1] bl sub_8056B74 _0804E438: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -45892,7 +45892,7 @@ _0804E438: strb r0, [r4, 0x1] bl sub_8056B74 _0804E460: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r4, 0x1 adds r0, r4, 0 @@ -46779,7 +46779,7 @@ _0804EBD8: b _0804EC96 .pool _0804EC04: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -46796,7 +46796,7 @@ _0804EC04: strb r0, [r5, 0x1] bl sub_8056B74 _0804EC2A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -46814,7 +46814,7 @@ _0804EC2A: strb r0, [r4, 0x1] bl sub_8056B74 _0804EC52: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -47244,7 +47244,7 @@ _0804F014: b _0804F06A .pool _0804F02C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] cmp r0, 0 beq _0804F0F2 @@ -47257,7 +47257,7 @@ _0804F02C: b _0804F06A .pool _0804F04C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r0, [r0, 0x2E] cmp r0, 0 beq _0804F0F2 @@ -61189,7 +61189,7 @@ _08056978: ands r0, r1 cmp r0, 0 bne _08056A2C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -61533,7 +61533,7 @@ _08056C2C: b _08056E62 .pool _08056C60: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -61550,7 +61550,7 @@ _08056C60: strb r0, [r4, 0x1] bl sub_8056B74 _08056C86: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -61568,7 +61568,7 @@ _08056C86: strb r0, [r4, 0x1] bl sub_8056B74 _08056CAE: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -61693,7 +61693,7 @@ _08056D0A: b _08056E62 .pool _08056DD4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -62573,7 +62573,7 @@ sub_8057588: @ 8057588 movs r2, 0x7 movs r3, 0x1 bl dp11b_obj_instanciate - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0xF0 ands r0, r1 @@ -62594,7 +62594,7 @@ _080575EC: movs r0, 0 _080575F0: strb r0, [r1] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r2, [r0, 0x2E] movs r3, 0x1 adds r0, r3, 0 @@ -62879,7 +62879,7 @@ _0805785C: cmp r4, r0 blt _0805784A _08057866: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0xF0 ands r0, r1 @@ -63270,7 +63270,7 @@ sub_8057BFC: @ 8057BFC lsls r0, 9 ldr r1, =gUnknown_02023068 adds r6, r0, r1 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0xF0 ands r0, r1 @@ -63681,7 +63681,7 @@ _08057F9E: sub_8057FBC: @ 8057FBC push {r4-r7,lr} movs r7, 0 - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r6, 0x1 adds r0, r6, 0 @@ -63739,7 +63739,7 @@ _08057FF8: movs r1, 0 bl battle_menu_cursor_related_2 _08058038: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 @@ -63776,7 +63776,7 @@ _08058038: movs r1, 0 bl battle_menu_cursor_related_2 _08058086: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -63807,7 +63807,7 @@ _08058086: movs r1, 0 bl battle_menu_cursor_related_2 _080580C8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -63859,7 +63859,7 @@ sub_8058138: @ 8058138 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x5 ands r0, r1 @@ -64541,7 +64541,7 @@ sub_80586F8: @ 80586F8 bne _08058798 movs r0, 0x5A bl m4aSongNumStop - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] @@ -64570,7 +64570,7 @@ _0805875C: beq _08058798 movs r0, 0x5A bl m4aSongNumStop - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] @@ -64637,7 +64637,7 @@ _080587F4: _08058810: movs r0, 0x5A bl m4aSongNumStop - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r0, =0x00000439 adds r3, r2, r0 ldrb r1, [r3] @@ -66452,7 +66452,7 @@ _0805980A: thumb_func_start sub_8059828 sub_8059828: @ 8059828 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -66528,7 +66528,7 @@ _080598CC: thumb_func_start sub_80598E0 sub_80598E0: @ 80598E0 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -66643,7 +66643,7 @@ _080599CE: sub_80599D4: @ 80599D4 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -66662,7 +66662,7 @@ sub_80599D4: @ 80599D4 movs r0, 0 bl sub_8056B74 _08059A02: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 @@ -66681,7 +66681,7 @@ _08059A02: movs r0, 0x1 bl sub_8056B74 _08059A2C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -66714,7 +66714,7 @@ _08059A6C: _08059A76: bl dp01_tbl1_exec_completed _08059A7A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -75834,7 +75834,7 @@ sub_805EAE8: @ 805EAE8 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -83276,7 +83276,7 @@ sub_8062BB0: @ 8062BB0 ands r0, r1 cmp r0, 0x2 bne _08062BDA - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r0, =0x00000439 adds r3, r2, r0 ldrb r1, [r3] diff --git a/asm/rom_8072304.s b/asm/rom_8072304.s index 76df3bcee..7277176d5 100644 --- a/asm/rom_8072304.s +++ b/asm/rom_8072304.s @@ -7084,7 +7084,7 @@ sub_8075D14: @ 8075D14 strh r0, [r6, 0x2E] ldr r0, =sub_8075FD4 str r0, [r6, 0x1C] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -7543,7 +7543,7 @@ _08076130: bl RemoveObjectAndFreeTiles adds r0, r6, 0 bl RemoveObjectAndFreeResources - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] diff --git a/asm/rom_80C6FA0.s b/asm/rom_80C6FA0.s index cf455c740..f13c6191e 100644 --- a/asm/rom_80C6FA0.s +++ b/asm/rom_80C6FA0.s @@ -495,7 +495,7 @@ _080C7342: _080C7348: ldrh r3, [r5, 0xA] strh r3, [r5, 0xE] - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x40 ands r0, r1 @@ -627,7 +627,7 @@ _080C745C: strh r0, [r5, 0x8] b _080C756A _080C746A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r7, 0x3 adds r4, r7, 0 @@ -778,7 +778,7 @@ sub_80C7578: @ 80C7578 thumb_func_start mapldr_0808C6D8 mapldr_0808C6D8: @ 80C75A8 push {r4,r5,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r5, [r0, 0xC] movs r0, 0 bl SetVBlankCallback @@ -1183,7 +1183,7 @@ sub_80C78E4: @ 80C78E4 thumb_func_start sub_80C78F0 sub_80C78F0: @ 80C78F0 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -2270,7 +2270,7 @@ _080C8268: lsls r0, 24 cmp r0, 0 bne _080C82A0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -2713,7 +2713,7 @@ _080C8690: b _080C879E .pool _080C86B4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -2745,7 +2745,7 @@ _080C86EA: b _080C879E .pool _080C86FC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3221,7 +3221,7 @@ _080C8B58: b _080C8B82 .pool _080C8B6C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3405,7 +3405,7 @@ _080C8CE8: b _080C8D6E .pool _080C8D00: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3561,7 +3561,7 @@ _080C8E7A: b _080C8EA2 .pool _080C8E88: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3676,7 +3676,7 @@ _080C8F80: movs r0, 0xA b _080C9058 _080C8F8C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3688,7 +3688,7 @@ _080C8F9A: b _080C9058 .pool _080C8FA4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3728,7 +3728,7 @@ _080C9004: movs r0, 0xA b _080C9058 _080C9008: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3738,7 +3738,7 @@ _080C9008: b _080C9058 .pool _080C901C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3757,7 +3757,7 @@ _080C9038: movs r0, 0x13 b _080C9058 _080C904A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3782,7 +3782,7 @@ _080C9070: b _080C9096 .pool _080C9080: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -3985,7 +3985,7 @@ _080C9238: bl sub_80CAC58 b _080C9268 _080C9258: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -4091,7 +4091,7 @@ _080C9328: b _080C93A2 .pool _080C9348: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -4116,7 +4116,7 @@ _080C9374: b _080C93A2 .pool _080C938C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -4201,7 +4201,7 @@ _080C9438: bl sub_80CAC58 b _080C9468 _080C9458: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -4274,7 +4274,7 @@ _080C94FA: bl IsDma3ManagerBusyWithBgCopy b _080C951C _080C9500: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -4393,7 +4393,7 @@ _080C95F4: strb r0, [r1] b _080C9664 _080C9602: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -4506,7 +4506,7 @@ _080C96E6: bne _080C9720 b _080C9702 _080C96F2: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -5134,7 +5134,7 @@ _080C9C58: b _080C9D08 .pool _080C9C78: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -5265,7 +5265,7 @@ _080C9D8C: b _080C9E3C .pool _080C9DAC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -15109,7 +15109,7 @@ sub_80CF108: @ 80CF108 mov r9, r3 add r0, r9 strb r1, [r0] - ldr r6, =gUnknown_030022C0 + ldr r6, =gMain ldrh r1, [r6, 0x30] movs r0, 0x40 ands r0, r1 @@ -15302,7 +15302,7 @@ _080CF2D4: b _080CF366 .pool _080CF2E4: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 @@ -15384,7 +15384,7 @@ _080CF366: thumb_func_start sub_80CF374 sub_80CF374: @ 80CF374 push {r4,lr} - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r0, [r1, 0x2C] movs r4, 0x1 ands r4, r0 @@ -15524,7 +15524,7 @@ _080CF49C: thumb_func_start sub_80CF4B0 sub_80CF4B0: @ 80CF4B0 push {r4,lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -15681,7 +15681,7 @@ sub_80CF5C4: @ 80CF5C4 strb r1, [r0] mov r8, r1 movs r7, 0 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r3, [r1, 0x30] movs r0, 0x40 ands r0, r3 @@ -15847,7 +15847,7 @@ _080CF758: movs r0, 0x12 b _080CF7D8 _080CF75C: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 @@ -15938,7 +15938,7 @@ sub_80CF7E4: @ 80CF7E4 ldr r5, =0x00000cd7 adds r0, r5 strb r1, [r0] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r2, [r1, 0x30] movs r0, 0x40 ands r0, r2 @@ -16068,7 +16068,7 @@ sub_80CF8D8: @ 80CF8D8 ldr r5, =0x00000cd7 adds r0, r5 strb r1, [r0] - ldr r7, =gUnknown_030022C0 + ldr r7, =gMain ldrh r1, [r7, 0x30] movs r0, 0x40 ands r0, r1 @@ -16985,7 +16985,7 @@ sub_80D00AC: @ 80D00AC push {r4,r5,lr} movs r5, 0x2 negs r5, r5 - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 diff --git a/asm/rom_813C5BC.s b/asm/rom_813C5BC.s index 672543987..84ec20095 100644 --- a/asm/rom_813C5BC.s +++ b/asm/rom_813C5BC.s @@ -39,7 +39,7 @@ sub_813C5EC: @ 813C5EC lsls r1, 3 ldr r0, =gTasks adds r4, r1, r0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -406,7 +406,7 @@ sub_813C904: @ 813C904 sub_813C91C: @ 813C91C push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -494,7 +494,7 @@ _0813C9F0: movs r3, 0 bl pal_fade_maybe _0813CA00: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -513,7 +513,7 @@ _0813CA14: bl CreateTask ldr r0, =sub_813C8EC bl SetMainCallback2 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 diff --git a/asm/rom_8158B30.s b/asm/rom_8158B30.s index c6bf6c574..9577fd3ae 100644 --- a/asm/rom_8158B30.s +++ b/asm/rom_8158B30.s @@ -1059,7 +1059,7 @@ _081593D4: thumb_func_start bx_battle_menu_t6_2 bx_battle_menu_t6_2: @ 81593D8 push {r4,r5,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -1307,7 +1307,7 @@ sub_81595E4: @ 81595E4 ands r0, r1 cmp r0, 0 bne _0815960E - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r0, =0x00000439 adds r3, r2, r0 ldrb r1, [r3] @@ -1382,7 +1382,7 @@ _08159684: thumb_func_start sub_8159698 sub_8159698: @ 8159698 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 @@ -15958,7 +15958,7 @@ _08160E58: b _08160E88 .pool _08160E70: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -16087,7 +16087,7 @@ sub_8160F50: @ 8160F50 adds r0, 0x1 cmp r5, r0 bne _08161010 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -21192,7 +21192,7 @@ sub_8163A8C: @ 8163A8C lsrs r0, 24 cmp r0, 0x1 bne _08163AB0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =sub_81639AC str r1, [r0, 0x8] ldr r0, =sub_8036760 @@ -21740,7 +21740,7 @@ _08163FF4: adds r4, 0x1 cmp r4, 0x3 ble _08163FCC - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] mov r7, r8 strb r0, [r7] @@ -24218,7 +24218,7 @@ _0816554C: cmp r7, r0 bne _08165564 add r0, sp, 0x10 - ldr r1, =gUnknown_82E9531 + ldr r1, =gGameLanguage ldrb r1, [r1] strb r1, [r0] b _0816585A @@ -25016,14 +25016,14 @@ sub_8165B88: @ 8165B88 lsls r0, 1 cmp r2, r0 bne _08165BA4 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage b _08165C28 .pool _08165BA4: ldr r0, =0x0000012b cmp r2, r0 bhi _08165BB8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage b _08165C28 .pool _08165BB8: @@ -26259,7 +26259,7 @@ _08166658: .4byte _081667AC .4byte _081667F4 _08166678: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -26413,7 +26413,7 @@ _081667E8: b _0816680E .pool _081667F4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -26505,7 +26505,7 @@ _08166888: bl Free str r5, [r4] bl FreeAllWindowBuffers - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_816624C str r0, [r1, 0x8] bl sub_8179D70 @@ -26696,7 +26696,7 @@ _08166A70: b _08166BAA .pool _08166AAC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -26804,7 +26804,7 @@ _08166BAC: strb r0, [r1] b _08166BDA _08166BB6: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -29857,7 +29857,7 @@ _081685FC: thumb_func_start sub_8168610 sub_8168610: @ 8168610 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 diff --git a/asm/rom_81700F8.s b/asm/rom_81700F8.s index b17d1d2c7..124d12bf3 100644 --- a/asm/rom_81700F8.s +++ b/asm/rom_81700F8.s @@ -18,7 +18,7 @@ sub_81700F8: @ 81700F8 movs r1, 0x80 bl ClearGpuRegBits strh r4, [r5] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =0x00000439 adds r1, r0 ldrb r2, [r1] diff --git a/asm/rom_8184DA4.s b/asm/rom_8184DA4.s index 2674198c5..e673068ae 100644 --- a/asm/rom_8184DA4.s +++ b/asm/rom_8184DA4.s @@ -210,7 +210,7 @@ _08184F64: ldrb r0, [r2, 0x8] strb r0, [r3, 0xC] strh r5, [r3, 0xE] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strh r0, [r3, 0x10] movs r5, 0 @@ -1573,7 +1573,7 @@ sub_8185B1C: @ 8185B1C lsls r1, 16 cmp r1, 0 bne _08185B4A - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =sub_8185AB0 str r1, [r0, 0x8] ldr r0, =sub_8036760 @@ -16370,7 +16370,7 @@ sub_818DB7C: @ 818DB7C strb r3, [r0, 0x3] ldr r1, [r2] strh r3, [r1, 0xE] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r1, 0x12] bl sub_818DB20 @@ -16620,7 +16620,7 @@ sub_818DD84: @ 818DD84 adds r1, 0x4 bl sub_818DCF4 ldr r1, [r4] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r1, 0x12] movs r7, 0 @@ -16828,7 +16828,7 @@ sub_818DF68: @ 818DF68 strb r1, [r0, 0x1] movs r3, 0 adds r4, r2, 0 - ldr r6, =gUnknown_82E9531 + ldr r6, =gGameLanguage adds r5, r4, 0 ldr r0, =0x0000ffff adds r2, r0, 0 @@ -17214,7 +17214,7 @@ sub_818E298: @ 818E298 .pool _0818E2C0: ldr r0, [r4] - ldr r1, =gUnknown_82E9531 + ldr r1, =gGameLanguage ldrb r1, [r1] adds r0, 0x2D strb r1, [r0] @@ -17476,7 +17476,7 @@ _0818E4C2: ldr r1, [r6] bl StringCopy7 ldr r0, [r4] - ldr r1, =gUnknown_82E9531 + ldr r1, =gGameLanguage ldrb r1, [r1] adds r0, 0x2D strb r1, [r0] @@ -17643,7 +17643,7 @@ sub_818E638: @ 818E638 strb r2, [r0, 0x1] bl sub_818E604 ldr r1, [r4] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r1, 0xE] pop {r4} @@ -17708,7 +17708,7 @@ sub_818E6B0: @ 818E6B0 ldm r0!, {r2,r3} stm r1!, {r2,r3} ldr r1, [r4] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r1, 0xE] _0818E6EA: @@ -24592,7 +24592,7 @@ sub_819221C: @ 819221C adds r0, r1 ldrh r0, [r0] mov r8, r0 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r4, [r1, 0x2E] movs r0, 0x3 ands r0, r4 @@ -27611,7 +27611,7 @@ sub_8193BDC: @ 8193BDC ldr r1, =0x00000cb2 adds r0, r1 ldrh r6, [r0] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] adds r2, r1, 0 adds r3, r0, 0 @@ -29320,7 +29320,7 @@ _08194AD4: strh r0, [r1, 0x8] b _08194B3C _08194AEE: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -32219,7 +32219,7 @@ sub_8196330: @ 8196330 lsls r0, 24 cmp r0, 0 bne _08196388 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -32577,7 +32577,7 @@ sub_81965D8: @ 81965D8 sub_8196648: @ 8196648 push {r4,lr} adds r4, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -36569,7 +36569,7 @@ GetMenuCursorPos: @ 8198560 thumb_func_start ProcessMenuInput ProcessMenuInput: @ 819856C push {r4,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -36630,7 +36630,7 @@ ProcessMenuInputNoWrapAround: @ 81985D8 ldr r4, =gUnknown_0203CD90 ldrb r5, [r4, 0x2] adds r6, r5, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -36693,7 +36693,7 @@ _08198650: thumb_func_start ProcessMenuInput_other ProcessMenuInput_other: @ 8198658 push {r4,lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -36752,7 +36752,7 @@ ProcessMenuInputNoWrapAround_other: @ 81986C4 ldr r4, =gUnknown_0203CD90 ldrb r5, [r4, 0x2] adds r6, r5, 0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -38280,7 +38280,7 @@ _08199276: thumb_func_start sub_8199284 sub_8199284: @ 8199284 push {r4,lr} - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -38372,7 +38372,7 @@ sub_8199334: @ 8199334 push {r4-r6,lr} ldr r5, =gUnknown_0203CD90 ldrb r4, [r5, 0x2] - ldr r6, =gUnknown_030022C0 + ldr r6, =gMain ldrh r1, [r6, 0x2E] movs r0, 0x1 ands r0, r1 @@ -38458,7 +38458,7 @@ _081993D2: thumb_func_start sub_81993D8 sub_81993D8: @ 81993D8 push {r4,r5,lr} - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -38548,7 +38548,7 @@ sub_8199484: @ 8199484 push {r4-r6,lr} ldr r6, =gUnknown_0203CD90 ldrb r4, [r6, 0x2] - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 @@ -40746,7 +40746,7 @@ sub_819A4F8: @ 819A4F8 sub_819A514: @ 819A514 push {r4,r5,lr} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -40880,7 +40880,7 @@ _0819A5C0: movs r0, 0x4A movs r1, 0 bl SetGpuReg - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -40957,7 +40957,7 @@ _0819A738: movs r1, 0x20 movs r2, 0x4 bl gpu_pal_apply - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -41043,7 +41043,7 @@ _0819A854: movs r0, 0x3 bl HideBg _0819A85A: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -41067,7 +41067,7 @@ _0819A878: bne _0819A88C bl sub_819BE34 _0819A88C: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -41081,7 +41081,7 @@ _0819A8AC: bl sub_819BCF8 movs r0, 0x5 bl PutWindowTilemap - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -41091,7 +41091,7 @@ _0819A8C4: bl sub_819B9E8 movs r0, 0x1 bl PutWindowTilemap - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -41103,7 +41103,7 @@ _0819A8DC: _0819A8E2: bl PutWindowTilemap _0819A8E6: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -42014,7 +42014,7 @@ _0819B07A: strh r0, [r5, 0x8] b _0819B11A _0819B084: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 mov r8, r0 @@ -42169,7 +42169,7 @@ _0819B1CE: b _0819B344 .pool _0819B1EC: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r7, 0x1 movs r6, 0x1 @@ -42392,7 +42392,7 @@ _0819B3BA: b _0819B476 .pool _0819B3DC: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r0, [r2, 0x2E] ands r1, r0 cmp r1, 0 @@ -42435,7 +42435,7 @@ _0819B432: bl sub_819B9E8 b _0819B476 _0819B440: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r6, 0x1 adds r0, r6, 0 @@ -45171,7 +45171,7 @@ _0819CB50: strh r0, [r4, 0x8] b _0819CBD6 _0819CB5A: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r6, 0x1 adds r5, r6, 0 @@ -45454,7 +45454,7 @@ _0819CDA4: ldrb r0, [r0] cmp r0, 0x1 beq _0819CE36 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 mov r8, r0 @@ -45552,7 +45552,7 @@ _0819CE64: b _0819CF4C .pool _0819CE88: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] adds r5, r1, 0 ands r5, r0 @@ -47202,7 +47202,7 @@ sub_819DC00: @ 819DC00 sub_819DC1C: @ 819DC1C push {r4-r6,lr} sub sp, 0xC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -47257,7 +47257,7 @@ _0819DC84: ldr r0, =gUnknown_086108C8 bl InitWindows bl DeactivateAllTextPrinters - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -47399,7 +47399,7 @@ _0819DDA8: movs r1, 0x20 movs r2, 0x4 bl gpu_pal_apply - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -47431,7 +47431,7 @@ _0819DE94: bl LoadCompressedObjectPic ldr r0, =sub_819C7FC bl SetVBlankCallback - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -47471,7 +47471,7 @@ _0819DF10: bl sub_819EBEC movs r0, 0x2 bl PutWindowTilemap - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -47492,7 +47492,7 @@ _0819DF3C: _0819DF4A: movs r0, 0x1 bl PutWindowTilemap - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -47521,7 +47521,7 @@ _0819DF8C: bl sub_819ED78 movs r0, 0x3 bl PutWindowTilemap - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -47564,7 +47564,7 @@ _0819E000: movs r0, 0x3 bl HideBg _0819E006: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -50113,7 +50113,7 @@ _0819F4DC: b _0819F54E .pool _0819F4F8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -50898,7 +50898,7 @@ _0819FB48: adds r2, r7, r3 lsls r2, 2 adds r0, r2 - ldr r4, =gUnknown_82E9531 + ldr r4, =gGameLanguage ldrb r1, [r4] ldr r3, =0x0000011b adds r0, r3 @@ -54116,7 +54116,7 @@ _081A14C2: adds r0, r1, r2 bl StringCopy ldr r1, [r5] - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] ldr r2, =0x0000011b adds r1, r2 @@ -54343,7 +54343,7 @@ sub_81A16B4: @ 81A16B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -54367,7 +54367,7 @@ sub_81A16DC: @ 81A16DC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -54826,7 +54826,7 @@ _081A1B00: thumb_func_start sub_81A1B1C sub_81A1B1C: @ 81A1B1C push {lr} - bl Reset + bl DoSoftReset pop {r0} bx r0 thumb_func_end sub_81A1B1C @@ -70422,7 +70422,7 @@ sub_81A9EC8: @ 81A9EC8 lsls r0, 24 cmp r0, 0 beq _081A9ED8 - bl Reset + bl DoSoftReset _081A9ED8: pop {r0} bx r0 @@ -72329,7 +72329,7 @@ _081AADB2: setup_bag_menu: @ 81AADB8 push {r4,r5,lr} sub sp, 0x4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -72374,7 +72374,7 @@ _081AAE34: b _081AB012 _081AAE3E: bl remove_some_task - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72390,7 +72390,7 @@ _081AAE56: movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72411,7 +72411,7 @@ _081AAE86: bne _081AAE94 bl ResetTasks _081AAE94: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72425,7 +72425,7 @@ _081AAEA4: adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72441,7 +72441,7 @@ _081AAED8: b _081AB012 _081AAEDA: bl setup_bag_menu_textboxes - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72454,7 +72454,7 @@ _081AAEEC: b _081AB012 _081AAEFA: bl allocate_bag_item_list_buffers - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72480,7 +72480,7 @@ _081AAF1C: ldrb r0, [r4, 0x5] movs r1, 0x1 bl bag_menu_draw_pocket_indicator_square - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72521,7 +72521,7 @@ _081AAFA0: ldr r0, =gUnknown_0203CE58 ldrb r0, [r0, 0x5] bl AddBagVisualObject - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72533,7 +72533,7 @@ _081AAFBC: _081AAFC2: bl bag_menu_add_pocket_scroll_arrow_indicators_maybe bl bag_menu_add_list_scroll_arrow_indicators_maybe - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72548,7 +72548,7 @@ _081AAFDE: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -72568,7 +72568,7 @@ _081AAFF8: ands r0, r1 strb r0, [r2, 0x8] _081AB012: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -74129,7 +74129,7 @@ _081ABD74: beq _081ABDB8 cmp r0, 0x2 beq _081ABDC0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -74310,7 +74310,7 @@ GetSwitchBagPocketDirection: @ 81ABF10 bl GetLRKeysState lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x20 ands r0, r1 @@ -74859,7 +74859,7 @@ sub_81AC3C0: @ 81AC3C0 lsrs r0, 24 cmp r0, 0x1 beq _081AC48E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain mov r8, r0 ldrh r1, [r0, 0x2E] movs r0, 0x4 @@ -75777,7 +75777,7 @@ _081ACC8C: bl GetMenuCursorPos lsls r0, 24 lsrs r4, r0, 24 - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldrh r1, [r5, 0x2E] movs r0, 0x40 ands r0, r1 @@ -76230,7 +76230,7 @@ Task_ChooseHowManyToToss: @ 81AD044 b _081AD0C6 .pool _081AD088: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -76334,7 +76334,7 @@ Task_ActuallyToss: @ 81AD150 adds r1, r4, 0 adds r1, 0x8 adds r7, r0, r1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -76530,7 +76530,7 @@ sub_81AD350: @ 81AD350 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -77041,7 +77041,7 @@ sub_81AD794: @ 81AD794 b _081AD844 .pool _081AD7F4: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -77231,7 +77231,7 @@ sub_81AD9C0: @ 81AD9C0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -77339,7 +77339,7 @@ sub_81ADA7C: @ 81ADA7C b _081ADB0E .pool _081ADAC0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -77491,7 +77491,7 @@ sub_81ADC0C: @ 81ADC0C lsls r0, 3 ldr r1, =gTasks + 0x8 adds r5, r0, r1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -78563,7 +78563,7 @@ _081AE4F4: ldrb r0, [r5, 0x6] bl ListMenuHandleInput str r0, [r5] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r0, [r1, 0x2E] ands r4, r0 cmp r4, 0 @@ -78712,7 +78712,7 @@ ListMenuHandleInput: @ 81AE604 lsls r1, 3 ldr r0, =gTasks + 0x8 adds r3, r1, r0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -82346,7 +82346,7 @@ _081B0206: sub_81B020C: @ 81B020C push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -82391,7 +82391,7 @@ _081B0290: bl SetVBlankHBlankCallbacksToNull bl sub_8121DA0 bl clear_scheduled_bg_copies_to_vram - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82407,7 +82407,7 @@ _081B02B2: movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82418,7 +82418,7 @@ _081B02D4: b _081B0484 _081B02DA: bl ResetObjectPaletteAllocator - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82435,7 +82435,7 @@ _081B02F8: b _081B0484 _081B02FE: bl sub_81B209C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82466,7 +82466,7 @@ _081B0338: bne _081B0344 b _081B04B0 _081B0344: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82497,7 +82497,7 @@ _081B0368: .pool _081B038C: bl sub_81B5D30 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82508,7 +82508,7 @@ _081B03A0: b _081B0484 _081B03A6: bl sub_81B6160 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82549,7 +82549,7 @@ _081B03E0: .pool _081B0400: bl sub_81B0F28 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82592,7 +82592,7 @@ _081B044C: movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -82607,7 +82607,7 @@ _081B0474: movs r3, 0 bl pal_fade_maybe _081B0484: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -84217,7 +84217,7 @@ _081B11B4: ands r0, r1 cmp r0, 0 beq _081B11F6 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -84289,7 +84289,7 @@ sub_81B1250: @ 81B1250 ands r0, r1 cmp r0, 0x49 bne _081B1280 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -84888,7 +84888,7 @@ _081B1758: sub_81B1760: @ 81B1760 push {r4,lr} adds r4, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] adds r3, r0, 0 cmp r1, 0x20 @@ -84933,7 +84933,7 @@ _081B17AA: _081B17AE: movs r1, 0x1 _081B17B0: - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain _081B17B2: ldrh r2, [r3, 0x2E] movs r0, 0x8 @@ -92382,7 +92382,7 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 81B57B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -92642,7 +92642,7 @@ party_menu_icon_anim: @ 81B59B4 lsrs r0, 24 cmp r0, 0x1 bne _081B59EA - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -93627,7 +93627,7 @@ sub_81B617C: @ 81B617C sub sp, 0xC ldr r0, =c2_815ABFC mov r8, r0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -94017,7 +94017,7 @@ ExecuteTableBasedItemEffect__: @ 81B6520 lsrs r5, r1, 16 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -95195,7 +95195,7 @@ sub_81B6F98: @ 81B6F98 lsls r0, 24 cmp r0, 0 beq _081B6FEA - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -95877,7 +95877,7 @@ sub_81B75D4: @ 81B75D4 lsrs r0, 24 cmp r0, 0x1 beq _081B7620 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -95911,7 +95911,7 @@ sub_81B7634: @ 81B7634 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -96016,7 +96016,7 @@ sub_81B7704: @ 81B7704 lsls r0, 24 cmp r0, 0 beq _081B77A6 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r6, 0x1 adds r0, r6, 0 @@ -97603,7 +97603,7 @@ sub_81B8518: @ 81B8518 str r0, [sp] ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] str r0, [sp, 0x8] movs r0, 0x4 @@ -97952,7 +97952,7 @@ sub_81B87E8: @ 81B87E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -99134,7 +99134,7 @@ sub_81B9150: @ 81B9150 str r0, [sp] ldr r0, =sub_81B917C str r0, [sp, 0x4] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] str r0, [sp, 0x8] movs r0, 0x5 @@ -101164,7 +101164,7 @@ _081BA270: .4byte _081BA63C .4byte _081BA64E _081BA28C: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0x3 ands r0, r1 diff --git a/asm/rom_81BAD84.s b/asm/rom_81BAD84.s index 26d45ae7e..b28731146 100644 --- a/asm/rom_81BAD84.s +++ b/asm/rom_81BAD84.s @@ -8044,7 +8044,7 @@ _081BF430: beq _081BF43C b _081BF592 _081BF43C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -8064,7 +8064,7 @@ _081BF45C: beq _081BF468 b _081BF592 _081BF468: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -8172,13 +8172,13 @@ _081BF552: bl sub_81BF7A4 cmp r0, 0x3 bne _081BF592 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081BF592 - bl Reset + bl DoSoftReset b _081BF592 .pool _081BF574: @@ -8186,7 +8186,7 @@ _081BF574: bl sub_81BF7A4 cmp r0, 0x4 bne _081BF592 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -8805,7 +8805,7 @@ _081BFB0A: sub_81BFB10: @ 81BFB10 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -8854,7 +8854,7 @@ _081BFB9C: b _081BFDE6 _081BFBAA: bl remove_some_task - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8870,7 +8870,7 @@ _081BFBBC: .pool _081BFBD0: bl ResetAllObjectData - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8896,7 +8896,7 @@ _081BFC04: bne _081BFC10 b _081BFE18 _081BFC10: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8907,7 +8907,7 @@ _081BFC20: b _081BFDE6 _081BFC26: bl sub_81C1BA0 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8935,7 +8935,7 @@ _081BFC58: bne _081BFC6A b _081BFE18 _081BFC6A: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8946,7 +8946,7 @@ _081BFC7C: b _081BFDE6 _081BFC82: bl sub_81C286C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -8963,7 +8963,7 @@ _081BFC94: .pool _081BFCAC: bl sub_81C0348 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -9019,7 +9019,7 @@ _081BFD34: ldr r0, [r0] adds r0, 0xC bl sub_81C4984 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -9034,7 +9034,7 @@ _081BFD50: .pool _081BFD60: bl sub_81C4A88 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -9068,7 +9068,7 @@ _081BFDB0: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -9089,7 +9089,7 @@ _081BFDCC: _081BFDE4: strb r0, [r2, 0x8] _081BFDE6: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -9866,7 +9866,7 @@ sub_81C0510: @ 81C0510 ands r0, r1 cmp r0, 0 bne _081C05FE - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldrh r1, [r5, 0x2E] movs r0, 0x40 ands r0, r1 @@ -11018,7 +11018,7 @@ sub_81C0F44: @ 81C0F44 lsrs r0, 24 cmp r0, 0x1 beq _081C103A - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -11431,7 +11431,7 @@ sub_81C12E4: @ 81C12E4 lsrs r0, 24 cmp r0, 0x1 beq _081C13AA - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -11958,7 +11958,7 @@ _081C176A: beq _081C177A b _081C189A _081C177A: - ldr r6, =gUnknown_030022C0 + ldr r6, =gMain ldrh r1, [r6, 0x2E] movs r0, 0x40 ands r0, r1 @@ -12175,7 +12175,7 @@ sub_81C1940: @ 81C1940 bne _081C196C b _081C1B74 _081C196C: - ldr r6, =gUnknown_030022C0 + ldr r6, =gMain ldrh r1, [r6, 0x2E] movs r0, 0x40 ands r0, r1 @@ -15154,7 +15154,7 @@ sub_81C3304: @ 81C3304 ands r0, r1 cmp r0, 0 beq _081C3354 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -17335,7 +17335,7 @@ _081C4610: b _081C4770 .pool _081C4620: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] @@ -18574,7 +18574,7 @@ _081C5072: sub_81C5078: @ 81C5078 push {lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -18697,7 +18697,7 @@ _081C5188: _081C51A0: strb r0, [r2, 0x8] _081C51A2: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -19901,7 +19901,7 @@ _081C5BEA: beq _081C5BF8 b _081C5D16 _081C5BF8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -20335,7 +20335,7 @@ _081C5FF8: bl GetMenuCursorPos lsls r0, 24 lsrs r4, r0, 24 - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldrh r1, [r5, 0x2E] movs r0, 0x40 ands r0, r1 @@ -20899,7 +20899,7 @@ sub_81C64B4: @ 81C64B4 b _081C6544 .pool _081C64E8: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -21001,7 +21001,7 @@ sub_81C65CC: @ 81C65CC adds r4, r0, r1 ldr r6, =gUnknown_0203CF38 subs r7, r6, 0x2 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -21110,7 +21110,7 @@ sub_81C66EC: @ 81C66EC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -21316,7 +21316,7 @@ sub_81C68B0: @ 81C68B0 lsrs r0, 24 cmp r0, 0x1 beq _081C695C - ldr r7, =gUnknown_030022C0 + ldr r7, =gMain ldrh r1, [r7, 0x2E] movs r0, 0x4 ands r0, r1 @@ -22553,7 +22553,7 @@ _081C7338: bl Free movs r0, 0 str r0, [r4] - bl InitKeypadData + bl InitKeys pop {r4} pop {r0} bx r0 @@ -22881,7 +22881,7 @@ sub_81C75E0: @ 81C75E0 thumb_func_start sub_81C75F4 sub_81C75F4: @ 81C75F4 push {lr} - bl InitKeypadData + bl InitKeys pop {r0} bx r0 thumb_func_end sub_81C75F4 @@ -26856,7 +26856,7 @@ sub_81C943C: @ 81C943C movs r0, 0x1 b _081C951A _081C944C: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -26967,7 +26967,7 @@ sub_81C9520: @ 81C9520 movs r0, 0x1 b _081C9580 _081C9530: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -27019,7 +27019,7 @@ c2_pre_battle_1: @ 81C9588 movs r0, 0x1 b _081C95F8 _081C9598: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -27081,7 +27081,7 @@ sub_81C9600: @ 81C9600 movs r0, 0x1 b _081C9634 _081C9616: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -27111,7 +27111,7 @@ sub_81C963C: @ 81C963C movs r0, 0x1 b _081C96F6 _081C964E: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -27204,7 +27204,7 @@ sub_81C96FC: @ 81C96FC movs r0, 0x1 b _081C9792 _081C970C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -27345,7 +27345,7 @@ sub_81C97F8: @ 81C97F8 sub_81C9814: @ 81C9814 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -29770,7 +29770,7 @@ sub_81CAB38: @ 81CAB38 sub_81CAB44: @ 81CAB44 push {r4,r5,lr} adds r4, r0, 0 - ldr r3, =gUnknown_030022C0 + ldr r3, =gMain ldrh r1, [r3, 0x30] movs r0, 0x40 ands r0, r1 @@ -29872,7 +29872,7 @@ sub_81CABFC: @ 81CABFC sub_81CAC04: @ 81CAC04 push {r4,lr} adds r4, r0, 0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x40 ands r0, r1 @@ -29967,7 +29967,7 @@ _081CACAC: sub_81CACB8: @ 81CACB8 push {lr} adds r3, r0, 0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -30005,7 +30005,7 @@ _081CACF0: sub_81CACF8: @ 81CACF8 push {lr} adds r2, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -32674,7 +32674,7 @@ sub_81CC158: @ 81CC158 sub_81CC194: @ 81CC194 push {r4,lr} adds r4, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -33207,7 +33207,7 @@ _081CC5AE: sub_81CC5B4: @ 81CC5B4 push {lr} adds r2, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -34560,7 +34560,7 @@ sub_81CD08C: @ 81CD08C lsrs r2, r0, 24 cmp r2, 0 bne _081CD100 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -34719,7 +34719,7 @@ sub_81CD1E4: @ 81CD1E4 bl sub_81C763C adds r2, r0, 0 movs r3, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x40 ands r0, r1 @@ -38331,7 +38331,7 @@ _081CF022: sub_81CF030: @ 81CF030 push {r4,r5,lr} adds r4, r0, 0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -39687,7 +39687,7 @@ _081CFA7A: sub_81CFA88: @ 81CFA88 push {r4,r5,lr} adds r4, r0, 0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -41025,7 +41025,7 @@ sub_81D04B8: @ 81D04B8 sub_81D04C4: @ 81D04C4 push {r4,lr} adds r4, r0, 0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -41096,7 +41096,7 @@ _081D053E: sub_81D0548: @ 81D0548 push {r4,lr} adds r4, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0x40 ands r0, r1 @@ -41107,7 +41107,7 @@ sub_81D0548: @ 81D0548 cmp r0, 0 bne _081D05A4 _081D0562: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0x80 ands r0, r1 @@ -41118,7 +41118,7 @@ _081D0562: cmp r0, 0 bne _081D05A4 _081D0578: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0x20 ands r0, r1 @@ -41129,7 +41129,7 @@ _081D0578: cmp r0, 0 bne _081D05A4 _081D058E: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0x10 ands r0, r1 @@ -41144,7 +41144,7 @@ _081D05A4: b _081D05CA .pool _081D05AC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -50668,7 +50668,7 @@ _081D4F6C: strh r0, [r5] b _081D4FE6 _081D4F88: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -50921,7 +50921,7 @@ _081D5198: strb r0, [r4, 0x8] b _081D548A _081D51AE: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -50936,7 +50936,7 @@ _081D51BC: b _081D535A .pool _081D51D0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -51190,7 +51190,7 @@ _081D5418: lsls r0, 24 cmp r0, 0 beq _081D548A - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/roulette.s b/asm/roulette.s index 56370f750..42968f49f 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -394,7 +394,7 @@ _081405B6: sub_81405CC: @ 81405CC push {r4,r5,lr} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -593,7 +593,7 @@ _0814077A: b _08140806 .pool _081407F8: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1259,7 +1259,7 @@ sub_8140D6C: @ 8140D6C movs r0, 0 mov r9, r0 movs r5, 0 - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x40 ands r0, r1 @@ -1641,7 +1641,7 @@ _0814108A: adds r0, 0x1 strh r0, [r1, 0xA] _0814109A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -2325,7 +2325,7 @@ _08141660: ldrsh r0, [r4, r1] cmp r0, 0x3C bgt _08141690 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -3278,7 +3278,7 @@ sub_8141EF8: @ 8141EF8 adds r5, r1, 0 cmp r0, 0 beq _08141F1E - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain adds r2, r3, 0 adds r2, 0xAA ldrh r1, [r0, 0x2E] @@ -4589,7 +4589,7 @@ sub_81429A0: @ 81429A0 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -4618,7 +4618,7 @@ sub_81429F0: @ 81429F0 sub sp, 0xC lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/rtc.s b/asm/rtc.s index 3d22eea82..22b0f1ddc 100644 --- a/asm/rtc.s +++ b/asm/rtc.s @@ -194,9 +194,9 @@ GameFreakRTC_GetNumDaysInternal: @ 802F1E0 bx r1 thumb_func_end GameFreakRTC_GetNumDaysInternal - thumb_func_start GameFreakRTC_Init + thumb_func_start RtcInit @ void GameFreakRTC_Init() -GameFreakRTC_Init: @ 802F21C +RtcInit: @ 802F21C push {r4,r5,lr} ldr r5, =gUnknown_03000DB8 movs r0, 0 @@ -236,7 +236,7 @@ _0802F26E: pop {r0} bx r0 .pool - thumb_func_end GameFreakRTC_Init + thumb_func_end RtcInit thumb_func_start GameFreakRTC_GetErrorFlags @ u16 GameFreakRTC_GetErrorFlags() diff --git a/asm/save.s b/asm/save.s index c8a77d7ff..004514594 100644 --- a/asm/save.s +++ b/asm/save.s @@ -1489,7 +1489,7 @@ save_game_when_memory_present: @ 8153338 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_03005D88 + ldr r0, =gFlashMemoryPresent ldr r4, [r0] cmp r4, 0x1 bne _0815335A @@ -1522,7 +1522,7 @@ _08153376: thumb_func_start sub_8153380 sub_8153380: @ 8153380 push {lr} - ldr r0, =gUnknown_03005D88 + ldr r0, =gFlashMemoryPresent ldr r0, [r0] cmp r0, 0x1 bne _081533A4 @@ -1609,7 +1609,7 @@ _08153420: thumb_func_start sub_8153430 sub_8153430: @ 8153430 push {r4,lr} - ldr r0, =gUnknown_03005D88 + ldr r0, =gFlashMemoryPresent ldr r0, [r0] cmp r0, 0x1 bne _0815346C @@ -1684,7 +1684,7 @@ sub_81534D0: @ 81534D0 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_03005D88 + ldr r0, =gFlashMemoryPresent ldr r0, [r0] cmp r0, 0x1 beq _081534F0 @@ -1748,7 +1748,7 @@ sub_815355C: @ 815355C ldr r0, =gUnknown_0203ABBC str r0, [r5] adds r7, r0, 0 - ldr r0, =gUnknown_03005D88 + ldr r0, =gFlashMemoryPresent ldr r4, [r0] cmp r4, 0x1 beq _0815358C @@ -1927,7 +1927,7 @@ _081536B4: .4byte _08153796 .4byte _081537A8 _081536E4: - ldr r0, =gUnknown_03002700 + ldr r0, =gSoftResetDisabled movs r1, 0x1 strb r1, [r0] movs r0, 0x1 @@ -2033,7 +2033,7 @@ _081537A8: asrs r0, 16 cmp r0, 0x5 ble _081537C2 - ldr r1, =gUnknown_03002700 + ldr r1, =gSoftResetDisabled movs r0, 0 strb r0, [r1] adds r0, r2, 0 diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s index c4a6a9c46..c9a8b4e74 100644 --- a/asm/save_failed_screen.s +++ b/asm/save_failed_screen.s @@ -84,7 +84,7 @@ sub_8178FDC: @ 8178FDC mov r7, r8 push {r7} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r7, r0, r1 @@ -426,7 +426,7 @@ sub_8179390: @ 8179390 ldr r1, =gUnknown_0203BCFE movs r0, 0 strh r0, [r1] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -457,7 +457,7 @@ sub_81793E0: @ 81793E0 ldr r0, =gUnknown_0203BCFE movs r2, 0 strh r2, [r0] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -492,7 +492,7 @@ sub_8179428: @ 8179428 ldr r0, [r5] cmp r0, 0 bne _08179448 - bl Reset + bl DoSoftReset b _0817944E .pool _08179448: @@ -507,7 +507,7 @@ _0817944E: thumb_func_start sub_8179454 sub_8179454: @ 8179454 push {r4,r5,lr} - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldr r0, [r5, 0x24] lsrs r4, r0, 3 movs r0, 0x7 diff --git a/asm/scrcmd.s b/asm/scrcmd.s index b0dfcf1e2..544ed3684 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -3370,7 +3370,7 @@ s68_close_box: @ 809AC8C thumb_func_start sub_809AC98 sub_809AC98: @ 809AC98 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 diff --git a/asm/script_menu.s b/asm/script_menu.s index 667cbe6c4..ca9c55ab9 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -334,7 +334,7 @@ _080E209E: _080E20A2: lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xC0 ands r0, r1 diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index 7f0e21a66..e874e9b88 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -402,7 +402,7 @@ sub_80F8ADC: @ 80F8ADC push {lr} ldr r0, =sub_812FDEC bl SetMainCallback2 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80F8ACC str r0, [r1, 0x8] pop {r0} @@ -1530,7 +1530,7 @@ _080F941C: thumb_func_start sub_80F9438 sub_80F9438: @ 80F9438 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, =sub_80F9460 str r1, [r0, 0x8] ldr r0, =0x000040cf @@ -1569,7 +1569,7 @@ _080F947E: thumb_func_start sub_80F9490 sub_80F9490: @ 80F9490 push {lr} - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_80F94B8 str r0, [r1, 0x8] ldr r0, =gUnknown_020375E0 diff --git a/asm/shop.s b/asm/shop.s index 294c7f3e0..a3e1f2dff 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -390,7 +390,7 @@ VBlankCB_BuyMenu: @ 80DFD80 CB2_InitBuyMenu: @ 80DFD94 push {r4,r5,lr} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r5, r0, r1 @@ -2281,7 +2281,7 @@ Task_BuyHowManyDialogueHandleInput: @ 80E0D88 b _080E0EA4 .pool _080E0DF0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -2513,7 +2513,7 @@ Task_ReturnToItemListAfterItemPurchase: @ 80E100C lsls r0, 3 ldr r1, =gTasks + 0x8 adds r5, r0, r1 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -2557,7 +2557,7 @@ Task_ReturnToItemListAfterDecorationPurchase: @ 80E1078 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 76020684f..5f628b7eb 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -91,7 +91,7 @@ sub_812A540: @ 812A540 sub_812A588: @ 812A588 push {lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -168,7 +168,7 @@ _0812A644: bl sub_812AA78 bl sub_812AA90 _0812A64C: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -844,7 +844,7 @@ _0812ABE8: thumb_func_start sub_812ABF8 sub_812ABF8: @ 812ABF8 push {r4,r5,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -937,7 +937,7 @@ _0812ACB2: ldr r3, [r0] movs r1, 0x12 ldrsh r2, [r3, r1] - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain adds r5, r0, 0 cmp r2, 0x2 bgt _0812ACD0 @@ -1002,7 +1002,7 @@ sub_812ACF4: @ 812ACF4 thumb_func_start sub_812AD34 sub_812AD34: @ 812AD34 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -1142,7 +1142,7 @@ _0812AE40: thumb_func_start sub_812AE4C sub_812AE4C: @ 812AE4C push {r4,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1660,7 +1660,7 @@ sub_812B214: @ 812B214 thumb_func_start sub_812B254 sub_812B254: @ 812B254 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -1713,7 +1713,7 @@ sub_812B280: @ 812B280 thumb_func_start sub_812B2C0 sub_812B2C0: @ 812B2C0 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -2787,7 +2787,7 @@ _0812BB8E: _0812BBA8: movs r0, 0x8 strh r0, [r4, 0xA] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -2800,7 +2800,7 @@ _0812BBBC: lsls r0, 24 cmp r0, 0 beq _0812BBF6 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x8 ands r0, r1 @@ -7241,7 +7241,7 @@ sub_812DDC4: @ 812DDC4 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x6 ands r0, r1 diff --git a/asm/sound.s b/asm/sound.s index 4686eaa7b..05331f698 100644 --- a/asm/sound.s +++ b/asm/sound.s @@ -5,8 +5,8 @@ .text - thumb_func_start sound_sources_off -sound_sources_off: @ 80A2DD4 + thumb_func_start InitMapMusic +InitMapMusic: @ 80A2DD4 push {lr} ldr r1, =gUnknown_03005DF8 movs r0, 0 @@ -15,10 +15,10 @@ sound_sources_off: @ 80A2DD4 pop {r0} bx r0 .pool - thumb_func_end sound_sources_off + thumb_func_end InitMapMusic - thumb_func_start sound_something -sound_something: @ 80A2DE8 + thumb_func_start MapMusicMain +MapMusicMain: @ 80A2DE8 push {r4,r5,lr} ldr r0, =gUnknown_03000F4C ldrb r1, [r0] @@ -111,7 +111,7 @@ _080A2ECA: pop {r0} bx r0 .pool - thumb_func_end sound_something + thumb_func_end MapMusicMain thumb_func_start map_music_set_to_zero map_music_set_to_zero: @ 80A2EE0 @@ -1056,7 +1056,7 @@ sub_80A3678: @ 80A3678 lsrs r0, 24 cmp r0, 0x1 beq _080A3694 - bl sub_8000964 + bl ClearPokemonCrySongs movs r0, 0x1 b _080A3696 .pool @@ -1073,7 +1073,7 @@ sub_80A369C: @ 80A369C ldr r0, =gUnknown_020383E8 ldr r0, [r0] bl m4aMPlayStop - bl sub_8000964 + bl ClearPokemonCrySongs pop {r0} bx r0 .pool @@ -1098,7 +1098,7 @@ sub_80A36C8: @ 80A36C8 bl IsPokemonCryPlaying cmp r0, 0 bne _080A36E4 - bl sub_8000964 + bl ClearPokemonCrySongs movs r0, 0 b _080A36E6 .pool diff --git a/asm/sprite.s b/asm/sprite.s index 9e161cd75..094a4f652 100644 --- a/asm/sprite.s +++ b/asm/sprite.s @@ -82,7 +82,7 @@ PrepareSpritesForOamLoad: @ 8006A0C bl UpdateObjectOamCoords bl BuildObjectPriorityList bl SortObjectsByPriority - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldr r0, =0x00000439 adds r5, r0 ldrb r0, [r5] @@ -477,7 +477,7 @@ _08006D04: CopyTransformationMatricesToSprites: @ 8006D1C push {r4-r6,lr} movs r4, 0 - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldr r6, =gUnknown_02021BC0 _08006D24: lsls r2, r4, 2 @@ -1062,7 +1062,7 @@ _08007178: @ void LoadOamFromSprites() LoadOamFromSprites: @ 8007188 push {lr} - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] @@ -4250,7 +4250,7 @@ _08008898: cmp r0, 0 bne _080088CC _080088AC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrb r2, [r3] lsls r2, 3 adds r0, 0x38 diff --git a/asm/start_menu.s b/asm/start_menu.s index ae9c30e0c..4a3e54026 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -751,7 +751,7 @@ _0809FAB2: thumb_func_start HandleStartMenuInput HandleStartMenuInput: @ 809FAC4 push {r4,lr} - ldr r4, =gUnknown_030022C0 + ldr r4, =gMain ldrh r1, [r4, 0x2E] movs r0, 0x40 ands r0, r1 @@ -1035,7 +1035,7 @@ _0809FD38: bl overworld_free_bg_tilemaps ldr r0, =CB2_OptionsMenu bl SetMainCallback2 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldr r0, =sub_8086194 str r0, [r1, 0x8] movs r0, 0x1 @@ -1407,7 +1407,7 @@ sub_80A003C: @ 80A003C ldrb r0, [r1] subs r2, r0, 0x1 strb r2, [r1] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -1436,7 +1436,7 @@ sub_80A0070: @ 80A0070 ldrb r0, [r1] cmp r0, 0 bne _080A0094 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -2109,7 +2109,7 @@ _080A061C: movs r0, 0x5 b _080A06A6 _080A0620: - ldr r0, =gUnknown_03002700 + ldr r0, =gSoftResetDisabled movs r1, 0x1 strb r1, [r0] movs r0, 0x1 @@ -2128,7 +2128,7 @@ _080A063C: bl sav2_gender2_inplace_and_xFE movs r0, 0x3 strh r0, [r5] - ldr r1, =gUnknown_03002700 + ldr r1, =gSoftResetDisabled movs r0, 0 strb r0, [r1] b _080A06A8 @@ -2145,7 +2145,7 @@ _080A065C: b _080A06A6 _080A0670: bl FreeAllWindowBuffers - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 adds r0, r4, 0 diff --git a/asm/starter_choose.s b/asm/starter_choose.s index cff1dd438..f8dd0e171 100644 --- a/asm/starter_choose.s +++ b/asm/starter_choose.s @@ -362,7 +362,7 @@ sub_813425C: @ 813425C adds r6, r0, r2 ldrh r7, [r6, 0x8] ldrb r4, [r6, 0x8] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain ldrh r3, [r1, 0x2E] movs r0, 0x1 ands r0, r3 @@ -564,7 +564,7 @@ _08134426: ldrh r0, [r0, 0x8] strh r0, [r2] bl dp13_810BB8C - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 b _0813449A diff --git a/asm/text.s b/asm/text.s index f845293ca..87e72f362 100644 --- a/asm/text.s +++ b/asm/text.s @@ -2266,7 +2266,7 @@ TextPrinterWaitWithDownArrow: @ 8005650 _08005674: adds r0, r2, 0 bl TextPrinterDrawDownArrow - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -2302,7 +2302,7 @@ TextPrinterWait: @ 800569C b _080056D4 .pool _080056C0: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -2453,7 +2453,7 @@ _080057D4: .4byte _08005D48 .4byte _08005D5A _080057F0: - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0x3 ands r0, r1 diff --git a/asm/title_screen.s b/asm/title_screen.s index bbeb2e2b1..9f4f249c2 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -482,7 +482,7 @@ title_screen_vblank_callback: @ 80AA780 c2_title_screen_1: @ 80AA7A4 push {r4,lr} sub sp, 0x14 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -581,7 +581,7 @@ _080AA7E0: str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl sub_80A1A74 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -634,7 +634,7 @@ _080AA8C4: bl gpu_pal_apply ldr r0, =gUnknown_08540100 bl LoadTaggedObjectPalette - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -662,7 +662,7 @@ _080AA998: strh r0, [r1, 0xC] subs r0, 0x10 strh r0, [r1, 0xE] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -681,7 +681,7 @@ _080AA9E0: bl pal_fade_maybe ldr r0, =title_screen_vblank_callback bl SetVBlankCallback - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -754,7 +754,7 @@ _080AAA14: bl SetGpuReg ldr r0, =0x0000019d bl m4aSongNumStart - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -808,7 +808,7 @@ task_title_screen_1: @ 80AAB44 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF ands r0, r1 @@ -927,7 +927,7 @@ task_title_screen_2: @ 80AAC50 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0xF ands r0, r1 @@ -1056,7 +1056,7 @@ task_title_screen_3: @ 80AAD64 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -1115,7 +1115,7 @@ _080AADC8: b _080AAE98 .pool _080AADFC: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2C] movs r0, 0x6 ands r0, r1 diff --git a/asm/trade.s b/asm/trade.s index a3d37e494..dd0aa2319 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -285,7 +285,7 @@ sub_80773AC: @ 80773AC push {lr} ldr r0, =sub_80773D0 bl SetMainCallback2 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0 str r1, [r0] ldr r0, =gUnknown_020244EA @@ -301,7 +301,7 @@ sub_80773D0: @ 80773D0 mov r7, r8 push {r7} sub sp, 0x28 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -363,7 +363,7 @@ _08077476: adds r6, 0x1 cmp r6, 0xD ble _08077476 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -420,7 +420,7 @@ _080774B2: .pool _08077528: bl sub_8009734 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r7, 0x87 lsls r7, 3 adds r0, r7 @@ -433,7 +433,7 @@ _08077528: b _08077B46 .pool _0807754C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -490,14 +490,14 @@ _080775A0: b _08077B46 _080775C0: bl sub_800A620 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 b _08077B22 .pool _080775D8: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -519,7 +519,7 @@ _080775F2: _08077600: bl sub_8011BD0 bl calc_player_party_count - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r7, 0x87 lsls r7, 3 adds r1, r7 @@ -553,7 +553,7 @@ _08077648: bne _0807765C b _08077B46 _0807765C: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -579,7 +579,7 @@ _08077688: b _08077B46 _08077694: bl sub_807A5B0 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -717,7 +717,7 @@ _08077756: cmp r6, r0 blt _08077756 _080777B8: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -732,7 +732,7 @@ _080777E8: adds r1, 0x28 movs r2, 0 bl sub_81B5D4C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -746,7 +746,7 @@ _08077810: adds r1, 0x28 movs r2, 0x1 bl sub_81B5D4C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r7, 0x87 lsls r7, 3 adds r1, r7 @@ -790,7 +790,7 @@ _08077834: ldr r1, [r5, 0x20] movs r2, 0x18 bl sub_807A308 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -880,7 +880,7 @@ _0807792C: adds r6, 0x1 cmp r6, 0x2 ble _0807792C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -966,7 +966,7 @@ _080779BC: ldr r0, [r2] adds r0, 0x35 strb r3, [r0] - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -989,7 +989,7 @@ _08077A40: ldr r0, [r2] strb r1, [r0, 0x1] bl sub_8078388 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r7, 0x87 lsls r7, 3 adds r1, r7 @@ -1005,7 +1005,7 @@ _08077A80: bl sub_807A320 movs r0, 0x1 bl sub_8079BE0 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1020,7 +1020,7 @@ _08077A9A: _08077AA8: movs r0, 0x1 bl sub_80782B8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -1034,7 +1034,7 @@ _08077ABC: movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -1047,7 +1047,7 @@ _08077ADC: bl SetGpuReg movs r0, 0x2 bl sub_80782B8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r7, 0x87 lsls r7, 3 adds r1, r7 @@ -1056,7 +1056,7 @@ _08077ADC: _08077AFC: movs r0, 0 bl sub_807A468 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1067,7 +1067,7 @@ _08077B10: bl sub_807A468 bl sub_807A53C _08077B1A: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -1109,7 +1109,7 @@ sub_8077B74: @ 8077B74 mov r7, r8 push {r7} sub sp, 0x24 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -1152,7 +1152,7 @@ _08077BA0: .4byte _080780E4 _08077BFC: bl sub_80772A4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -1175,7 +1175,7 @@ _08077C20: b _080780D8 _08077C28: bl calc_player_party_count - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -1191,7 +1191,7 @@ _08077C3C: movs r1, 0 bl sub_800DFB4 _08077C50: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -1335,7 +1335,7 @@ _08077D1E: cmp r6, r0 blt _08077D1E _08077D80: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -1350,7 +1350,7 @@ _08077DB0: adds r1, 0x28 movs r2, 0 bl sub_81B5D4C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -1364,7 +1364,7 @@ _08077DD8: adds r1, 0x28 movs r2, 0x1 bl sub_81B5D4C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r7, 0x87 lsls r7, 3 adds r1, r7 @@ -1408,7 +1408,7 @@ _08077DFC: ldr r1, [r5, 0x20] movs r2, 0x18 bl sub_807A308 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1430,7 +1430,7 @@ _08077E84: bne _08077E90 b _080780F6 _08077E90: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -1504,7 +1504,7 @@ _08077F02: adds r6, 0x1 cmp r6, 0x2 ble _08077F02 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -1610,7 +1610,7 @@ _08077FEA: ldr r1, [r4] adds r1, 0x34 strb r0, [r1] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r7, 0x87 lsls r7, 3 adds r0, r7 @@ -1632,7 +1632,7 @@ _08078040: ldr r0, [r2] strb r1, [r0, 0x1] bl sub_8078388 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -1657,7 +1657,7 @@ _08078068: movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -1670,7 +1670,7 @@ _080780A4: bl SetGpuReg movs r0, 0x2 bl sub_80782B8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -1684,7 +1684,7 @@ _080780C4: _080780CC: bl sub_807A53C _080780D0: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -1806,7 +1806,7 @@ _080781C2: thumb_func_start sub_80781C8 sub_80781C8: @ 80781C8 push {r4,r5,lr} - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldr r0, =sub_80773AC str r0, [r5, 0x8] ldr r0, =gUnknown_030030FC @@ -3173,7 +3173,7 @@ _08078DB4: sub_8078DBC: @ 8078DBC push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x30] movs r0, 0x40 ands r0, r1 @@ -3221,7 +3221,7 @@ _08078E1C: movs r1, 0x3 bl sub_8078CB8 _08078E30: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -3451,7 +3451,7 @@ _0807902A: thumb_func_start sub_8079034 sub_8079034: @ 8079034 push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -3937,7 +3937,7 @@ _080793F8: thumb_func_start sub_8079408 sub_8079408: @ 8079408 push {r4-r6,lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -4097,7 +4097,7 @@ _08079574: thumb_func_start sub_807957C sub_807957C: @ 807957C push {lr} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -7222,7 +7222,7 @@ _0807AE36: sub_807AE50: @ 807AE50 push {r4,r5,lr} sub sp, 0x4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -7278,7 +7278,7 @@ _0807AEC0: bl SetVBlankCallback bl sub_807B170 bl sub_807AC3C - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -7331,7 +7331,7 @@ _0807AF58: movs r1, 0x1 strb r1, [r0] bl sub_8009734 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7390,7 +7390,7 @@ _0807AFC8: b _0807B116 _0807AFEA: bl sub_800A620 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7414,7 +7414,7 @@ _0807B014: beq _0807B022 b _0807B116 _0807B022: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7440,7 +7440,7 @@ _0807B058: movs r0, 0 movs r1, 0x1 bl sub_807ACFC - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7456,7 +7456,7 @@ _0807B07A: movs r1, 0x1 bl sub_807ACFC bl sub_807B154 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7480,7 +7480,7 @@ _0807B0B0: bl pal_fade_maybe movs r0, 0 bl ShowBg - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -7490,7 +7490,7 @@ _0807B0D4: bl sub_807B140 bl sub_807BAD8 _0807B0DC: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -7662,7 +7662,7 @@ sub_807B270: @ 807B270 mov r6, r8 push {r6} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -7768,7 +7768,7 @@ _0807B2D0: adds r0, 0x4 strh r6, [r0] str r6, [r2, 0x64] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -7825,7 +7825,7 @@ _0807B414: bl sub_807B62C bl sub_807BAD8 _0807B424: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -10576,7 +10576,7 @@ _0807CEB6: movs r0, 0x1 b _0807CFB6 _0807CEC6: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -12681,7 +12681,7 @@ _0807E302: movs r0, 0x1 b _0807E402 _0807E312: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -12791,7 +12791,7 @@ c2_08053788: @ 807E414 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 @@ -12805,7 +12805,7 @@ c2_08053788: @ 807E414 _0807E434: movs r0, 0x4 strb r0, [r1] - ldr r1, =gUnknown_03002700 + ldr r1, =gSoftResetDisabled movs r0, 0x1 b _0807E4B2 .pool @@ -13623,7 +13623,7 @@ _0807EB2C: sub_807EB50: @ 807EB50 push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -13757,7 +13757,7 @@ _0807ED10: _0807ED2C: movs r0, 0 bl sub_8077288 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -13786,7 +13786,7 @@ _0807ED60: bne _0807ED6A b _0807F03A _0807ED6A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -13798,7 +13798,7 @@ _0807ED7C: bne _0807ED86 b _0807F03A _0807ED86: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -13852,7 +13852,7 @@ _0807EDCE: _0807EDF6: bl sub_8076D5C bl sub_8153380 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -13884,7 +13884,7 @@ _0807EE38: cmp r1, 0 beq _0807EE5C bl sav2_gender2_inplace_and_xFE - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -13896,7 +13896,7 @@ _0807EE5C: ldr r0, =gUnknown_020322A0 ldr r0, [r0] str r1, [r0, 0x64] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -13906,7 +13906,7 @@ _0807EE5C: .pool _0807EE78: bl sub_81533E0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -13950,7 +13950,7 @@ _0807EED4: movs r0, 0 str r0, [r1, 0x64] _0807EEDA: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -13966,7 +13966,7 @@ _0807EEEC: bne _0807EF14 movs r0, 0x1 bl sub_8077288 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -13985,7 +13985,7 @@ _0807EF1A: b _0807F03A _0807EF24: bl sub_8153408 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -14032,7 +14032,7 @@ _0807EF7E: bne _0807F03A movs r0, 0x3 bl play_sound_effect - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -14048,7 +14048,7 @@ _0807EFA4: ldrb r0, [r0] cmp r0, 0 beq _0807EFD8 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r1, [r0, 0x8] ldr r0, =sub_80773AC cmp r1, r0 @@ -14060,7 +14060,7 @@ _0807EFA4: _0807EFD8: bl sub_800AC34 _0807EFDC: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -14082,7 +14082,7 @@ _0807EFF0: bl sub_8077294 cmp r0, 0 beq _0807F03A - ldr r0, =gUnknown_03002700 + ldr r0, =gSoftResetDisabled movs r1, 0 strb r1, [r0] ldr r0, =c2_080543C4 @@ -14094,7 +14094,7 @@ _0807F028: ldrb r1, [r0] cmp r1, 0 bne _0807F03A - ldr r0, =gUnknown_03002700 + ldr r0, =gSoftResetDisabled strb r1, [r0] ldr r0, =c2_080543C4 bl SetMainCallback2 @@ -14147,7 +14147,7 @@ c2_080543C4: @ 807F068 beq _0807F0B6 bl sub_800E084 _0807F0B6: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _0807F0BE: @@ -14596,7 +14596,7 @@ _0807F45C: sub_807F464: @ 807F464 push {r4,r5,lr} sub sp, 0x4 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -14646,7 +14646,7 @@ _0807F4C0: _0807F4E8: movs r0, 0 bl sub_8077288 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -14660,7 +14660,7 @@ _0807F500: bne _0807F50A b _0807F70C _0807F50A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -14706,7 +14706,7 @@ _0807F570: lsrs r1, r0, 24 cmp r1, 0 beq _0807F590 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -14718,7 +14718,7 @@ _0807F590: ldr r0, =gUnknown_020322A0 ldr r0, [r0] str r1, [r0, 0x64] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -14728,7 +14728,7 @@ _0807F590: .pool _0807F5AC: bl sub_81533E0 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -14771,7 +14771,7 @@ _0807F608: movs r0, 0 str r0, [r1, 0x64] _0807F60E: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -14787,7 +14787,7 @@ _0807F620: bne _0807F648 movs r0, 0x1 bl sub_8077288 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -14804,7 +14804,7 @@ _0807F64E: cmp r0, 0 beq _0807F70C bl sub_8153408 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -14843,7 +14843,7 @@ _0807F694: movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -14865,7 +14865,7 @@ _0807F6C4: bne _0807F70C movs r0, 0x3 bl sub_8077288 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -14877,7 +14877,7 @@ _0807F6F8: bl sub_8077294 cmp r0, 0 beq _0807F70C - ldr r0, =gUnknown_03002700 + ldr r0, =gSoftResetDisabled movs r1, 0 strb r1, [r0] ldr r0, =c2_080543C4 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 981031e28..9b22b7ccd 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -279,7 +279,7 @@ _080C28E4: adds r0, r2 strb r5, [r0] _080C290A: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -340,7 +340,7 @@ _080C2986: b _080C2ACA .pool _080C299C: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -647,7 +647,7 @@ _080C2C78: sub_80C2C80: @ 80C2C80 push {lr} sub sp, 0x8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -679,7 +679,7 @@ _080C2CA8: _080C2CD4: bl sub_80C334C bl sub_80C3414 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -730,7 +730,7 @@ _080C2D50: bl ResetAllObjectData bl ResetObjectPaletteAllocator bl sub_80A1A74 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -743,7 +743,7 @@ _080C2D6A: .pool _080C2D74: bl sub_80C41D8 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -754,7 +754,7 @@ _080C2D88: b _080C2DBC _080C2D8E: bl sub_80C4330 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -765,7 +765,7 @@ _080C2DA0: b _080C2DC4 _080C2DA6: bl sub_80C3548 - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -779,7 +779,7 @@ _080C2DBC: cmp r0, 0x1 bne _080C2DDC _080C2DC4: - ldr r1, =gUnknown_030022C0 + ldr r1, =gMain movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -4659,7 +4659,7 @@ sub_80C4F50: @ 80C4F50 ldr r1, [r0] cmp r1, 0 bne _080C4F7C - ldr r0, =gUnknown_82E9530 + ldr r0, =gGameVersion ldrb r1, [r0] subs r0, r1, 0x4 lsls r0, 24 @@ -5921,7 +5921,7 @@ sub_80C5A48: @ 80C5A48 lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -6056,7 +6056,7 @@ _080C5B48: adds r0, r6, 0 bl DestroyTask _080C5B5E: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -7501,7 +7501,7 @@ _080C6800: bl sub_80C64CC b _080C68C8 _080C6806: - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r2, 0x2 adds r0, r2, 0 diff --git a/asm/tv.s b/asm/tv.s index 55b65e9cb..2d7adaeec 100644 --- a/asm/tv.s +++ b/asm/tv.s @@ -1180,7 +1180,7 @@ _080EC84E: strh r0, [r6, 0x10] adds r0, r6, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r6, 0x2] strb r5, [r6, 0x3] @@ -1319,7 +1319,7 @@ _080EC940: bl StringCopy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x2] _080EC9B4: @@ -1438,7 +1438,7 @@ sub_80ECA38: @ 80ECA38 bl StringCopy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x1D] ldrb r0, [r6, 0x1E] @@ -1550,7 +1550,7 @@ _080ECBA4: bl StringCopy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x19] cmp r0, 0x1 @@ -1664,7 +1664,7 @@ _080ECC68: strb r0, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x14] cmp r0, 0x1 @@ -1735,7 +1735,7 @@ sub_80ECD00: @ 80ECD00 bl StringCopy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x17] cmp r0, 0x1 @@ -1924,7 +1924,7 @@ sub_80ECEB4: @ 80ECEB4 b _080ECF4A .pool _080ECF30: - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] cmp r0, 0x1 beq _080ECF48 @@ -2017,7 +2017,7 @@ sub_80ECF5C: @ 80ECF5C strb r0, [r4, 0x13] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x1E] cmp r0, 0x1 @@ -2235,7 +2235,7 @@ _080ED1F6: strb r0, [r6, 0x1B] adds r0, r6, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r6, 0x1D] cmp r0, 0x1 @@ -2344,7 +2344,7 @@ _080ED2B6: bl StringCopy adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r5, 0x3] _080ED2F2: @@ -2444,7 +2444,7 @@ sub_80ED320: @ 80ED320 bl StripExtCtrlCodes adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x1E] mov r2, r8 @@ -2622,7 +2622,7 @@ sub_80ED548: @ 80ED548 strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x18] pop {r4} @@ -2658,7 +2658,7 @@ sub_80ED5B8: @ 80ED5B8 strh r5, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x18] pop {r4,r5} @@ -2742,7 +2742,7 @@ sub_80ED610: @ 80ED610 strh r0, [r5, 0x2] adds r0, r5, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r5, 0xD] cmp r0, 0x1 @@ -2878,7 +2878,7 @@ _080ED72E: strh r3, [r4, 0x16] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x18] _080ED7E4: @@ -3144,7 +3144,7 @@ sub_80ED9A8: @ 80ED9A8 bl StringCopy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x6] _080EDA18: @@ -3255,7 +3255,7 @@ sub_80EDA80: @ 80EDA80 bl StringCopy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0xB] ldr r0, [r7] @@ -3383,7 +3383,7 @@ _080EDC1C: bl StringCopy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0xC] _080EDC40: @@ -3443,7 +3443,7 @@ sub_80EDC60: @ 80EDC60 bl StringCopy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x9] _080EDCCE: @@ -3503,7 +3503,7 @@ sub_80EDCE8: @ 80EDCE8 bl StringCopy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x5] _080EDD56: @@ -3614,7 +3614,7 @@ _080EDE12: bl StringCopy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x8] _080EDE54: @@ -3998,7 +3998,7 @@ sub_80EE104: @ 80EE104 bl sub_80EDFB4 adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0xC] _080EE168: @@ -4153,7 +4153,7 @@ _080EE2B2: _080EE2B6: adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0xE] _080EE2C2: @@ -4213,7 +4213,7 @@ sub_80EE2CC: @ 80EE2CC strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x5] _080EE33A: @@ -4321,7 +4321,7 @@ _080EE408: strh r2, [r4, 0xE] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x11] _080EE426: @@ -4388,7 +4388,7 @@ sub_80EE44C: @ 80EE44C strb r7, [r4, 0x3] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x4] _080EE4BE: @@ -4461,7 +4461,7 @@ sub_80EE4DC: @ 80EE4DC strb r0, [r5, 0x3] adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r5, 0xF] cmp r0, 0x1 @@ -4745,7 +4745,7 @@ sub_80EE72C: @ 80EE72C strh r0, [r4, 0x6] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x8] _080EE79C: @@ -5046,7 +5046,7 @@ _080EEA3C: _080EEA46: adds r0, r7, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r7, 0xC] _080EEA52: @@ -5129,7 +5129,7 @@ _080EEA86: str r4, [r5, 0xC] adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r5, 0x1B] cmp r0, 0x1 @@ -5271,7 +5271,7 @@ sub_80EEBF4: @ 80EEBF4 strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, =gUnknown_82E9531 + ldr r0, =gGameLanguage ldrb r0, [r0] strb r0, [r4, 0x5] _080EEC60: diff --git a/asm/wallclock.s b/asm/wallclock.s index af331dcce..7e1703067 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -610,7 +610,7 @@ _08134D1C: adds r1, r0 adds r4, r1 strh r4, [r5, 0xA] - ldr r2, =gUnknown_030022C0 + ldr r2, =gMain ldrh r0, [r2, 0x2E] movs r3, 0x1 adds r1, r3, 0 @@ -812,7 +812,7 @@ c2_080111BC: @ 8134EE8 cmp r0, 0 bne _08134F02 bl FreeAllWindowBuffers - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _08134F02: @@ -852,7 +852,7 @@ sub_8134F40: @ 8134F40 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_8135130 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -909,7 +909,7 @@ sub_8134FB0: @ 8134FB0 ands r0, r1 cmp r0, 0 bne _08134FC6 - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldr r0, [r0, 0x8] bl SetMainCallback2 _08134FC6: diff --git a/data/main.s b/data/main.s deleted file mode 100644 index 9a5a44dfd..000000000 --- a/data/main.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_82E9530:: @ 82E9530 - .byte 3 - -gUnknown_82E9531:: @ 82E9531 - .byte 2 - - .align 2 -@ compile time - .asciz "2005 02 21 11:10" - - .align 2 -gRomInterruptTable:: @ 82E9548 - .4byte VCountIntr - .4byte SerialIntr - .4byte Timer3Intr - .4byte HBlankIntr - .4byte VBlankIntr - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler diff --git a/include/main.h b/include/main.h new file mode 100644 index 000000000..e5460b3bf --- /dev/null +++ b/include/main.h @@ -0,0 +1,63 @@ +#ifndef GUARD_MAIN_H +#define GUARD_MAIN_H + +#include "global.h" + +typedef void (*MainCallback)(void); +typedef void (*IntrCallback)(void); +typedef void (*IntrFunc)(void); + +struct Main +{ + /*0x000*/ MainCallback callback1; + /*0x004*/ MainCallback callback2; + + /*0x008*/ MainCallback savedCallback; + + /*0x00C*/ IntrCallback vblankCallback; + /*0x010*/ IntrCallback hblankCallback; + /*0x014*/ IntrCallback vcountCallback; + /*0x018*/ IntrCallback serialCallback; + + /*0x01C*/ vu16 intrCheck; + + /*0x020*/ u32 vblankCounter1; + /*0x024*/ u32 vblankCounter2; + + /*0x028*/ u16 heldKeysRaw; // held keys without L=A remapping + /*0x02A*/ u16 newKeysRaw; // newly pressed keys without L=A remapping + /*0x02C*/ u16 heldKeys; // held keys with L=A remapping + /*0x02E*/ u16 newKeys; // newly pressed keys with L=A remapping + /*0x030*/ u16 newAndRepeatedKeys; // newly pressed keys plus key repeat + /*0x032*/ u16 keyRepeatCounter; // counts down to 0, triggering key repeat + /*0x034*/ bool16 watchedKeysPressed; // whether one of the watched keys was pressed + /*0x036*/ u16 watchedKeysMask; // bit mask for watched keys + + /*0x038*/ struct OamData oamBuffer[128]; + + /*0x438*/ u8 state; + + /*0x439*/ u8 oamLoadDisabled:1; + /*0x439*/ u8 inBattle:1; +}; + +extern u8 gUnknown_3001764; +extern struct Main gMain; +extern bool8 gSoftResetDisabled; +extern bool8 gLinkVSyncDisabled; + +extern const u8 gGameVersion; +extern const u8 gGameLanguage; + +void AgbMain(void); +void SetMainCallback2(MainCallback callback); +void InitKeys(void); +void SetVBlankCallback(IntrCallback callback); +void SetHBlankCallback(IntrCallback callback); +void SetVCountCallback(IntrCallback callback); +void SetSerialCallback(IntrCallback callback); +void InitFlashTimer(void); +void DoSoftReset(void); +void ClearPokemonCrySongs(void); + +#endif // GUARD_MAIN_H diff --git a/ld_script.txt b/ld_script.txt index 05f72c340..c35695dbf 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -9,6 +9,8 @@ SECTIONS { ewram (NOLOAD) : ALIGN(4) { + gHeap = .; + . = 0x20000; @@ -39,6 +41,7 @@ SECTIONS { ALIGN(4) { asm/crt0.o(.text); + src/main.o(.text); asm/main.o(.text); src/malloc.o(.text); asm/dma3_manager.o(.text); @@ -251,7 +254,7 @@ SECTIONS { .rodata : ALIGN(4) { - data/main.o(.rodata); + src/main.o(.rodata); data/bg.o(.rodata); data/window.o(.rodata); data/text.o(.rodata); diff --git a/src/main.c b/src/main.c new file mode 100644 index 000000000..ff28b1e84 --- /dev/null +++ b/src/main.c @@ -0,0 +1,380 @@ +#include "global.h" +#include "main.h" +#include "gba/flash_internal.h" +#include "gba/m4a_internal.h" + +extern struct SoundInfo gSoundInfo; +extern u32 gFlashMemoryPresent; +extern u32 IntrMain[]; +extern u8 gHeap[]; +extern struct SaveBlock2 gUnknown_02024A54; +extern char *gUnknown_03005D94; +extern char gUnknown_02029808[]; +extern u32 gUnknown_0203CF5C; + +void Timer3Intr(void); +bool8 HandleLinkConnection(void); +void c2_copyright_1(void); + +static void VBlankIntr(void); +static void HBlankIntr(void); +static void VCountIntr(void); +static void SerialIntr(void); +static void IntrDummy(void); + + +const u8 gGameVersion = VERSION_EMERALD; + +const u8 gGameLanguage = GAME_LANGUAGE; // English + +const char BuildDateTime[] = "2005 02 21 11:10"; + +const IntrFunc gIntrTableTemplate[] = +{ + VCountIntr, // V-count interrupt + SerialIntr, // Serial interrupt + Timer3Intr, // Timer 3 interrupt + HBlankIntr, // H-blank interrupt + VBlankIntr, // V-blank interrupt + IntrDummy, // Timer 0 interrupt + IntrDummy, // Timer 1 interrupt + IntrDummy, // Timer 2 interrupt + IntrDummy, // DMA 0 interrupt + IntrDummy, // DMA 1 interrupt + IntrDummy, // DMA 2 interrupt + IntrDummy, // DMA 3 interrupt + IntrDummy, // Key interrupt + IntrDummy, // Game Pak interrupt +}; + +#define INTR_COUNT ((int)(sizeof(gIntrTableTemplate)/sizeof(IntrFunc))) + +extern u16 gUnknown_03000000; + +extern u16 gKeyRepeatStartDelay; +extern u8 gUnknown_030022B4; +extern struct Main gMain; +extern u16 gKeyRepeatContinueDelay; +extern u8 gSoftResetDisabled; +extern IntrFunc gIntrTable[INTR_COUNT]; +extern bool8 gLinkVSyncDisabled; +extern u32 IntrMain_Buffer[0x200]; +extern u8 gPcmDmaCounter; + +extern u16 gTrainerId; + +EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL; + +static void UpdateLinkAndCallCallbacks(void); +static void InitMainCallbacks(void); +static void CallCallbacks(void); +static void SeedRngWithRtc(void); +static void ReadKeys(void); +static void InitIntrHandlers(void); +static void WaitForVBlank(void); + +#define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON) + +void AgbMain() +{ + RegisterRamReset(RESET_ALL); + *(vu16 *)BG_PLTT = 0x7FFF; + InitGpuRegManager(); + REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; + InitKeys(); + InitIntrHandlers(); + m4aSoundInit(); + EnableVCountIntrAtLine150(); + sub_800E6D0(); + RtcInit(); + CheckForFlashMemory(); + InitMainCallbacks(); + InitMapMusic(); + ClearDma3Requests(); + ResetBgs(); + SetDefaultFontsPointer(); + InitHeap(gHeap, 0x1C000); + + gSoftResetDisabled = FALSE; + + if (gFlashMemoryPresent != TRUE) + SetMainCallback2(NULL); + + gUnknown_030022B4 = 0; + gUnknown_03000000 = 0xFC0; + + for (;;) + { + ReadKeys(); + + if (gSoftResetDisabled == FALSE + && (gMain.heldKeysRaw & A_BUTTON) + && (gMain.heldKeysRaw & B_START_SELECT) == B_START_SELECT) + { + rfu_REQ_stopMode(); + rfu_waitREQComplete(); + DoSoftReset(); + } + + if (sub_8087634() == 1) + { + gUnknown_030022B4 = 1; + UpdateLinkAndCallCallbacks(); + gUnknown_030022B4 = 0; + } + else + { + gUnknown_030022B4 = 0; + UpdateLinkAndCallCallbacks(); + + if (sub_80875C8() == 1) + { + gMain.newKeys = 0; + ClearObjectCopyRequests(); + gUnknown_030022B4 = 1; + UpdateLinkAndCallCallbacks(); + gUnknown_030022B4 = 0; + } + } + + PlayTimeCounter_Update(); + MapMusicMain(); + WaitForVBlank(); + } +} + +static void UpdateLinkAndCallCallbacks(void) +{ + if (!HandleLinkConnection()) + CallCallbacks(); +} + +static void InitMainCallbacks(void) +{ + gMain.vblankCounter1 = 0; + gUnknown_0203CF5C = 0; + gMain.vblankCounter2 = 0; + gMain.callback1 = NULL; + SetMainCallback2(c2_copyright_1); + gSaveBlock2Ptr = &gUnknown_02024A54; + gUnknown_03005D94 = gUnknown_02029808; +} + +static void CallCallbacks(void) +{ + if (gMain.callback1) + gMain.callback1(); + + if (gMain.callback2) + gMain.callback2(); +} + +void SetMainCallback2(MainCallback callback) +{ + gMain.callback2 = callback; + gMain.state = 0; +} + +void StartTimer1(void) +{ + REG_TM1CNT_H = 0x80; +} + +void SeedRngAndSetTrainerId(void) +{ + u16 val = REG_TM1CNT_L; + SeedRng(val); + REG_TM1CNT_H = 0; + gTrainerId = val; +} + +u16 GetTrainerId(void) +{ + return gTrainerId; +} + +/* +void InitKeys(void) +{ + gKeyRepeatContinueDelay = 5; + gKeyRepeatStartDelay = 40; + + gMain.heldKeys = 0; + gMain.newKeys = 0; + gMain.newAndRepeatedKeys = 0; + gMain.heldKeysRaw = 0; + gMain.newKeysRaw = 0; +} + +static void ReadKeys(void) +{ + u16 keyInput = REG_KEYINPUT ^ KEYS_MASK; + gMain.newKeysRaw = keyInput & ~gMain.heldKeysRaw; + gMain.newKeys = gMain.newKeysRaw; + gMain.newAndRepeatedKeys = gMain.newKeysRaw; + + // BUG: Key repeat won't work when pressing L using L=A button mode + // because it compares the raw key input with the remapped held keys. + // Note that newAndRepeatedKeys is never remapped either. + + if (keyInput != 0 && gMain.heldKeys == keyInput) + { + gMain.keyRepeatCounter--; + + if (gMain.keyRepeatCounter == 0) + { + gMain.newAndRepeatedKeys = keyInput; + gMain.keyRepeatCounter = gKeyRepeatContinueDelay; + } + } + else + { + // If there is no input or the input has changed, reset the counter. + gMain.keyRepeatCounter = gKeyRepeatStartDelay; + } + + gMain.heldKeysRaw = keyInput; + gMain.heldKeys = gMain.heldKeysRaw; + + // Remap L to A if the L=A option is enabled. + if (gSaveBlock2.optionsButtonMode == 2) + { + if (gMain.newKeys & L_BUTTON) + gMain.newKeys |= A_BUTTON; + + if (gMain.heldKeys & L_BUTTON) + gMain.heldKeys |= A_BUTTON; + } + + if (gMain.newKeys & gMain.watchedKeysMask) + gMain.watchedKeysPressed = TRUE; +} + +static void InitIntrHandlers(void) +{ + int i; + + for (i = 0; i < INTR_COUNT; i++) + gIntrTable[i] = gIntrTableTemplate[i]; + + DmaCopy32(3, IntrMain, IntrMain_Buffer, sizeof(IntrMain_Buffer)); + + INTR_VECTOR = IntrMain_Buffer; + + SetVBlankCallback(NULL); + SetHBlankCallback(NULL); + SetSerialCallback(NULL); + + REG_IME = 1; + REG_IE = INTR_FLAG_VBLANK; + REG_DISPSTAT = DISPSTAT_VBLANK_INTR; + REG_IE |= INTR_FLAG_VBLANK; +} + +void SetVBlankCallback(IntrCallback callback) +{ + gMain.vblankCallback = callback; +} + +void SetHBlankCallback(IntrCallback callback) +{ + gMain.hblankCallback = callback; +} + +void SetVCountCallback(IntrCallback callback) +{ + gMain.vcountCallback = callback; +} + +void SetSerialCallback(IntrCallback callback) +{ + gMain.serialCallback = callback; +} + +static void VBlankIntr(void) +{ + u16 savedIme; + + if (!gLinkVSyncDisabled) + LinkVSync(); + + savedIme = REG_IME; + REG_IME = 0; + m4aSoundVSync(); + REG_IME = savedIme; + + gMain.vblankCounter1++; + + if (gMain.vblankCallback) + gMain.vblankCallback(); + + gMain.vblankCounter2++; + + gPcmDmaCounter = gSoundInfo.pcmDmaCounter; + + m4aSoundMain(); + sub_800C35C(); + Random(); + + INTR_CHECK |= INTR_FLAG_VBLANK; + gMain.intrCheck |= INTR_FLAG_VBLANK; +} + +void InitFlashTimer(void) +{ + SetFlashTimerIntr(2, gFlashTimerIntrFunc); +} + +static void HBlankIntr(void) +{ + if (gMain.hblankCallback) + gMain.hblankCallback(); + + INTR_CHECK |= INTR_FLAG_HBLANK; + gMain.intrCheck |= INTR_FLAG_HBLANK; +} + +static void VCountIntr(void) +{ + if (gMain.vcountCallback) + gMain.vcountCallback(); + + INTR_CHECK |= INTR_FLAG_VCOUNT; + gMain.intrCheck |= INTR_FLAG_VCOUNT; +} + +static void SerialIntr(void) +{ + if (gMain.serialCallback) + gMain.serialCallback(); + + INTR_CHECK |= INTR_FLAG_SERIAL; + gMain.intrCheck |= INTR_FLAG_SERIAL; +} + +static void IntrDummy(void) +{} + +static void WaitForVBlank(void) +{ + gMain.intrCheck &= ~INTR_FLAG_VBLANK; + VBlankIntrWait(); +} + +void DoSoftReset(void) +{ + REG_IME = 0; + m4aSoundVSyncOff(); + remove_some_task(); + DmaStop(1); + DmaStop(2); + DmaStop(3); + SiiRtcProtect(); + SoftReset(RESET_ALL); +} + +void ClearPokemonCrySongs(void) +{ + CpuFill16(0, gPokemonCrySongs, MAX_POKEMON_CRIES * sizeof(struct PokemonCrySong)); +} +*/ \ No newline at end of file diff --git a/sym_common.txt b/sym_common.txt index 19935ff3c..f93a021cb 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -6,7 +6,7 @@ gUnknown_030022B0: @ 30022B0 gUnknown_030022B4: @ 30022B4 .space 0xC -gUnknown_030022C0: @ 30022C0 +gMain: @ 30022C0 .space 0x2C gUnknown_030022EC: @ 30022EC @@ -24,7 +24,7 @@ gUnknown_030026F8: @ 30026F8 gUnknown_030026FC: @ 30026FC .space 0x4 -gUnknown_03002700: @ 3002700 +gSoftResetDisabled: @ 3002700 .space 0x10 gUnknown_03002710: @ 3002710 @@ -273,7 +273,7 @@ gRngValue: @ 3005D80 gRng2Value: @ 3005D84 .space 0x4 -gUnknown_03005D88: @ 3005D88 +gFlashMemoryPresent: @ 3005D88 .space 0x4 gSaveBlock1Ptr: @ 3005D8C diff --git a/sym_ewram.txt b/sym_ewram.txt index a096d6bfc..a86ee41d4 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1,4 +1,4 @@ -gUnknown_02020000: @ 2020000 +gTrainerId: @ 2020000 .space 0x4 gUnknown_02020004: @ 2020004