diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-04 17:31:44 -0500 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-04 14:31:44 -0800 |
commit | 370c7f78539698902907f262721fe60e606c774d (patch) | |
tree | ca842638903ee4d3badfabd73d1d761e87281d77 /asm | |
parent | 3c1109d03f5e4581336ee870ed710567498e256f (diff) |
more labels (#159)
* labels for tv.c and tv.s
* match function prologue a little bit better
* whoops
* label and document lottery_corner.c
* gSoftResetDisabled
* add labels for main_menu.c
* labels for metatile_behavior.c
Diffstat (limited to 'asm')
-rw-r--r-- | asm/berry_blender.s | 8 | ||||
-rw-r--r-- | asm/cable_club.s | 4 | ||||
-rw-r--r-- | asm/clock.s | 2 | ||||
-rw-r--r-- | asm/decoration.s | 2 | ||||
-rw-r--r-- | asm/field_control_avatar.s | 46 | ||||
-rw-r--r-- | asm/field_effect_helpers.s | 2 | ||||
-rw-r--r-- | asm/field_map_obj.s | 4 | ||||
-rw-r--r-- | asm/field_tasks.s | 8 | ||||
-rw-r--r-- | asm/fldeff_80C5CD4.s | 6 | ||||
-rw-r--r-- | asm/fldeff_cut.s | 2 | ||||
-rw-r--r-- | asm/rom_8080874.s | 2 | ||||
-rw-r--r-- | asm/trade.s | 8 | ||||
-rw-r--r-- | asm/tv.s | 60 |
13 files changed, 77 insertions, 77 deletions
diff --git a/asm/berry_blender.s b/asm/berry_blender.s index affe536ca..def318c24 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -5295,13 +5295,13 @@ _08050D44: ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r1, _08050D6C @ =gUnknown_3001BB4 + ldr r1, _08050D6C @ =gSoftResetDisabled movs r0, 0x1 strb r0, [r1] b _08050E28 .align 2, 0 _08050D68: .4byte gUnknown_03004854 -_08050D6C: .4byte gUnknown_3001BB4 +_08050D6C: .4byte gSoftResetDisabled _08050D70: bl sub_8125E2C ldr r0, _08050D7C @ =gUnknown_03004854 @@ -5389,13 +5389,13 @@ _08050E06: str r0, [r1] cmp r0, 0x5 ble _08050E28 - ldr r1, _08050E24 @ =gUnknown_3001BB4 + ldr r1, _08050E24 @ =gSoftResetDisabled movs r0, 0 strb r0, [r1] movs r0, 0x1 b _08050E2A .align 2, 0 -_08050E24: .4byte gUnknown_3001BB4 +_08050E24: .4byte gSoftResetDisabled _08050E28: movs r0, 0 _08050E2A: diff --git a/asm/cable_club.s b/asm/cable_club.s index b33b19e46..4c9dca6af 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1603,7 +1603,7 @@ sub_8083958: @ 8083958 push {lr} bl call_map_music_set_to_zero bl LoadPlayerParty - bl SavePlayerData + bl SavePlayerBag bl sub_810FEFC ldr r0, _08083990 @ =gSpecialVar_0x8004 ldrh r0, [r0] @@ -1644,7 +1644,7 @@ sub_80839A4: @ 80839A4 bne _080839C0 _080839B8: bl LoadPlayerParty - bl SavePlayerData + bl SavePlayerBag _080839C0: movs r0, 0x7F bl copy_saved_warp2_bank_and_enter_x_to_warp1 diff --git a/asm/clock.s b/asm/clock.s index bf8021dad..a1c162682 100644 --- a/asm/clock.s +++ b/asm/clock.s @@ -88,7 +88,7 @@ sub_806A390: @ 806A390 adds r0, r4, 0 bl sub_810F618 adds r0, r4, 0 - bl sub_8145AA4 + bl SetRandomLotteryNumber ldrh r0, [r5] strh r0, [r6] _0806A3EA: diff --git a/asm/decoration.s b/asm/decoration.s index bf8167329..221c749c5 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -5950,7 +5950,7 @@ _0810104C: lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8057238 + bl MetatileBehavior_IsSecretBasePC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 45cb6b521..7f7c35ce1 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -50,7 +50,7 @@ process_overworld_input: @ 8067F18 bl cur_mapdata_block_role_at_player_pos lsls r0, 24 lsrs r0, 24 - bl sub_8056FFC + bl MetatileBehavior_IsMoveTile lsls r0, 24 lsrs r7, r0, 24 cmp r6, 0x2 @@ -829,7 +829,7 @@ _08068524: _08068538: .4byte gUnknown_081A0009 _0806853C: adds r0, r5, 0 - bl is_tile_x8B + bl MetatileBehavior_IsClosedSootpolisGymDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -851,7 +851,7 @@ _08068554: _08068568: .4byte gUnknown_081A4363 _0806856C: adds r0, r5, 0 - bl is_tile_x87 + bl MetatileBehavior_IsPokeblockFeeder lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -862,7 +862,7 @@ _0806856C: _08068580: .4byte gUnknown_081C346A _08068584: adds r0, r5, 0 - bl is_tile_x8C + bl MetatileBehavior_IsTrickHousePuzzleDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -873,7 +873,7 @@ _08068584: _08068598: .4byte gUnknown_081616E1 _0806859C: adds r0, r5, 0 - bl is_tile_x85 + bl MetatileBehavior_IsRegionMap lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -895,7 +895,7 @@ _080685B4: _080685C8: .4byte Event_RunningShoesManual _080685CC: adds r0, r5, 0 - bl sub_8057930 + bl MetatileBehavior_IsPictureBookShelf lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -906,7 +906,7 @@ _080685CC: _080685E0: .4byte PictureBookShelfScript _080685E4: adds r0, r5, 0 - bl sub_8057944 + bl MetatileBehavior_IsBookShelf lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -917,7 +917,7 @@ _080685E4: _080685F8: .4byte BookshelfScript _080685FC: adds r0, r5, 0 - bl sub_8057958 + bl MetatileBehavior_IsPokeCenterBookShelf lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -928,7 +928,7 @@ _080685FC: _08068610: .4byte PokemonCenterBookshelfScript _08068614: adds r0, r5, 0 - bl sub_805796C + bl MetatileBehavior_IsVase lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -939,7 +939,7 @@ _08068614: _08068628: .4byte VaseScript _0806862C: adds r0, r5, 0 - bl sub_8057980 + bl MetatileBehavior_IsTrashCan lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -950,7 +950,7 @@ _0806862C: _08068640: .4byte TrashCanScript _08068644: adds r0, r5, 0 - bl sub_8057994 + bl MetatileBehavior_IsShopShelf lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -961,7 +961,7 @@ _08068644: _08068658: .4byte ShopShelfScript _0806865C: adds r0, r5, 0 - bl sub_80579A8 + bl MetatileBehavior_IsBlueprint lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -983,7 +983,7 @@ _08068674: cmp r4, r0 bne _080686EC adds r0, r5, 0 - bl sub_8057238 + bl MetatileBehavior_IsSecretBasePC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1234,7 +1234,7 @@ sub_8068870: @ 8068870 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_8057818 + bl MetatileBehavior_IsCrackedFloorHole lsls r0, 24 cmp r0, 0 bne _08068884 @@ -1543,7 +1543,7 @@ sub_8068A64: @ 8068A64 _08068ABC: .4byte gMapHeader _08068AC0: adds r0, r4, 0 - bl sub_8057798 + bl MetatileBehavior_IsLavaridgeB1FWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1553,7 +1553,7 @@ _08068AC0: b _08068B2A _08068AD6: adds r0, r4, 0 - bl is_role_x68 + bl MetatileBehavior_IsLavaridge1FWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1573,7 +1573,7 @@ _08068AEC: b _08068B2A _08068B02: adds r0, r4, 0 - bl sub_8057804 + bl MetatileBehavior_IsMtPyreHole lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1602,7 +1602,7 @@ sub_8068B30: @ 8068B30 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl is_tile_x69_2_warp_door + bl MetatileBehavior_IsWarpDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1620,19 +1620,19 @@ sub_8068B30: @ 8068B30 cmp r0, 0x1 beq _08068BAA adds r0, r4, 0 - bl sub_8056F08 + bl MetatileBehavior_IsNonAnimDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08068BAA adds r0, r4, 0 - bl sub_8057798 + bl MetatileBehavior_IsLavaridgeB1FWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08068BAA adds r0, r4, 0 - bl is_role_x68 + bl MetatileBehavior_IsLavaridge1FWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1644,7 +1644,7 @@ sub_8068B30: @ 8068B30 cmp r0, 0x1 beq _08068BAA adds r0, r4, 0 - bl sub_8057804 + bl MetatileBehavior_IsMtPyreHole lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1820,7 +1820,7 @@ map_warp_consider_2_to_inside: @ 8068CA8 _08068CDC: .4byte gMapHeader _08068CE0: adds r0, r4, 0 - bl is_tile_x69_2_warp_door + bl MetatileBehavior_IsWarpDoor lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 68a1b02c9..9df9dfd8d 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -715,7 +715,7 @@ _08126D3E: cmp r0, r1 bne _08126DBC ldrb r0, [r4, 0x1E] - bl sub_8056E14 + bl MetatileBehavior_IsPokeGrass lsls r0, 24 cmp r0, 0 bne _08126DBC diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 0ab1e117c..348e1d0f3 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -10911,7 +10911,7 @@ _0805F950: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r3, _0805F984 @ =sub_8056E14 + ldr r3, _0805F984 @ =MetatileBehavior_IsPokeGrass ldr r4, [r4] adds r0, r6, 0 adds r1, r7, 0 @@ -10924,7 +10924,7 @@ _0805F978: bx r1 .align 2, 0 _0805F980: .4byte gUnknown_08375594 -_0805F984: .4byte sub_8056E14 +_0805F984: .4byte MetatileBehavior_IsPokeGrass thumb_func_end mss_08062EA4 thumb_func_start FieldObjectCB_TreeDisguise diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 738b02f3e..c879ebf63 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -1361,7 +1361,7 @@ _08069E4A: lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl sub_8057540 + bl MetatileBehavior_IsThinIce lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1377,7 +1377,7 @@ _08069E4A: _08069E8C: .4byte 0x00004022 _08069E90: adds r0, r4, 0 - bl sub_8057554 + bl MetatileBehavior_IsCrackedIce lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1676,7 +1676,7 @@ _0806A0EE: lsls r0, r6, 24 lsrs r6, r0, 24 adds r0, r6, 0 - bl sub_8057818 + bl MetatileBehavior_IsCrackedFloorHole lsls r0, 24 cmp r0, 0 beq _0806A106 @@ -1704,7 +1704,7 @@ _0806A122: ldrh r0, [r4] strh r0, [r5, 0x6] adds r0, r6, 0 - bl sub_805782C + bl MetatileBehavior_IsCrackedFloor lsls r0, 24 cmp r0, 0 beq _0806A182 diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s index cab7524b2..4214f8f9e 100644 --- a/asm/fldeff_80C5CD4.s +++ b/asm/fldeff_80C5CD4.s @@ -808,7 +808,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_80571EC + bl MetatileBehavior_IsSecretBaseCave lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -829,7 +829,7 @@ _080C6328: .4byte gUnknown_03005CE4 _080C632C: .4byte sub_80C639C _080C6330: adds r0, r4, 0 - bl sub_805720C + bl MetatileBehavior_IsSecretBaseTree lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -848,7 +848,7 @@ _080C6358: .4byte gUnknown_03005CE4 _080C635C: .4byte sub_80C64A8 _080C6360: adds r0, r4, 0 - bl is_tile_x98 + bl MetatileBehavior_IsSecretBaseShrub lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 530e8034f..0033c77cd 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -68,7 +68,7 @@ _080A2552: lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8056E14 + bl MetatileBehavior_IsPokeGrass lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/rom_8080874.s b/asm/rom_8080874.s index de7dce157..77dad9f9e 100644 --- a/asm/rom_8080874.s +++ b/asm/rom_8080874.s @@ -357,7 +357,7 @@ sub_8080AE4: @ 8080AE4 _08080B18: .4byte sub_8080B9C _08080B1C: adds r0, r4, 0 - bl sub_8056F08 + bl MetatileBehavior_IsNonAnimDoor lsls r0, 24 lsrs r0, 24 ldr r1, _08080B40 @ =task_map_chg_seq_0807E2CC diff --git a/asm/trade.s b/asm/trade.s index 5586db4c8..340d95606 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -10676,11 +10676,11 @@ _0804D5A4: .4byte 0x0000043c _0804D5A8: movs r0, 0x4 strb r0, [r1] - ldr r1, _0804D5B4 @ =gUnknown_3001BB4 + ldr r1, _0804D5B4 @ =gSoftResetDisabled movs r0, 0x1 b _0804D612 .align 2, 0 -_0804D5B4: .4byte gUnknown_3001BB4 +_0804D5B4: .4byte gSoftResetDisabled _0804D5B8: ldr r0, _0804D5F4 @ =gUnknown_03005E94 ldr r1, _0804D5F8 @ =sub_804DC88 @@ -11886,7 +11886,7 @@ _0804E04C: cmp r0, 0 beq _0804E11A bl sub_8125E04 - ldr r1, _0804E06C @ =gUnknown_3001BB4 + ldr r1, _0804E06C @ =gSoftResetDisabled movs r0, 0 strb r0, [r1] ldr r0, _0804E070 @ =gMain @@ -11896,7 +11896,7 @@ _0804E04C: strb r1, [r0] b _0804E11A .align 2, 0 -_0804E06C: .4byte gUnknown_3001BB4 +_0804E06C: .4byte gSoftResetDisabled _0804E070: .4byte gMain _0804E074: .4byte 0x0000043c _0804E078: @@ -2225,7 +2225,7 @@ _080BED00: asrs r0, 24 cmp r0, 0x13 bgt _080BED40 - ldr r1, _080BED3C @ =gUnknown_083D1444 + ldr r1, _080BED3C @ =gTVNewsTextGroup2 subs r2, 0x1 b _080BED44 .align 2, 0 @@ -2233,9 +2233,9 @@ _080BED2C: .4byte gSaveBlock1 _080BED30: .4byte 0x00002abe _080BED34: .4byte 0x00002abd _080BED38: .4byte gLocalTime -_080BED3C: .4byte gUnknown_083D1444 +_080BED3C: .4byte gTVNewsTextGroup2 _080BED40: - ldr r1, _080BED54 @ =gUnknown_083D1454 + ldr r1, _080BED54 @ =gTVNewsTextGroup3 ldr r2, _080BED58 @ =0x00002abc _080BED44: adds r0, r4, r2 @@ -2246,7 +2246,7 @@ _080BED44: bl ShowFieldMessage b _080BED82 .align 2, 0 -_080BED54: .4byte gUnknown_083D1454 +_080BED54: .4byte gTVNewsTextGroup3 _080BED58: .4byte 0x00002abc _080BED5C: ldrh r1, [r1] @@ -2258,7 +2258,7 @@ _080BED5C: adds r1, r4, r0 movs r0, 0 strb r0, [r1] - ldr r1, _080BED98 @ =gUnknown_083D1434 + ldr r1, _080BED98 @ =gTVNewsTextGroup1 ldr r2, _080BED9C @ =0x00002abc adds r0, r4, r2 ldrb r0, [r0] @@ -2277,7 +2277,7 @@ _080BED86: .align 2, 0 _080BED90: .4byte gStringVar1 _080BED94: .4byte 0x00002abd -_080BED98: .4byte gUnknown_083D1434 +_080BED98: .4byte gTVNewsTextGroup1 _080BED9C: .4byte 0x00002abc _080BEDA0: .4byte gScriptResult thumb_func_end sub_80BECE8 @@ -6112,7 +6112,7 @@ _080C0B74: _080C0B78: strb r0, [r1] _080C0B7A: - ldr r0, _080C0B98 @ =gUnknown_083D1524 + ldr r0, _080C0B98 @ =gTVBravoTrainerTextGroup lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -6124,7 +6124,7 @@ _080C0B7A: _080C0B8C: .4byte gStringVar1 _080C0B90: .4byte gSpeciesNames _080C0B94: .4byte gUnknown_020387E8 -_080C0B98: .4byte gUnknown_083D1524 +_080C0B98: .4byte gTVBravoTrainerTextGroup thumb_func_end DoTVShowBravoTrainerPokemonProfile thumb_func_start DoTVShowBravoTrainerBattleTowerProfile @@ -6385,7 +6385,7 @@ _080C0DC0: bl StringCopy bl TVShowDone _080C0DDE: - ldr r0, _080C0DFC @ =gUnknown_083D1548 + ldr r0, _080C0DFC @ =gTVBravoTrainerBattleTowerTextGroup lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -6397,7 +6397,7 @@ _080C0DDE: _080C0DF0: .4byte gStringVar1 _080C0DF4: .4byte gStringVar2 _080C0DF8: .4byte gSpeciesNames -_080C0DFC: .4byte gUnknown_083D1548 +_080C0DFC: .4byte gTVBravoTrainerBattleTowerTextGroup thumb_func_end DoTVShowBravoTrainerBattleTowerProfile thumb_func_start DoTVShowTodaysSmartShopper @@ -6640,7 +6640,7 @@ _080C1004: bl TVShowConvertInternationalString bl TVShowDone _080C1014: - ldr r0, _080C102C @ =gUnknown_083D14F0 + ldr r0, _080C102C @ =gTVSmartShopperTextGroup lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -6650,7 +6650,7 @@ _080C1014: bx r0 .align 2, 0 _080C1028: .4byte gStringVar1 -_080C102C: .4byte gUnknown_083D14F0 +_080C102C: .4byte gTVSmartShopperTextGroup thumb_func_end DoTVShowTodaysSmartShopper thumb_func_start DoTVShowTheNameRaterShow @@ -7024,7 +7024,7 @@ _080C1370: bl TVShowConvertInternationalString bl TVShowDone _080C138A: - ldr r0, _080C13A8 @ =gUnknown_083D1584 + ldr r0, _080C13A8 @ =gTVNameRaterTextGroup lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -7036,7 +7036,7 @@ _080C138A: .align 2, 0 _080C13A0: .4byte gStringVar1 _080C13A4: .4byte gStringVar2 -_080C13A8: .4byte gUnknown_083D1584 +_080C13A8: .4byte gTVNameRaterTextGroup thumb_func_end DoTVShowTheNameRaterShow thumb_func_start DoTVShowPokemonTodaySuccessfulCapture @@ -7280,7 +7280,7 @@ _080C15D4: .4byte gUnknown_020387E8 _080C15D8: bl TVShowDone _080C15DC: - ldr r0, _080C15F0 @ =gUnknown_083D14C0 + ldr r0, _080C15F0 @ =gTVPokemonTodayTextGroup lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -7289,7 +7289,7 @@ _080C15DC: pop {r0} bx r0 .align 2, 0 -_080C15F0: .4byte gUnknown_083D14C0 +_080C15F0: .4byte gTVPokemonTodayTextGroup thumb_func_end DoTVShowPokemonTodaySuccessfulCapture thumb_func_start DoTVShowPokemonTodayFailedCapture @@ -7437,7 +7437,7 @@ _080C1734: .4byte gUnknown_020387E8 _080C1738: bl TVShowDone _080C173C: - ldr r0, _080C1750 @ =gUnknown_083D15D0 + ldr r0, _080C1750 @ =gTVPokemonTodayFailedCaptureTextGroup lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -7446,7 +7446,7 @@ _080C173C: pop {r0} bx r0 .align 2, 0 -_080C1750: .4byte gUnknown_083D15D0 +_080C1750: .4byte gTVPokemonTodayFailedCaptureTextGroup thumb_func_end DoTVShowPokemonTodayFailedCapture thumb_func_start DoTVShowPokemonFanClubLetter @@ -7649,7 +7649,7 @@ _080C193C: _080C1958: .4byte gStringVar4 _080C195C: .4byte gUnknown_020387E8 _080C1960: - ldr r0, _080C1974 @ =gUnknown_083D1470 + ldr r0, _080C1974 @ =gTVFanClubTextGroup lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -7659,7 +7659,7 @@ _080C196C: pop {r0} bx r0 .align 2, 0 -_080C1974: .4byte gUnknown_083D1470 +_080C1974: .4byte gTVFanClubTextGroup thumb_func_end DoTVShowPokemonFanClubLetter thumb_func_start DoTVShowRecentHappenings @@ -7796,7 +7796,7 @@ _080C1ACC: _080C1AE8: .4byte gStringVar4 _080C1AEC: .4byte gUnknown_020387E8 _080C1AF0: - ldr r0, _080C1B04 @ =gUnknown_083D1490 + ldr r0, _080C1B04 @ =gTVRecentHappeningsTextGroup lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -7806,7 +7806,7 @@ _080C1AFC: pop {r0} bx r0 .align 2, 0 -_080C1B04: .4byte gUnknown_083D1490 +_080C1B04: .4byte gTVRecentHappeningsTextGroup thumb_func_end DoTVShowRecentHappenings thumb_func_start DoTVShowPokemonFanClubOpinions @@ -7900,7 +7900,7 @@ _080C1BC0: bl sub_80EB3FC bl TVShowDone _080C1BD6: - ldr r0, _080C1BF0 @ =gUnknown_083D14A8 + ldr r0, _080C1BF0 @ =gTVFanClubOpinionsTextGroup lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -7911,7 +7911,7 @@ _080C1BD6: .align 2, 0 _080C1BE8: .4byte gStringVar1 _080C1BEC: .4byte gStringVar3 -_080C1BF0: .4byte gUnknown_083D14A8 +_080C1BF0: .4byte gTVFanClubOpinionsTextGroup thumb_func_end DoTVShowPokemonFanClubOpinions thumb_func_start nullsub_22 @@ -8108,7 +8108,7 @@ _080C1DB6: strb r0, [r1] bl TakeTVShowInSearchOfTrainersOffTheAir _080C1DF8: - ldr r0, _080C1E34 @ =gUnknown_083D1600 + ldr r0, _080C1E34 @ =gTVGabbyAndTyTextGroup lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -8127,7 +8127,7 @@ _080C1E24: .4byte gStringVar3 _080C1E28: .4byte 0x00002b12 _080C1E2C: .4byte gScriptResult _080C1E30: .4byte gUnknown_020387E8 -_080C1E34: .4byte gUnknown_083D1600 +_080C1E34: .4byte gTVGabbyAndTyTextGroup thumb_func_end DoTVShowInSearchOfTrainers thumb_func_start DoTVShowPokemonAngler @@ -8209,7 +8209,7 @@ _080C1EBC: bl sub_80BF088 bl TVShowDone _080C1EE4: - ldr r0, _080C1F04 @ =gUnknown_083D15EC + ldr r0, _080C1F04 @ =gTVFishingGuruAdviceTextGroup lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -8221,7 +8221,7 @@ _080C1EE4: _080C1EF8: .4byte gStringVar1 _080C1EFC: .4byte gStringVar2 _080C1F00: .4byte gSpeciesNames -_080C1F04: .4byte gUnknown_083D15EC +_080C1F04: .4byte gTVFishingGuruAdviceTextGroup thumb_func_end DoTVShowPokemonAngler thumb_func_start DoTVShowTheWorldOfMasters @@ -8305,7 +8305,7 @@ _080C1F8C: bl StringCopy bl TVShowDone _080C1FB6: - ldr r0, _080C1FD8 @ =gUnknown_083D15F4 + ldr r0, _080C1FD8 @ =gTVWorldOfMastersTextGroup lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -8318,7 +8318,7 @@ _080C1FC8: .4byte gStringVar1 _080C1FCC: .4byte gStringVar2 _080C1FD0: .4byte gStringVar3 _080C1FD4: .4byte gSpeciesNames -_080C1FD8: .4byte gUnknown_083D15F4 +_080C1FD8: .4byte gTVWorldOfMastersTextGroup thumb_func_end DoTVShowTheWorldOfMasters |