dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup and documentation of teachy_tv

Browse Source
This commit is contained in:
PikalaxALT
2019-06-11 10:11:23 -04:00
parent 9b58695341
commit 75a89830a9
28 changed files with 562 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+2 -2
View File
@@ -517,7 +517,7 @@ _0800F5C8: .4byte 0x00006001
thumb_func_start sub_800F5CC
sub_800F5CC: @ 800F5CC
push {lr}
ldr r0, _0800F5E0 @ =gUnknown_2023E8A
ldr r0, _0800F5E0 @ =gBattleOutcome
ldrb r2, [r0]
cmp r2, 0x3
bne _0800F5E8
@@ -526,7 +526,7 @@ sub_800F5CC: @ 800F5CC
bl sub_80D87BC
b _0800F6F0
.align 2, 0
_0800F5E0: .4byte gUnknown_2023E8A
_0800F5E0: .4byte gBattleOutcome
_0800F5E4: .4byte gUnknown_83FE883
_0800F5E8:
ldr r0, _0800F61C @ =gBattleTypeFlags
asm/battle_2.s
+27 -27
View File
@@ -2376,7 +2376,7 @@ sub_8011100: @ 8011100
cmp r0, 0
beq _08011158
ldr r2, _08011168 @ =gSpecialVar_Result
ldr r1, _0801116C @ =gUnknown_2023E8A
ldr r1, _0801116C @ =gBattleOutcome
movs r0, 0x3
strb r0, [r1]
movs r0, 0x3
@@ -2399,7 +2399,7 @@ _08011158:
_08011160: .4byte gMain
_08011164: .4byte gBattleTypeFlags
_08011168: .4byte gSpecialVar_Result
_0801116C: .4byte gUnknown_2023E8A
_0801116C: .4byte gBattleOutcome
_08011170: .4byte CB2_QuitRecordedBattle
thumb_func_end sub_8011100
@@ -4966,7 +4966,7 @@ _08012522:
strb r0, [r2, 0x1D]
ldr r0, _08012724 @ =gUnknown_2023D72
strb r1, [r0]
ldr r2, _08012728 @ =gUnknown_2023E8A
ldr r2, _08012728 @ =gBattleOutcome
strb r1, [r2]
ldr r0, _0801272C @ =gUnknown_2023BC8
str r1, [r0]
@@ -5194,7 +5194,7 @@ _08012718: .4byte 0x00010002
_0801271C: .4byte gSaveBlock2Ptr
_08012720: .4byte gBattleScripting
_08012724: .4byte gUnknown_2023D72
_08012728: .4byte gUnknown_2023E8A
_08012728: .4byte gBattleOutcome
_0801272C: .4byte gUnknown_2023BC8
_08012730: .4byte gUnknown_2023E7E
_08012734: .4byte gUnknown_2023E82
@@ -7783,7 +7783,7 @@ sub_8013BD4: @ 8013BD4
push {r5-r7}
movs r0, 0x1
bl TurnValuesCleanUp
ldr r0, _08013C78 @ =gUnknown_2023E8A
ldr r0, _08013C78 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0
bne _08013C04
@@ -7844,7 +7844,7 @@ _08013C58:
subs r0, 0x1
cmp r0, r1
bge _08013C58
ldr r0, _08013C78 @ =gUnknown_2023E8A
ldr r0, _08013C78 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0
beq _08013CB0
@@ -7856,7 +7856,7 @@ _08013C58:
str r0, [r1]
b _08013D20
.align 2, 0
_08013C78: .4byte gUnknown_2023E8A
_08013C78: .4byte gBattleOutcome
_08013C7C: .4byte gBattleStruct
_08013C80: .4byte gUnknown_2023DD0
_08013C84: .4byte 0xfffffdff
@@ -10971,7 +10971,7 @@ _080155C4: .4byte gBattleResources
thumb_func_start RunTurnActionsFunctions
RunTurnActionsFunctions: @ 80155C8
push {r4-r6,lr}
ldr r6, _0801561C @ =gUnknown_2023E8A
ldr r6, _0801561C @ =gBattleOutcome
ldrb r0, [r6]
ldr r2, _08015620 @ =gUnknown_2023BE3
cmp r0, 0
@@ -11012,7 +11012,7 @@ _080155D8:
str r0, [r3]
b _0801565C
.align 2, 0
_0801561C: .4byte gUnknown_2023E8A
_0801561C: .4byte gBattleOutcome
_08015620: .4byte gUnknown_2023BE3
_08015624: .4byte gBattleStruct
_08015628: .4byte gUnknown_2023BE2
@@ -11058,7 +11058,7 @@ sub_8015670: @ 8015670
cmp r0, 0
beq _080156C4
ldr r1, _080156B0 @ =gBattleTextBuff1
ldr r4, _080156B4 @ =gUnknown_2023E8A
ldr r4, _080156B4 @ =gBattleOutcome
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
@@ -11077,7 +11077,7 @@ sub_8015670: @ 8015670
_080156A8: .4byte gUnknown_2023BE3
_080156AC: .4byte gBattleTypeFlags
_080156B0: .4byte gBattleTextBuff1
_080156B4: .4byte gUnknown_2023E8A
_080156B4: .4byte gBattleOutcome
_080156B8: .4byte sBattler_AI
_080156BC: .4byte gUnknown_2023D74
_080156C0: .4byte gUnknown_81D88CC
@@ -11181,7 +11181,7 @@ sub_801578C: @ 801578C
cmp r0, 0
beq _080157E0
ldr r1, _080157CC @ =gBattleTextBuff1
ldr r4, _080157D0 @ =gUnknown_2023E8A
ldr r4, _080157D0 @ =gBattleOutcome
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
@@ -11200,7 +11200,7 @@ sub_801578C: @ 801578C
_080157C4: .4byte gUnknown_2023BE3
_080157C8: .4byte gBattleTypeFlags
_080157CC: .4byte gBattleTextBuff1
_080157D0: .4byte gUnknown_2023E8A
_080157D0: .4byte gBattleOutcome
_080157D4: .4byte sBattler_AI
_080157D8: .4byte gUnknown_2023D74
_080157DC: .4byte gUnknown_81D88CC
@@ -11496,7 +11496,7 @@ sub_8015A30: @ 8015A30
ldrb r0, [r0]
cmp r0, 0
beq _08015A52
ldr r0, _08015A60 @ =gUnknown_2023E8A
ldr r0, _08015A60 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _08015A6C
@@ -11507,7 +11507,7 @@ _08015A52:
.align 2, 0
_08015A58: .4byte gPaletteFade
_08015A5C: .4byte gUnknown_3004FD4
_08015A60: .4byte gUnknown_2023E8A
_08015A60: .4byte gBattleOutcome
_08015A64: .4byte gUnknown_3004F84
_08015A68: .4byte ReturnFromBattleToOverworld
_08015A6C:
@@ -11653,7 +11653,7 @@ _08015B74:
bne _08015BD4
_08015B86:
ldr r1, _08015BE8 @ =gSpecialVar_Result
ldr r5, _08015BEC @ =gUnknown_2023E8A
ldr r5, _08015BEC @ =gBattleOutcome
ldrb r0, [r5]
strh r0, [r1]
ldr r3, _08015BF0 @ =gMain
@@ -11698,7 +11698,7 @@ _08015BDC: .4byte gBattleTypeFlags
_08015BE0: .4byte gPlayerParty
_08015BE4: .4byte gReceivedRemoteLinkPlayers
_08015BE8: .4byte gSpecialVar_Result
_08015BEC: .4byte gUnknown_2023E8A
_08015BEC: .4byte gBattleOutcome
_08015BF0: .4byte gMain
_08015BF4: .4byte 0x00000439
_08015BF8: .4byte gUnknown_3004F80
@@ -13212,7 +13212,7 @@ _0801687A:
ldr r0, _0801689C @ =gBattlersCount
ldrb r0, [r0]
strb r0, [r1]
ldr r1, _080168A0 @ =gUnknown_2023E8A
ldr r1, _080168A0 @ =gBattleOutcome
movs r0, 0x4
strb r0, [r1]
_0801688C:
@@ -13224,7 +13224,7 @@ _0801688C:
_08016894: .4byte gBattleStruct
_08016898: .4byte gUnknown_2023BE2
_0801689C: .4byte gBattlersCount
_080168A0: .4byte gUnknown_2023E8A
_080168A0: .4byte gBattleOutcome
thumb_func_end sub_8016748
thumb_func_start sub_80168A4
@@ -13254,7 +13254,7 @@ sub_80168A4: @ 80168A4
beq _08016938
adds r4, r2, 0
ldr r6, _0801690C @ =gUnknown_2023D7C
ldr r5, _08016910 @ =gUnknown_2023E8A
ldr r5, _08016910 @ =gBattleOutcome
_080168D8:
ldrb r0, [r4]
bl GetBattlerSide
@@ -13277,7 +13277,7 @@ _08016900: .4byte gBattleTypeFlags
_08016904: .4byte gBattlersCount
_08016908: .4byte gActiveBattler
_0801690C: .4byte gUnknown_2023D7C
_08016910: .4byte gUnknown_2023E8A
_08016910: .4byte gBattleOutcome
_08016914:
ldrb r0, [r4]
adds r0, r6
@@ -13300,7 +13300,7 @@ _08016926:
cmp r0, r1
bcc _080168D8
_08016938:
ldr r0, _08016948 @ =gUnknown_2023E8A
ldr r0, _08016948 @ =gBattleOutcome
ldrb r1, [r0]
movs r2, 0x80
orrs r1, r2
@@ -13308,7 +13308,7 @@ _08016938:
b _080169D8
.align 2, 0
_08016944: .4byte gBattlersCount
_08016948: .4byte gUnknown_2023E8A
_08016948: .4byte gBattleOutcome
_0801694C:
ldrb r0, [r4]
bl GetBattlerSide
@@ -13368,7 +13368,7 @@ _080169CC:
ldr r0, _080169E0 @ =gBattlersCount
ldrb r0, [r0]
strb r0, [r5]
ldr r1, _080169E4 @ =gUnknown_2023E8A
ldr r1, _080169E4 @ =gBattleOutcome
movs r0, 0x6
_080169D6:
strb r0, [r1]
@@ -13378,7 +13378,7 @@ _080169D8:
bx r0
.align 2, 0
_080169E0: .4byte gBattlersCount
_080169E4: .4byte gUnknown_2023E8A
_080169E4: .4byte gBattleOutcome
thumb_func_end sub_80168A4
thumb_func_start sub_80169E8
@@ -13690,7 +13690,7 @@ HandleAction_SafriZoneRun: @ 8016C60
ldr r0, _08016C94 @ =gBattlersCount
ldrb r0, [r0]
strb r0, [r4]
ldr r1, _08016C98 @ =gUnknown_2023E8A
ldr r1, _08016C98 @ =gBattleOutcome
movs r0, 0x4
strb r0, [r1]
pop {r4}
@@ -13701,7 +13701,7 @@ _08016C88: .4byte sBattler_AI
_08016C8C: .4byte gUnknown_2023BDE
_08016C90: .4byte gUnknown_2023BE2
_08016C94: .4byte gBattlersCount
_08016C98: .4byte gUnknown_2023E8A
_08016C98: .4byte gBattleOutcome
thumb_func_end HandleAction_SafriZoneRun
thumb_func_start HandleAction_Action9
asm/battle_controller_link_opponent.s
+4 -4
View File
@@ -6218,15 +6218,15 @@ RecordedOpponentHandleCmd55: @ 803D914
ldrb r2, [r0]
cmp r2, 0x3
bne _0803D93C
ldr r0, _0803D938 @ =gUnknown_2023E8A
ldr r0, _0803D938 @ =gBattleOutcome
strb r2, [r0]
b _0803D944
.align 2, 0
_0803D930: .4byte gUnknown_2022BC4
_0803D934: .4byte gActiveBattler
_0803D938: .4byte gUnknown_2023E8A
_0803D938: .4byte gBattleOutcome
_0803D93C:
ldr r0, _0803D968 @ =gUnknown_2023E8A
ldr r0, _0803D968 @ =gBattleOutcome
movs r1, 0x3
eors r1, r2
strb r1, [r0]
@@ -6246,7 +6246,7 @@ _0803D944:
pop {r0}
bx r0
.align 2, 0
_0803D968: .4byte gUnknown_2023E8A
_0803D968: .4byte gBattleOutcome
_0803D96C: .4byte gUnknown_3004FE0
_0803D970: .4byte gActiveBattler
_0803D974: .4byte sub_802F6A8
asm/battle_controller_link_partner.s
+2 -2
View File
@@ -5890,7 +5890,7 @@ sub_80D7218: @ 80D7218
thumb_func_start LinkPartnerHandlecmd55
LinkPartnerHandlecmd55: @ 80D7224
push {r4,lr}
ldr r2, _080D725C @ =gUnknown_2023E8A
ldr r2, _080D725C @ =gBattleOutcome
ldr r1, _080D7260 @ =gUnknown_2022BC4
ldr r4, _080D7264 @ =gActiveBattler
ldrb r0, [r4]
@@ -5914,7 +5914,7 @@ LinkPartnerHandlecmd55: @ 80D7224
pop {r0}
bx r0
.align 2, 0
_080D725C: .4byte gUnknown_2023E8A
_080D725C: .4byte gBattleOutcome
_080D7260: .4byte gUnknown_2022BC4
_080D7264: .4byte gActiveBattler
_080D7268: .4byte gUnknown_3004FE0
asm/battle_controller_oak.s
+2 -2
View File
@@ -7435,7 +7435,7 @@ sub_80EB274: @ 80EB274
thumb_func_start sub_80EB280
sub_80EB280: @ 80EB280
push {r4,lr}
ldr r2, _080EB2C4 @ =gUnknown_2023E8A
ldr r2, _080EB2C4 @ =gBattleOutcome
ldr r1, _080EB2C8 @ =gUnknown_2022BC4
ldr r4, _080EB2CC @ =gActiveBattler
ldrb r0, [r4]
@@ -7466,7 +7466,7 @@ _080EB2BC:
pop {r0}
bx r0
.align 2, 0
_080EB2C4: .4byte gUnknown_2023E8A
_080EB2C4: .4byte gBattleOutcome
_080EB2C8: .4byte gUnknown_2022BC4
_080EB2CC: .4byte gActiveBattler
_080EB2D0: .4byte gBattleTypeFlags
asm/battle_controller_player.s
+2 -2
View File
@@ -10671,7 +10671,7 @@ _08033A74: .4byte gUnknown_2023FFC
thumb_func_start PlayerHandlecmd55
PlayerHandlecmd55: @ 8033A78
push {r4,lr}
ldr r2, _08033AB0 @ =gUnknown_2023E8A
ldr r2, _08033AB0 @ =gBattleOutcome
ldr r1, _08033AB4 @ =gUnknown_2022BC4
ldr r4, _08033AB8 @ =gActiveBattler
ldrb r0, [r4]
@@ -10695,7 +10695,7 @@ PlayerHandlecmd55: @ 8033A78
pop {r0}
bx r0
.align 2, 0
_08033AB0: .4byte gUnknown_2023E8A
_08033AB0: .4byte gBattleOutcome
_08033AB4: .4byte gUnknown_2022BC4
_08033AB8: .4byte gActiveBattler
_08033ABC: .4byte gUnknown_3004FE0
asm/battle_controller_pokedude.s
+2 -2
View File
@@ -6700,7 +6700,7 @@ sub_81597B8: @ 81597B8
thumb_func_start sub_81597C4
sub_81597C4: @ 81597C4
push {r4,lr}
ldr r2, _08159808 @ =gUnknown_2023E8A
ldr r2, _08159808 @ =gBattleOutcome
ldr r1, _0815980C @ =gUnknown_2022BC4
ldr r4, _08159810 @ =gActiveBattler
ldrb r0, [r4]
@@ -6731,7 +6731,7 @@ _08159800:
pop {r0}
bx r0
.align 2, 0
_08159808: .4byte gUnknown_2023E8A
_08159808: .4byte gBattleOutcome
_0815980C: .4byte gUnknown_2022BC4
_08159810: .4byte gActiveBattler
_08159814: .4byte gBattleTypeFlags
asm/battle_controller_safari.s
+2 -2
View File
@@ -1487,7 +1487,7 @@ sub_80DE048: @ 80DE048
thumb_func_start SafariHandleCmd55
SafariHandleCmd55: @ 80DE054
push {r4,lr}
ldr r2, _080DE098 @ =gUnknown_2023E8A
ldr r2, _080DE098 @ =gBattleOutcome
ldr r1, _080DE09C @ =gUnknown_2022BC4
ldr r4, _080DE0A0 @ =gActiveBattler
ldrb r0, [r4]
@@ -1518,7 +1518,7 @@ _080DE090:
pop {r0}
bx r0
.align 2, 0
_080DE098: .4byte gUnknown_2023E8A
_080DE098: .4byte gBattleOutcome
_080DE09C: .4byte gUnknown_2022BC4
_080DE0A0: .4byte gActiveBattler
_080DE0A4: .4byte gBattleTypeFlags
asm/battle_controllers.s
+2 -2
View File
@@ -2176,7 +2176,7 @@ EmitPrintString: @ 800E2D4
ldr r2, _0800E3B4 @ =gUnknown_2022874
movs r0, 0x10
strb r0, [r2]
ldr r0, _0800E3B8 @ =gUnknown_2023E8A
ldr r0, _0800E3B8 @ =gBattleOutcome
ldrb r0, [r0]
strb r0, [r2, 0x1]
strb r1, [r2, 0x2]
@@ -2277,7 +2277,7 @@ _0800E378:
bx r0
.align 2, 0
_0800E3B4: .4byte gUnknown_2022874
_0800E3B8: .4byte gUnknown_2023E8A
_0800E3B8: .4byte gBattleOutcome
_0800E3BC: .4byte gCurrentMove
_0800E3C0: .4byte gUnknown_2023D4C
_0800E3C4: .4byte gUnknown_2023D68
asm/battle_records.s
+4 -4
View File
@@ -925,7 +925,7 @@ _080CD94C: .4byte 0x0000270f
sub_80CD950: @ 80CD950
push {r4,lr}
adds r4, r0, 0
ldr r0, _080CD964 @ =gUnknown_2023E8A
ldr r0, _080CD964 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _080CD968
@@ -933,7 +933,7 @@ sub_80CD950: @ 80CD950
beq _080CD976
b _080CD984
.align 2, 0
_080CD964: .4byte gUnknown_2023E8A
_080CD964: .4byte gBattleOutcome
_080CD968:
eors r0, r4
bl sub_80CD8F8
@@ -978,7 +978,7 @@ sub_80CD98C: @ 80CD98C
subs r3, 0x30
adds r2, r3
ldrh r2, [r2, 0xE]
ldr r3, _080CD9EC @ =gUnknown_2023E8A
ldr r3, _080CD9EC @ =gBattleOutcome
ldrb r3, [r3]
ldr r5, _080CD9F0 @ =gLinkPlayers
lsls r4, r6, 3
@@ -998,7 +998,7 @@ _080CD9DC: .4byte gSaveBlock1Ptr
_080CD9E0: .4byte gSaveBlock2Ptr
_080CD9E4: .4byte 0x00000a98
_080CD9E8: .4byte gUnknown_2039654
_080CD9EC: .4byte gUnknown_2023E8A
_080CD9EC: .4byte gBattleOutcome
_080CD9F0: .4byte gLinkPlayers
thumb_func_end sub_80CD98C
asm/battle_script_commands.s
+9 -9
View File
@@ -12,7 +12,7 @@ atk00_attackcanceler: @ 801D760
mov r6, r8
push {r6,r7}
sub sp, 0x4
ldr r0, _0801D77C @ =gUnknown_2023E8A
ldr r0, _0801D77C @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0
beq _0801D784
@@ -21,7 +21,7 @@ atk00_attackcanceler: @ 801D760
strb r0, [r1]
b _0801DAFC
.align 2, 0
_0801D77C: .4byte gUnknown_2023E8A
_0801D77C: .4byte gBattleOutcome
_0801D780: .4byte gUnknown_2023BE3
_0801D784:
ldr r2, _0801D7B4 @ =gBattleMons
@@ -9519,7 +9519,7 @@ _0802243C:
ble _0802240C
cmp r6, 0
bne _08022450
ldr r0, _0802253C @ =gUnknown_2023E8A
ldr r0, _0802253C @ =gBattleOutcome
ldrb r1, [r0]
movs r2, 0x2
orrs r1, r2
@@ -9553,7 +9553,7 @@ _08022484:
adds r5, 0x1
cmp r5, 0x5
ble _08022454
ldr r2, _0802253C @ =gUnknown_2023E8A
ldr r2, _0802253C @ =gBattleOutcome
cmp r6, 0
bne _08022498
ldrb r0, [r2]
@@ -9647,7 +9647,7 @@ _0802251E:
.align 2, 0
_08022534: .4byte gUnknown_2023BC8
_08022538: .4byte gPlayerParty
_0802253C: .4byte gUnknown_2023E8A
_0802253C: .4byte gBattleOutcome
_08022540: .4byte gEnemyParty
_08022544: .4byte gBattleTypeFlags
_08022548: .4byte gBattlersCount
@@ -15311,7 +15311,7 @@ atk57: @ 80251C4
bl GetBattlerAtPosition
ldr r4, _080251F0 @ =gActiveBattler
strb r0, [r4]
ldr r0, _080251F4 @ =gUnknown_2023E8A
ldr r0, _080251F4 @ =gBattleOutcome
ldrb r1, [r0]
movs r0, 0
bl EmitCmd55
@@ -15326,7 +15326,7 @@ atk57: @ 80251C4
bx r0
.align 2, 0
_080251F0: .4byte gActiveBattler
_080251F4: .4byte gUnknown_2023E8A
_080251F4: .4byte gBattleOutcome
_080251F8: .4byte gUnknown_2023D74
thumb_func_end atk57
@@ -16141,7 +16141,7 @@ sub_80258AC: @ 80258AC
push {r7}
movs r6, 0
movs r5, 0
ldr r0, _080258F0 @ =gUnknown_2023E8A
ldr r0, _080258F0 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _080258C0
@@ -16171,7 +16171,7 @@ _080258C0:
mov r8, r0
b _080259E8
.align 2, 0
_080258F0: .4byte gUnknown_2023E8A
_080258F0: .4byte gBattleOutcome
_080258F4: .4byte gTrainerBattleOpponent_A
_080258F8: .4byte gBattleResources
_080258FC: .4byte gBattleStruct
asm/battle_setup.s
+12 -12
View File
@@ -623,7 +623,7 @@ sub_807FB40: @ 807FB40
movs r0, 0
movs r1, 0x80
bl ResetOamRange
ldr r0, _0807FB78 @ =gUnknown_2023E8A
ldr r0, _0807FB78 @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -633,7 +633,7 @@ sub_807FB40: @ 807FB40
b _0807FB8C
.align 2, 0
_0807FB74: .4byte 0x01000100
_0807FB78: .4byte gUnknown_2023E8A
_0807FB78: .4byte gBattleOutcome
_0807FB7C: .4byte c2_whiteout
_0807FB80:
ldr r0, _0807FB94 @ =CB2_ReturnToField
@@ -666,7 +666,7 @@ sub_807FBA0: @ 807FBA0
movs r0, 0
movs r1, 0x80
bl ResetOamRange
ldr r0, _0807FBD8 @ =gUnknown_2023E8A
ldr r0, _0807FBD8 @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -676,7 +676,7 @@ sub_807FBA0: @ 807FBA0
b _0807FBE6
.align 2, 0
_0807FBD4: .4byte 0x01000100
_0807FBD8: .4byte gUnknown_2023E8A
_0807FBD8: .4byte gBattleOutcome
_0807FBDC: .4byte c2_whiteout
_0807FBE0:
ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
@@ -704,7 +704,7 @@ sub_807FBF0: @ 807FBF0
movs r0, 0
movs r1, 0x80
bl ResetOamRange
ldr r4, _0807FC28 @ =gUnknown_2023E8A
ldr r4, _0807FC28 @ =gBattleOutcome
ldrb r0, [r4]
bl IsPlayerDefeated
adds r1, r0, 0
@@ -715,7 +715,7 @@ sub_807FBF0: @ 807FBF0
b _0807FC4C
.align 2, 0
_0807FC24: .4byte 0x01000100
_0807FC28: .4byte gUnknown_2023E8A
_0807FC28: .4byte gBattleOutcome
_0807FC2C: .4byte c2_whiteout
_0807FC30:
ldrb r0, [r4]
@@ -1853,7 +1853,7 @@ sub_80804AC: @ 80804AC
ldrh r0, [r0]
cmp r0, 0x9
bne _08080508
ldr r0, _080804DC @ =gUnknown_2023E8A
ldr r0, _080804DC @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
adds r1, r0, 0
@@ -1870,7 +1870,7 @@ sub_80804AC: @ 80804AC
b _080804EE
.align 2, 0
_080804D8: .4byte gUnknown_20386AC
_080804DC: .4byte gUnknown_2023E8A
_080804DC: .4byte gBattleOutcome
_080804E0: .4byte gSpecialVar_Result
_080804E4: .4byte gUnknown_20386CC
_080804E8:
@@ -1900,7 +1900,7 @@ _08080508:
_0808051C: .4byte gTrainerBattleOpponent_A
_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080524:
ldr r0, _08080538 @ =gUnknown_2023E8A
ldr r0, _08080538 @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -1910,7 +1910,7 @@ _08080530:
bl SetMainCallback2
b _0808054E
.align 2, 0
_08080538: .4byte gUnknown_2023E8A
_08080538: .4byte gBattleOutcome
_0808053C: .4byte c2_whiteout
_08080540:
ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
@@ -1940,7 +1940,7 @@ sub_8080558: @ 8080558
_08080570: .4byte gTrainerBattleOpponent_A
_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080578:
ldr r0, _0808058C @ =gUnknown_2023E8A
ldr r0, _0808058C @ =gBattleOutcome
ldrb r0, [r0]
bl IsPlayerDefeated
cmp r0, 0x1
@@ -1949,7 +1949,7 @@ _08080578:
bl SetMainCallback2
b _080805A6
.align 2, 0
_0808058C: .4byte gUnknown_2023E8A
_0808058C: .4byte gBattleOutcome
_08080590: .4byte c2_whiteout
_08080594:
ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
asm/battle_tower.s
+4 -4
View File
@@ -2894,7 +2894,7 @@ _080E6FF2:
bl sub_80E712C
ldr r4, _080E703C @ =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, _080E704C @ =gUnknown_2023E8A
ldr r1, _080E704C @ =gBattleOutcome
ldrb r1, [r1]
ldr r2, _080E7050 @ =0x0000055d
adds r0, r2
@@ -2930,7 +2930,7 @@ _080E703C: .4byte gSaveBlock2Ptr
_080E7040: .4byte 0x0000055c
_080E7044: .4byte gSpecialVar_0x8004
_080E7048: .4byte 0x00000564
_080E704C: .4byte gUnknown_2023E8A
_080E704C: .4byte gBattleOutcome
_080E7050: .4byte 0x0000055d
_080E7054: .4byte 0x0000055e
thumb_func_end sub_80E6FB8
@@ -3612,7 +3612,7 @@ _080E754C: .4byte gSaveBlock2Ptr
thumb_func_start sub_80E7550
sub_80E7550: @ 80E7550
push {lr}
ldr r0, _080E7564 @ =gUnknown_2023E8A
ldr r0, _080E7564 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x3
bne _080E756C
@@ -3621,7 +3621,7 @@ sub_80E7550: @ 80E7550
strb r0, [r1]
b _080E7590
.align 2, 0
_080E7564: .4byte gUnknown_2023E8A
_080E7564: .4byte gBattleOutcome
_080E7568: .4byte gStringVar4
_080E756C:
cmp r0, 0x1
asm/cable_club.s
+2 -2
View File
@@ -1940,7 +1940,7 @@ sub_8081668: @ 8081668
ldrb r0, [r0]
cmp r0, 0
beq _0808170A
ldr r0, _080816C4 @ =gUnknown_2023E8A
ldr r0, _080816C4 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x1
beq _080816C8
@@ -1953,7 +1953,7 @@ _080816B4: .4byte 0x0000ffdf
_080816B8: .4byte gSpecialVar_0x8004
_080816BC: .4byte gUnknown_300502C
_080816C0: .4byte gWirelessCommType
_080816C4: .4byte gUnknown_2023E8A
_080816C4: .4byte gBattleOutcome
_080816C8:
ldr r4, _080816E8 @ =gLinkPlayers
bl GetMultiplayerId
asm/field_specials.s
+2 -2
View File
@@ -178,11 +178,11 @@ _080CA748: .4byte gUnknown_8417FCC
thumb_func_start sub_80CA74C
sub_80CA74C: @ 80CA74C
ldr r0, _080CA754 @ =gUnknown_2023E8A
ldr r0, _080CA754 @ =gBattleOutcome
ldrb r0, [r0]
bx lr
.align 2, 0
_080CA754: .4byte gUnknown_2023E8A
_080CA754: .4byte gBattleOutcome
thumb_func_end sub_80CA74C
thumb_func_start sub_80CA758
asm/item_menu.s
+1 -1
View File
@@ -6383,7 +6383,7 @@ sub_810B180: @ 810B180
_0810B198: .4byte gMain
_0810B19C:
bl sub_810AECC
bl sub_815AC20
bl SetTeachyTvControllerModeToResume
ldr r0, _0810B1C4 @ =gUnknown_203AD10
ldr r1, [r0]
ldr r0, _0810B1C8 @ =CB2_ReturnToTeachyTV
asm/item_use.s
+2 -2
View File
@@ -1241,7 +1241,7 @@ sub_80A194C: @ 80A194C
push {lr}
ldr r1, _080A195C @ =UseFameCheckerFromMenu
movs r0, 0
bl sub_815ABC4
bl InitTeachyTvController
pop {r0}
bx r0
.align 2, 0
@@ -1263,7 +1263,7 @@ sub_80A1960: @ 80A1960
bl sub_80A1184
ldr r1, _080A1994 @ =CB2_ReturnToField
movs r0, 0
bl sub_815ABC4
bl InitTeachyTvController
adds r0, r4, 0
bl DestroyTask
_080A1988:
asm/party_menu.s
+1 -1
View File
@@ -4878,7 +4878,7 @@ sub_8120FB0: @ 8120FB0
push {lr}
bl FreeRestoreBattleData
bl LoadPlayerParty
bl sub_815AC20
bl SetTeachyTvControllerModeToResume
ldr r0, _08120FC8 @ =CB2_ReturnToTeachyTV
bl SetMainCallback2
pop {r0}
asm/safari_zone.s
+2 -2
View File
@@ -129,7 +129,7 @@ sub_80A0F4C: @ 80A0F4C
_080A0F60: .4byte gUnknown_2039994
_080A0F64: .4byte CB2_ReturnToField
_080A0F68:
ldr r0, _080A0F88 @ =gUnknown_2023E8A
ldr r0, _080A0F88 @ =gBattleOutcome
ldrb r0, [r0]
cmp r0, 0x8
bne _080A0F9C
@@ -143,7 +143,7 @@ _080A0F68:
bl SetMainCallback2
b _080A0FB0
.align 2, 0
_080A0F88: .4byte gUnknown_2023E8A
_080A0F88: .4byte gBattleOutcome
_080A0F8C: .4byte gUnknown_81BFB87
_080A0F90: .4byte gFieldCallback
_080A0F94: .4byte sub_807E3EC
data/text/teachy_tv.inc
+20 -20
View File
@@ -1,25 +1,25 @@
gUnknown_841B7A4:: @ 841B7A4
gTeachyTvString_TeachBattle:: @ 841B7A4
.string "Teach me how to battle.$"
gUnknown_841B7BC:: @ 841B7BC
gTeachyTvString_StatusProblems:: @ 841B7BC
.string "What are status problems?$"
gUnknown_841B7D6:: @ 841B7D6
gTeachyTvString_TypeMatchups:: @ 841B7D6
.string "What are type matchups?$"
gUnknown_841B7EE:: @ 841B7EE
gTeachyTvString_CatchPkmn:: @ 841B7EE
.string "I want to catch POKéMON.$"
gUnknown_841B807:: @ 841B807
gTeachyTvString_AboutTMs:: @ 841B807
.string "Teach me about TMs.$"
gUnknown_841B81B:: @ 841B81B
gTeachyTvString_RegisterItem:: @ 841B81B
.string "How do I register an item?$"
gUnknown_841B836:: @ 841B836
gTeachyTvString_Cancel:: @ 841B836
.string "CANCEL$"
gUnknown_841B83D:: @ 841B83D
gTeachyTvText_PokeDudeSaysHello:: @ 841B83D
.string "Hey, all you TRAINERS out there!\n"
.string "HELLO, TRAINERS!\p"
.string "……… ……… ………\p"
@@ -28,7 +28,7 @@ gUnknown_841B83D:: @ 841B83D
.string "It's me, the POKé DUDE!\p"
.string "$"
gUnknown_841B8BF:: @ 841B8BF
gTeachyTvText_BattleScript1:: @ 841B8BF
.string "Today, the POKé DUDE's here to\n"
.string "tell you about how you can battle\l"
.string "POKéMON!\p"
@@ -44,7 +44,7 @@ gUnknown_841B8BF:: @ 841B8BF
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841BA41:: @ 841BA41
gTeachyTvText_BattleScript2:: @ 841BA41
.string "Well, did you get that?\p"
.string "Even if your own POKéMON's HP\n"
.string "falls to zero, and it becomes\l"
@@ -55,7 +55,7 @@ gUnknown_841BA41:: @ 841BA41
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841BB40:: @ 841BB40
gTeachyTvText_StatusScript1:: @ 841BB40
.string "Today, the POKé DUDE's here to\n"
.string "tell you about status problems!\p"
.string "Status problems include poisoning,\n"
@@ -73,7 +73,7 @@ gUnknown_841BB40:: @ 841BB40
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841BD10:: @ 841BD10
gTeachyTvText_StatusScript2:: @ 841BD10
.string "Poisoning or paralysis don't go\n"
.string "away after a battle.\p"
.string "If a POKéMON is poisoned, it loses\n"
@@ -87,7 +87,7 @@ gUnknown_841BD10:: @ 841BD10
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841BE76:: @ 841BE76
gTeachyTvText_MatchupsScript1:: @ 841BE76
.string "Does everyone know about type\n"
.string "matchups?\p"
.string "POKéMON and their moves all\n"
@@ -110,7 +110,7 @@ gUnknown_841BE76:: @ 841BE76
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841C0AF:: @ 841C0AF
gTeachyTvText_MatchupsScript2:: @ 841C0AF
.string "Is it possible to launch an attack\n"
.string "that will inflict heavy damage?\p"
.string "Does the opposing POKéMON pose\n"
@@ -126,7 +126,7 @@ gUnknown_841C0AF:: @ 841C0AF
.string "Remember, a good deed a day\n"
.string "brings happiness to stay!$"
gUnknown_841C23B:: @ 841C23B
gTeachyTvText_CatchingScript1:: @ 841C23B
.string "Today, the POKé DUDE's going to\n"
.string "show you how to catch POKéMON!\p"
.string "Just imagine… A groovy POKéMON\n"
@@ -141,7 +141,7 @@ gUnknown_841C23B:: @ 841C23B
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gUnknown_841C384:: @ 841C384
gTeachyTvText_CatchingScript2:: @ 841C384
.string "If your first POKé BALL fails to\n"
.string "catch the POKéMON, don't give up!\p"
.string "Keep throwing POKé BALLS…\n"
@@ -150,7 +150,7 @@ gUnknown_841C384:: @ 841C384
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841C459:: @ 841C459
gTeachyTvText_TMsScript1:: @ 841C459
.string "Hey, everyone!\n"
.string "Do you all have TMs?\p"
.string "A TM, Technical Machine, is an\n"
@@ -187,13 +187,13 @@ gPokeDudeText_ReadTMDescription:: @ 841C693
.string "So, try using it on POKéMON with\n"
.string "arms that can throw punches!$"
gUnknown_841C7B4:: @ 841C7B4
gTeachyTvText_TMsScript2:: @ 841C7B4
.string "Wow, I talked a lot today!\n"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gUnknown_841C82A:: @ 841C82A
gTeachyTvText_RegisterScript1:: @ 841C82A
.string "A TRAINER's BAG has a bunch of\n"
.string "nifty, convenient features!\p"
.string "Take stuff in the KEY ITEMS\n"
@@ -208,7 +208,7 @@ gUnknown_841C82A:: @ 841C82A
.string "Keep your eyes glued to the sorta\n"
.string "super POKé DUDE SHOW!$"
gUnknown_841C994:: @ 841C994
gTeachyTvText_RegisterScript2:: @ 841C994
.string "And now, your TEACHY TV is\n"
.string "registered.\p"
.string "How do you use it?\n"
include/battle.h
+1 -1
View File
@@ -983,6 +983,6 @@ extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
extern s32 gBattleMoveDamage;
extern u8 gUnknown_2023E8A;
extern u8 gBattleOutcome;
#endif // GUARD_BATTLE_H
include/strings.h
+20 -20
View File
@@ -115,25 +115,25 @@ extern const u8 gPokeDudeText_TMTypes[];
extern const u8 gPokeDudeText_ReadTMDescription[];
// teachy_tv
extern const u8 gUnknown_841B7A4[];
extern const u8 gUnknown_841B7BC[];
extern const u8 gUnknown_841B7D6[];
extern const u8 gUnknown_841B7EE[];
extern const u8 gUnknown_841B807[];
extern const u8 gUnknown_841B81B[];
extern const u8 gUnknown_841B836[];
extern const u8 gUnknown_841B83D[];
extern const u8 gUnknown_841B8BF[];
extern const u8 gUnknown_841BB40[];
extern const u8 gUnknown_841BE76[];
extern const u8 gUnknown_841C23B[];
extern const u8 gUnknown_841C459[];
extern const u8 gUnknown_841C82A[];
extern const u8 gUnknown_841BA41[];
extern const u8 gUnknown_841BD10[];
extern const u8 gUnknown_841C0AF[];
extern const u8 gUnknown_841C384[];
extern const u8 gUnknown_841C7B4[];
extern const u8 gUnknown_841C994[];
extern const u8 gTeachyTvString_TeachBattle[];
extern const u8 gTeachyTvString_StatusProblems[];
extern const u8 gTeachyTvString_TypeMatchups[];
extern const u8 gTeachyTvString_CatchPkmn[];
extern const u8 gTeachyTvString_AboutTMs[];
extern const u8 gTeachyTvString_RegisterItem[];
extern const u8 gTeachyTvString_Cancel[];
extern const u8 gTeachyTvText_PokeDudeSaysHello[];
extern const u8 gTeachyTvText_BattleScript1[];
extern const u8 gTeachyTvText_StatusScript1[];
extern const u8 gTeachyTvText_MatchupsScript1[];
extern const u8 gTeachyTvText_CatchingScript1[];
extern const u8 gTeachyTvText_TMsScript1[];
extern const u8 gTeachyTvText_RegisterScript1[];
extern const u8 gTeachyTvText_BattleScript2[];
extern const u8 gTeachyTvText_StatusScript2[];
extern const u8 gTeachyTvText_MatchupsScript2[];
extern const u8 gTeachyTvText_CatchingScript2[];
extern const u8 gTeachyTvText_TMsScript2[];
extern const u8 gTeachyTvText_RegisterScript2[];
#endif //GUARD_STRINGS_H
include/teachy_tv.h
+2 -2
View File
@@ -1,8 +1,8 @@
#ifndef GUARD_TEACHY_TV_H
#define GUARD_TEACHY_TV_H
void sub_815ABC4(u8 mode, void (*cb)());
void InitTeachyTvController(u8 mode, void (*cb)());
void CB2_ReturnToTeachyTV(void);
void sub_815AC20(void);
void SetTeachyTvControllerModeToResume(void);
#endif //GUARD_TEACHY_TV_H
src/quest_log.c
+1 -1
View File
@@ -2746,7 +2746,7 @@ void sub_81134CC(struct Var4038Struct * a0)
if (VarGet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) == 2)
{
sub_8113078(a0);
if (gUnknown_2023E8A == 1)
if (gBattleOutcome == B_OUTCOME_WON)
sub_8113194(a0);
else
sub_81131FC(a0);
src/quest_log_battle.c
+3 -3
View File
@@ -26,7 +26,7 @@ void sub_812C334(s32 *, s32 *);
void sub_812BFDC(void)
{
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_DOME)) && (gUnknown_2023E8A == 1 || gUnknown_2023E8A == 7))
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_DOME)) && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT))
{
struct QuestLogStruct_TrainerBattleRecord * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_TrainerBattleRecord));
struct QuestLogStruct_WildBattleRecord * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_WildBattleRecord));
@@ -81,7 +81,7 @@ void sub_812BFDC(void)
}
else
{
if (gUnknown_2023E8A == 1)
if (gBattleOutcome == B_OUTCOME_WON)
{
questLogWildBattleRecord->v0 = GetMonData(gEnemyParty + 0, MON_DATA_SPECIES);
questLogWildBattleRecord->v2 = SPECIES_NONE;
@@ -116,7 +116,7 @@ void sub_812C224(void)
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
struct QuestLogStruct_LinkBattleRecord * r5 = Alloc(sizeof(struct QuestLogStruct_LinkBattleRecord));
r5->v0 = gUnknown_2023E8A - 1;
r5->v0 = gBattleOutcome - 1; // 0 = won, 1 = lost, 2 = drew
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
r8 = 15;
src/teachy_tv.c
+429 -414
View File
File diff suppressed because it is too large Load Diff
src/tm_case.c
+1 -1
View File
@@ -1171,7 +1171,7 @@ static void Task_TMCaseDude_Playback(u8 taskId)
if (data[8] < 21)
{
data[8] = 21;
sub_815AC20();
SetTeachyTvControllerModeToResume();
}
}
sym_ewram.txt
+1 -1
View File
@@ -386,7 +386,7 @@ gUnknown_2023E82: @ 2023E82
gUnknown_2023E83: @ 2023E83
.space 0x7
gUnknown_2023E8A: @ 2023E8A
gBattleOutcome: @ 2023E8A
.space 0x2
gUnknown_2023E8C: @ 2023E8C