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

teachy_tv and minor update to match DizzyEgg's struct def

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-01 16:07:06 +08:00
parent 337c817721
commit 55406f92fd
16 changed files with 272 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/berry_pouch.s
+2 -2
View File
@@ -183,7 +183,7 @@ _0813CE84:
.4byte _0813CFB0 .4byte _0813CFB0
.4byte _0813CFBE .4byte _0813CFBE
_0813CED0: _0813CED0:
bl sub_80BF768 bl VblankHblankHandlerSetZero
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _0813CFD2 b _0813CFD2
_0813CEDA: _0813CEDA:
@@ -386,7 +386,7 @@ _0813D078: .4byte gUnknown_203F370
thumb_func_start sub_813D07C thumb_func_start sub_813D07C
sub_813D07C: @ 813D07C sub_813D07C: @ 813D07C
push {r4,lr} push {r4,lr}
bl sub_80BF7C8 bl InitBgReg
ldr r4, _0813D0DC @ =gUnknown_203F36C ldr r4, _0813D0DC @ =gUnknown_203F36C
ldr r0, [r4] ldr r0, [r4]
adds r0, 0xC adds r0, 0xC
asm/item_menu.s
+2 -2
View File
@@ -253,7 +253,7 @@ _08107F60:
.4byte _081080D8 .4byte _081080D8
.4byte _081080DE .4byte _081080DE
_08107FB0: _08107FB0:
bl sub_80BF768 bl VblankHblankHandlerSetZero
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _08108104 b _08108104
_08107FBA: _08107FBA:
@@ -520,7 +520,7 @@ _081081CC: .4byte gUnknown_203AD1C
thumb_func_start sub_81081D0 thumb_func_start sub_81081D0
sub_81081D0: @ 81081D0 sub_81081D0: @ 81081D0
push {r4,r5,lr} push {r4,r5,lr}
bl sub_80BF7C8 bl InitBgReg
ldr r5, _08108230 @ =gUnknown_203AD14 ldr r5, _08108230 @ =gUnknown_203AD14
movs r4, 0x80 movs r4, 0x80
lsls r4, 4 lsls r4, 4
asm/item_pc.s
+2 -2
View File
@@ -158,7 +158,7 @@ _0810D4E8:
.4byte _0810D630 .4byte _0810D630
.4byte _0810D668 .4byte _0810D668
_0810D53C: _0810D53C:
bl sub_80BF768 bl VblankHblankHandlerSetZero
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _0810D674 b _0810D674
_0810D546: _0810D546:
@@ -389,7 +389,7 @@ _0810D718: .4byte gUnknown_203ADCC
thumb_func_start sub_810D71C thumb_func_start sub_810D71C
sub_810D71C: @ 810D71C sub_810D71C: @ 810D71C
push {r4,r5,lr} push {r4,r5,lr}
bl sub_80BF7C8 bl InitBgReg
ldr r5, _0810D77C @ =gUnknown_203ADC0 ldr r5, _0810D77C @ =gUnknown_203ADC0
movs r4, 0x80 movs r4, 0x80
lsls r4, 4 lsls r4, 4
asm/menu_helpers.s
+7 -7
View File
@@ -418,8 +418,8 @@ _080BF764:
bx r1 bx r1
thumb_func_end sub_80BF748 thumb_func_end sub_80BF748
thumb_func_start sub_80BF768 thumb_func_start VblankHblankHandlerSetZero
sub_80BF768: @ 80BF768 VblankHblankHandlerSetZero: @ 80BF768
push {lr} push {lr}
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
@@ -427,13 +427,13 @@ sub_80BF768: @ 80BF768
bl SetHBlankCallback bl SetHBlankCallback
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80BF768 thumb_func_end VblankHblankHandlerSetZero
thumb_func_start sub_80BF77C thumb_func_start sub_80BF77C
sub_80BF77C: @ 80BF77C sub_80BF77C: @ 80BF77C
push {r4,lr} push {r4,lr}
sub sp, 0xC sub sp, 0xC
bl sub_80BF7C8 bl InitBgReg
mov r1, sp mov r1, sp
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
@@ -465,8 +465,8 @@ _080BF7C0: .4byte 0x05000100
_080BF7C4: .4byte 0x01000200 _080BF7C4: .4byte 0x01000200
thumb_func_end sub_80BF77C thumb_func_end sub_80BF77C
thumb_func_start sub_80BF7C8 thumb_func_start InitBgReg
sub_80BF7C8: @ 80BF7C8 InitBgReg: @ 80BF7C8
push {lr} push {lr}
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
@@ -517,7 +517,7 @@ sub_80BF7C8: @ 80BF7C8
bl ChangeBgY bl ChangeBgY
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80BF7C8 thumb_func_end InitBgReg
thumb_func_start sub_80BF848 thumb_func_start sub_80BF848
sub_80BF848: @ 80BF848 sub_80BF848: @ 80BF848
asm/party_menu.s
+2 -2
View File
@@ -276,7 +276,7 @@ _0811EC24:
.4byte _0811EDD0 .4byte _0811EDD0
.4byte _0811EDDE .4byte _0811EDDE
_0811EC80: _0811EC80:
bl sub_80BF768 bl VblankHblankHandlerSetZero
bl sub_80BF77C bl sub_80BF77C
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _0811EDFC b _0811EDFC
@@ -565,7 +565,7 @@ _0811EEC8: .4byte gUnknown_203B0B8
thumb_func_start sub_811EECC thumb_func_start sub_811EECC
sub_811EECC: @ 811EECC sub_811EECC: @ 811EECC
push {r4,r5,lr} push {r4,r5,lr}
bl sub_80BF7C8 bl InitBgReg
ldr r5, _0811EF34 @ =gUnknown_203B0BC ldr r5, _0811EF34 @ =gUnknown_203B0BC
movs r4, 0x80 movs r4, 0x80
lsls r4, 4 lsls r4, 4
asm/shop.s
+1 -1
View File
@@ -515,7 +515,7 @@ _0809AEA0: .4byte gTasks
_0809AEA4: .4byte sub_809AE00 _0809AEA4: .4byte sub_809AE00
_0809AEA8: .4byte sub_809ADE4 _0809AEA8: .4byte sub_809ADE4
_0809AEAC: _0809AEAC:
bl sub_80BF768 bl VblankHblankHandlerSetZero
str r4, [sp, 0x8] str r4, [sp, 0x8]
movs r1, 0xE0 movs r1, 0xE0
lsls r1, 19 lsls r1, 19
asm/teachy_tv.s
+16 -392
View File
@@ -5,382 +5,6 @@
.text .text
thumb_func_start sub_815AB94
sub_815AB94: @ 815AB94
push {lr}
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_815AB94
thumb_func_start sub_815ABB0
sub_815ABB0: @ 815ABB0
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_815ABB0
thumb_func_start sub_815ABC4
sub_815ABC4: @ 815ABC4
push {r4,lr}
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
ldr r3, _0815ABF4 @ =gTeachyTV_StaticResources
movs r4, 0
strb r2, [r3, 0x4]
str r1, [r3]
cmp r2, 0
bne _0815ABE0
movs r0, 0
strh r4, [r3, 0x6]
strh r4, [r3, 0x8]
strb r0, [r3, 0x5]
_0815ABE0:
cmp r2, 0x1
bne _0815ABE6
strb r4, [r3, 0x4]
_0815ABE6:
ldr r0, _0815ABF8 @ =sub_815AC2C
bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0815ABF4: .4byte gTeachyTV_StaticResources
_0815ABF8: .4byte sub_815AC2C
thumb_func_end sub_815ABC4
thumb_func_start CB2_ReturnToTeachyTV
CB2_ReturnToTeachyTV: @ 815ABFC
push {lr}
ldr r1, _0815AC10 @ =gTeachyTV_StaticResources
ldrb r0, [r1, 0x4]
cmp r0, 0x1
bne _0815AC14
ldr r1, [r1]
movs r0, 0x1
bl sub_815ABC4
b _0815AC1C
.align 2, 0
_0815AC10: .4byte gTeachyTV_StaticResources
_0815AC14:
ldr r1, [r1]
movs r0, 0x2
bl sub_815ABC4
_0815AC1C:
pop {r0}
bx r0
thumb_func_end CB2_ReturnToTeachyTV
thumb_func_start sub_815AC20
sub_815AC20: @ 815AC20
ldr r1, _0815AC28 @ =gTeachyTV_StaticResources
movs r0, 0x1
strb r0, [r1, 0x4]
bx lr
.align 2, 0
_0815AC28: .4byte gTeachyTV_StaticResources
thumb_func_end sub_815AC20
thumb_func_start sub_815AC2C
sub_815AC2C: @ 815AC2C
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _0815AC44 @ =gMain
movs r1, 0x87
lsls r1, 3
adds r6, r0, r1
ldrb r5, [r6]
cmp r5, 0
beq _0815AC48
cmp r5, 0x1
beq _0815AC9C
b _0815AD6E
.align 2, 0
_0815AC44: .4byte gMain
_0815AC48:
ldr r4, _0815AC90 @ =gUnknown_203F450
ldr r0, _0815AC94 @ =0x00004008
bl AllocZeroed
str r0, [r4]
str r5, [r0]
ldr r1, _0815AC98 @ =0x00004006
adds r0, r1
strb r5, [r0]
ldr r0, [r4]
adds r1, 0x1
adds r0, r1
movs r1, 0xFF
strb r1, [r0]
bl sub_80BF768
bl clear_scheduled_bg_copies_to_vram
bl ScanlineEffect_Stop
bl FreeAllSpritePalettes
bl ResetPaletteFade
bl ResetSpriteData
bl ResetTasks
bl sub_815AD88
bl sub_815AE38
ldrb r0, [r6]
adds r0, 0x1
strb r0, [r6]
b _0815AD6E
.align 2, 0
_0815AC90: .4byte gUnknown_203F450
_0815AC94: .4byte 0x00004008
_0815AC98: .4byte 0x00004006
_0815AC9C:
bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0815AD6E
bl sub_815AEB8
bl sub_815AFEC
ldr r0, _0815ACE0 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x4]
cmp r0, 0x2
bne _0815ACEC
ldr r0, _0815ACE4 @ =sub_815BA54
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
bl sub_815B014
ldr r2, _0815ACE8 @ =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
adds r1, r2
lsls r0, 24
lsrs r0, 24
strh r0, [r1, 0xA]
adds r0, r5, 0
bl sub_815B118
b _0815AD26
.align 2, 0
_0815ACE0: .4byte gTeachyTV_StaticResources
_0815ACE4: .4byte sub_815BA54
_0815ACE8: .4byte gTasks
_0815ACEC:
ldr r0, _0815AD78 @ =sub_815B2C0
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
bl sub_815AEE8
ldr r1, _0815AD7C @ =gTasks
lsls r4, r5, 2
adds r4, r5
lsls r4, 3
adds r4, r1
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x8]
bl sub_815B014
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xA]
bl sub_815AF5C
movs r0, 0xAD
lsls r0, 1
bl PlayNewMapMusic
bl sub_815B094
_0815AD26:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x9
bl sub_812B1E0
movs r4, 0x1
negs r4, r4
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r0, _0815AD80 @ =sub_815ABB0
bl SetVBlankCallback
ldr r0, _0815AD84 @ =sub_815AB94
bl SetMainCallback2
_0815AD6E:
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0815AD78: .4byte sub_815B2C0
_0815AD7C: .4byte gTasks
_0815AD80: .4byte sub_815ABB0
_0815AD84: .4byte sub_815AB94
thumb_func_end sub_815AC2C
thumb_func_start sub_815AD88
sub_815AD88: @ 815AD88
push {r4,lr}
bl sub_80BF7C8
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, _0815AE20 @ =gUnknown_84792E0
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
ldr r4, _0815AE24 @ =gUnknown_203F450
ldr r1, [r4]
adds r1, 0x4
movs r0, 0x1
bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0815AE28 @ =0x00001004
adds r1, r0
movs r0, 0x2
bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0815AE2C @ =0x00002004
adds r1, r0
movs r0, 0x3
bl SetBgTilemapBuffer
movs r1, 0xC1
lsls r1, 6
movs r0, 0
bl SetGpuReg
movs r0, 0
bl ShowBg
movs r0, 0x1
bl ShowBg
movs r0, 0x2
bl ShowBg
movs r0, 0x3
bl ShowBg
movs r1, 0x80
lsls r1, 5
movs r0, 0x3
movs r2, 0x2
bl ChangeBgX
movs r1, 0xA0
lsls r1, 6
movs r0, 0x3
movs r2, 0x1
bl ChangeBgY
ldr r0, [r4]
ldr r1, _0815AE30 @ =0x00004004
adds r0, r1
movs r1, 0
strb r1, [r0]
ldr r0, [r4]
ldr r1, _0815AE34 @ =0x00004005
adds r0, r1
movs r1, 0x3
strb r1, [r0]
movs r0, 0x50
movs r1, 0
bl SetGpuReg
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0815AE20: .4byte gUnknown_84792E0
_0815AE24: .4byte gUnknown_203F450
_0815AE28: .4byte 0x00001004
_0815AE2C: .4byte 0x00002004
_0815AE30: .4byte 0x00004004
_0815AE34: .4byte 0x00004005
thumb_func_end sub_815AD88
thumb_func_start sub_815AE38
sub_815AE38: @ 815AE38
push {r4,lr}
sub sp, 0x8
movs r4, 0
add r0, sp, 0x4
strh r4, [r0]
bl reset_temp_tile_data_buffers
ldr r1, _0815AE98 @ =gUnknown_8E86240
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, _0815AE9C @ =gUnknown_8E86BE8
ldr r4, _0815AEA0 @ =gUnknown_203F450
ldr r1, [r4]
adds r1, 0x4
bl LZDecompressWram
ldr r0, _0815AEA4 @ =gUnknown_8E86D6C
ldr r1, [r4]
ldr r2, _0815AEA8 @ =0x00003004
adds r1, r2
bl LZDecompressWram
ldr r0, _0815AEAC @ =gUnknown_8E86F98
movs r1, 0
movs r2, 0x80
bl LoadCompressedPalette
add r0, sp, 0x4
movs r1, 0
movs r2, 0x2
bl LoadPalette
ldr r0, _0815AEB0 @ =gUnknown_83A5348
bl LoadSpritePalette
ldr r0, [r4]
ldr r1, _0815AEB4 @ =0x00002004
adds r0, r1
bl sub_815BD80
add sp, 0x8
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0815AE98: .4byte gUnknown_8E86240
_0815AE9C: .4byte gUnknown_8E86BE8
_0815AEA0: .4byte gUnknown_203F450
_0815AEA4: .4byte gUnknown_8E86D6C
_0815AEA8: .4byte 0x00003004
_0815AEAC: .4byte gUnknown_8E86F98
_0815AEB0: .4byte gUnknown_83A5348
_0815AEB4: .4byte 0x00002004
thumb_func_end sub_815AE38
thumb_func_start sub_815AEB8
sub_815AEB8: @ 815AEB8
push {lr}
ldr r0, _0815AEE4 @ =gUnknown_84792F0
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0xCC
bl FillWindowPixelBuffer
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
bl CopyWindowToVram
pop {r0}
bx r0
.align 2, 0
_0815AEE4: .4byte gUnknown_84792F0
thumb_func_end sub_815AEB8
thumb_func_start sub_815AEE8 thumb_func_start sub_815AEE8
sub_815AEE8: @ 815AEE8 sub_815AEE8: @ 815AEE8
push {r4,r5,lr} push {r4,r5,lr}
@@ -459,7 +83,7 @@ _0815AF7C: .4byte gUnknown_203F450
_0815AF80: .4byte 0x00004007 _0815AF80: .4byte 0x00004007
_0815AF84: _0815AF84:
ldr r0, _0815AF9C @ =gUnknown_8479380 ldr r0, _0815AF9C @ =gUnknown_8479380
ldr r1, _0815AFA0 @ =gUnknown_203F44A ldr r1, _0815AFA0 @ =gTeachyTV_StaticResources+6
bl AddScrollIndicatorArrowPair bl AddScrollIndicatorArrowPair
ldr r1, _0815AFA4 @ =gUnknown_203F450 ldr r1, _0815AFA4 @ =gUnknown_203F450
ldr r1, [r1] ldr r1, [r1]
@@ -471,7 +95,7 @@ _0815AF96:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815AF9C: .4byte gUnknown_8479380 _0815AF9C: .4byte gUnknown_8479380
_0815AFA0: .4byte gUnknown_203F44A _0815AFA0: .4byte gTeachyTV_StaticResources+6
_0815AFA4: .4byte gUnknown_203F450 _0815AFA4: .4byte gUnknown_203F450
_0815AFA8: .4byte 0x00004007 _0815AFA8: .4byte 0x00004007
thumb_func_end sub_815AF5C thumb_func_end sub_815AF5C
@@ -515,8 +139,8 @@ _0815AFE8:
bx r0 bx r0
thumb_func_end sub_815AFD8 thumb_func_end sub_815AFD8
thumb_func_start sub_815AFEC thumb_func_start TeachyTvInitIo
sub_815AFEC: @ 815AFEC TeachyTvInitIo: @ 815AFEC
push {lr} push {lr}
movs r0, 0x48 movs r0, 0x48
movs r1, 0x3F movs r1, 0x3F
@@ -532,10 +156,10 @@ sub_815AFEC: @ 815AFEC
bl SetGpuReg bl SetGpuReg
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_815AFEC thumb_func_end TeachyTvInitIo
thumb_func_start sub_815B014 thumb_func_start TeachyTvSetupObj
sub_815B014: @ 815B014 TeachyTvSetupObj: @ 815B014
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
ldr r1, _0815B054 @ =SpriteCallbackDummy ldr r1, _0815B054 @ =SpriteCallbackDummy
@@ -570,7 +194,7 @@ sub_815B014: @ 815B014
.align 2, 0 .align 2, 0
_0815B054: .4byte SpriteCallbackDummy _0815B054: .4byte SpriteCallbackDummy
_0815B058: .4byte gSprites _0815B058: .4byte gSprites
thumb_func_end sub_815B014 thumb_func_end TeachyTvSetupObj
thumb_func_start sub_815B05C thumb_func_start sub_815B05C
sub_815B05C: @ 815B05C sub_815B05C: @ 815B05C
@@ -673,8 +297,8 @@ _0815B0DE:
_0815B114: .4byte 0x0000301f _0815B114: .4byte 0x0000301f
thumb_func_end sub_815B0CC thumb_func_end sub_815B0CC
thumb_func_start sub_815B118 thumb_func_start TeachyTvConfigRboxAndObj
sub_815B118: @ 815B118 TeachyTvConfigRboxAndObj: @ 815B118
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -761,7 +385,7 @@ _0815B1B8:
pop {r4-r7} pop {r4-r7}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_815B118 thumb_func_end TeachyTvConfigRboxAndObj
thumb_func_start sub_815B1DC thumb_func_start sub_815B1DC
sub_815B1DC: @ 815B1DC sub_815B1DC: @ 815B1DC
@@ -903,7 +527,7 @@ sub_815B2C0: @ 815B2C0
bl ListMenuHandleInput bl ListMenuHandleInput
adds r5, r0, 0 adds r5, r0, 0
ldrb r0, [r6] ldrb r0, [r6]
ldr r4, _0815B324 @ =gUnknown_203F44A ldr r4, _0815B324 @ =gTeachyTV_StaticResources+6
adds r2, r4, 0x2 adds r2, r4, 0x2
adds r1, r4, 0 adds r1, r4, 0
bl get_coro_args_x18_x1A bl get_coro_args_x18_x1A
@@ -930,7 +554,7 @@ _0815B30A:
.align 2, 0 .align 2, 0
_0815B31C: .4byte gTasks+0x8 _0815B31C: .4byte gTasks+0x8
_0815B320: .4byte gPaletteFade _0815B320: .4byte gPaletteFade
_0815B324: .4byte gUnknown_203F44A _0815B324: .4byte gTeachyTV_StaticResources+6
_0815B328: .4byte gMain _0815B328: .4byte gMain
_0815B32C: .4byte UseFameCheckerFromMenu _0815B32C: .4byte UseFameCheckerFromMenu
_0815B330: _0815B330:
@@ -1854,8 +1478,8 @@ _0815BA4E:
bx r0 bx r0
thumb_func_end sub_815BA30 thumb_func_end sub_815BA30
thumb_func_start sub_815BA54 thumb_func_start TeachyTvTaskFunction
sub_815BA54: @ 815BA54 TeachyTvTaskFunction: @ 815BA54
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1891,7 +1515,7 @@ _0815BA90: .4byte gPaletteFade
_0815BA94: .4byte gUnknown_8479390 _0815BA94: .4byte gUnknown_8479390
_0815BA98: .4byte gTeachyTV_StaticResources _0815BA98: .4byte gTeachyTV_StaticResources
_0815BA9C: .4byte sub_815B4EC _0815BA9C: .4byte sub_815B4EC
thumb_func_end sub_815BA54 thumb_func_end TeachyTvTaskFunction
thumb_func_start sub_815BAA0 thumb_func_start sub_815BAA0
sub_815BAA0: @ 815BAA0 sub_815BAA0: @ 815BAA0
include/fame_checker.h
+1 -1
View File
@@ -41,7 +41,7 @@ extern u8 gIconDescriptionBoxIsOpen;
void ResetFameChecker(void); void ResetFameChecker(void);
void FullyUnlockFameChecker(void); void FullyUnlockFameChecker(void);
void UseFameChecker(MainCallback savedCallback); void UseFameChecker(void (*)());
void SetFlavorTextFlagFromSpecialVars(void); void SetFlavorTextFlagFromSpecialVars(void);
void UpdatePickStateFromSpecialVar8005(void); void UpdatePickStateFromSpecialVar8005(void);
include/list_menu.h
+3 -3
View File
@@ -9,8 +9,8 @@
struct ListMenuItem struct ListMenuItem
{ {
const u8 *unk_00; const u8 *name;
s32 unk_04; s32 id;
}; };
struct ListMenu; struct ListMenu;
@@ -43,7 +43,7 @@ struct ListMenu {
u16 selectedRow; u16 selectedRow;
u8 unk_1C; u8 unk_1C;
u8 unk_1D; u8 unk_1D;
u8 unk_1E; u8 taskId;
u8 unk_1F; u8 unk_1F;
}; };
include/menu_helpers.h
+2 -2
View File
@@ -20,8 +20,8 @@ void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
bool8 sub_81221AC(void); bool8 sub_81221AC(void);
bool8 sub_80BF72C(void); bool8 sub_80BF72C(void);
bool8 sub_80BF708(void); bool8 sub_80BF708(void);
void sub_80BF768(void); void VblankHblankHandlerSetZero(void);
void sub_80BF7C8(void); void InitBgReg(void);
u8 sub_80BF8E4(void); u8 sub_80BF8E4(void);
u8 sub_80BF848(s16 * a0, u16 a1); u8 sub_80BF848(s16 * a0, u16 a1);
void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc); void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
ld_script.txt
+1
View File
@@ -260,6 +260,7 @@ SECTIONS {
src/unk_8159F40.o(.text); src/unk_8159F40.o(.text);
src/dodrio_berry_picking_2.o(.text); src/dodrio_berry_picking_2.o(.text);
asm/dodrio_berry_picking_2.o(.text); asm/dodrio_berry_picking_2.o(.text);
src/teachy_tv.o(.text);
asm/teachy_tv.o(.text); asm/teachy_tv.o(.text);
asm/ereader_helpers.o(.text); asm/ereader_helpers.o(.text);
src/unk_815C980.o(.text); src/unk_815C980.o(.text);
src/fame_checker.c
+8 -8
View File
@@ -1341,14 +1341,14 @@ static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit)
u16 who; u16 who;
get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY); get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
who = listY + cursorY; who = listY + cursorY;
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].unk_00); AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].name);
if (!onInit) if (!onInit)
{ {
if (listY < sFameCheckerData->listMenuTopIdx2) if (listY < sFameCheckerData->listMenuTopIdx2)
sFameCheckerData->listMenuDrawnSelIdx++; sFameCheckerData->listMenuDrawnSelIdx++;
else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1) else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1)
sFameCheckerData->listMenuDrawnSelIdx--; sFameCheckerData->listMenuDrawnSelIdx--;
AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].unk_00); AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].name);
} }
sFameCheckerData->listMenuCurIdx = itemIndex; sFameCheckerData->listMenuCurIdx = itemIndex;
@@ -1368,20 +1368,20 @@ static u8 FC_PopulateListMenu(void)
{ {
if (sTrainerIdxs[fameCheckerIdx] < FC_NONTRAINER_START) if (sTrainerIdxs[fameCheckerIdx] < FC_NONTRAINER_START)
{ {
sListMenuItems[nitems].unk_00 = gTrainers[sTrainerIdxs[fameCheckerIdx]].trainerName; sListMenuItems[nitems].name = gTrainers[sTrainerIdxs[fameCheckerIdx]].trainerName;
sListMenuItems[nitems].unk_04 = nitems; sListMenuItems[nitems].id = nitems;
} }
else else
{ {
sListMenuItems[nitems].unk_00 = sNonTrainerNamePointers[sTrainerIdxs[fameCheckerIdx] - FC_NONTRAINER_START]; sListMenuItems[nitems].name = sNonTrainerNamePointers[sTrainerIdxs[fameCheckerIdx] - FC_NONTRAINER_START];
sListMenuItems[nitems].unk_04 = nitems; sListMenuItems[nitems].id = nitems;
} }
sFameCheckerData->unlockedPersons[nitems] = fameCheckerIdx; sFameCheckerData->unlockedPersons[nitems] = fameCheckerIdx;
nitems++; nitems++;
} }
} }
sListMenuItems[nitems].unk_00 = gFameCheckerText_Cancel; sListMenuItems[nitems].name = gFameCheckerText_Cancel;
sListMenuItems[nitems].unk_04 = nitems; sListMenuItems[nitems].id = nitems;
sFameCheckerData->unlockedPersons[nitems] = 0xFF; sFameCheckerData->unlockedPersons[nitems] = 0xFF;
nitems++; nitems++;
gFameChecker_ListMenuTemplate.totalItems = nitems; gFameChecker_ListMenuTemplate.totalItems = nitems;
src/mystery_gift_menu.c
+1 -1
View File
@@ -703,7 +703,7 @@ u32 MysteryGift_HandleThreeOptionMenu(u8 * unused0, u16 * unused1, u8 whichMenu)
width = 0; width = 0;
for (i = 0; i < listMenuTemplate.totalItems; i++) for (i = 0; i < listMenuTemplate.totalItems; i++)
{ {
u32 curWidth = GetStringWidth(2, listMenuTemplate.items[i].unk_00, listMenuTemplate.lettersSpacing); u32 curWidth = GetStringWidth(2, listMenuTemplate.items[i].name, listMenuTemplate.lettersSpacing);
if (curWidth > width) if (curWidth > width)
width = curWidth; width = curWidth;
} }
src/teachy_tv.c
+217
View File
@@ -0,0 +1,217 @@
#include "main.h"
#include "global.h"
#include "task.h"
#include "menu.h"
#include "palette.h"
#include "sprite.h"
#include "menu_helpers.h"
#include "sound.h"
#include "malloc.h"
#include "sprite.h"
#include "scanline_effect.h"
#include "bg.h"
#include "gpu_regs.h"
#include "decompress.h"
#include "window.h"
#include "list_menu.h"
#include "item.h"
#include "constants/songs.h"
#include "constants/items.h"
typedef struct {
void (*callback)();
u8 mode;
u8 param1;
u16 param2;
u16 param3;
u8 param4;
u8 filler;
} TeachyTv_s;
extern TeachyTv_s gTeachyTV_StaticResources;
extern void * gUnknown_203F450;
void C2TeachyTv();
void C2TeachyTvMainCallback();
void VblankHandlerTeachyTv();
void sub_815ABC4(u8 mode, void (*cb)());
void CB2_ReturnToTeachyTV();
extern void sub_815AC20();
void TeachyTvCreateAndRenderRbox();
extern void TeachyTvInitIo();
extern u8 TeachyTvSetupObj();
extern void TeachyTvConfigRboxAndObj(u8);
extern u8 sub_815AEE8();
extern void sub_815AF5C();
extern void sub_815B094();
void TeachyTvSetupBg();
void TeachyTvLoadGraphic();
extern void TeachyTvTaskFunction(u8);
extern void sub_815B2C0(u8);
extern void VblankHblankHandlerSetZero();
extern void sub_812B1E0(u16);
extern struct BgTemplate gUnknown_84792E0;
extern void *gUnknown_203F450; // tilemap pointer location
extern u8 gUnknown_8E86240; // tilemap
extern u8 gUnknown_8E86BE8;
extern u8 gUnknown_8E86D6C;
extern u8 gUnknown_8E86F98; // pal
extern struct SpritePalette gUnknown_83A5348;
extern void sub_815BD80(void *);
typedef struct Task Task;
extern struct WindowTemplate gUnknown_84792F0;
void C2TeachyTv()
{
RunTasks();
AnimateSprites();
BuildOamBuffer();
do_scheduled_bg_tilemap_copies_to_vram();
UpdatePaletteFade();
}
void VblankHandlerTeachyTv()
{
LoadOam();
ProcessSpriteCopyRequests();
TransferPlttBuffer();
}
void sub_815ABC4(u8 mode, void (*cb)())
{
// JZW: I'm sorry, but otherwise I can't make it match baserom
TeachyTv_s *v3 = &gTeachyTV_StaticResources;
u16 v4 = 0;
v3->mode = mode;
v3->callback = cb;
if(!mode) {
v3->param2 = v4;
v3->param3 = v4;
v3->param1 = 0;
}
if(mode == 1)
v3->mode = 0;
SetMainCallback2(C2TeachyTvMainCallback);
}
void CB2_ReturnToTeachyTV()
{
if(gTeachyTV_StaticResources.mode == 1)
sub_815ABC4(1,gTeachyTV_StaticResources.callback);
else
sub_815ABC4(2,gTeachyTV_StaticResources.callback);
}
void sub_815AC20()
{
gTeachyTV_StaticResources.mode = 1;
}
void C2TeachyTvMainCallback()
{
int state;
void *mallocPtr;
int taskId;
Task *taskAddr;
u8 **v4;
u32 x;
state = gMain.state;
if ( state == 0 )
goto section_0;
else if ( state == 1 )
goto section_1;
else
return;
section_0:
v4 = (u8 **)&gUnknown_203F450;
(*v4) = (u8*)AllocZeroed(0x4008u);
*(u32*)gUnknown_203F450 = (u32)state;
*((u8*)gUnknown_203F450 + 0x4006) = state;
*((u8*)gUnknown_203F450 + 0x4007) = 0xFF;
VblankHblankHandlerSetZero();
clear_scheduled_bg_copies_to_vram();
ScanlineEffect_Stop();
FreeAllSpritePalettes();
ResetPaletteFade();
ResetSpriteData();
ResetTasks();
TeachyTvSetupBg();
TeachyTvLoadGraphic();
++gMain.state;
return;
section_1:
if( free_temp_tile_data_buffers_if_possible() == 1 )
return;
TeachyTvCreateAndRenderRbox();
TeachyTvInitIo();
if ( gTeachyTV_StaticResources.mode == 2 )
{
taskId = CreateTask(TeachyTvTaskFunction, 0);
gTasks[taskId].data[1] = TeachyTvSetupObj();
TeachyTvConfigRboxAndObj(taskId);
}
else
{
taskId = CreateTask(sub_815B2C0, 0);
x = (u32)sub_815AEE8();
gTasks[taskId].data[0] = (x << 24) >> 24;
gTasks[taskId].data[1] = TeachyTvSetupObj();
sub_815AF5C();
PlayNewMapMusic(BGM_FRLG_TEACHY_TV);
sub_815B094();
}
schedule_bg_copy_tilemap_to_vram(0);
schedule_bg_copy_tilemap_to_vram(1u);
schedule_bg_copy_tilemap_to_vram(2u);
schedule_bg_copy_tilemap_to_vram(3u);
sub_812B1E0(9); // help system something
BlendPalettes(0xFFFFFFFF, 0x10u, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10u, 0, 0);
SetVBlankCallback(VblankHandlerTeachyTv);
SetMainCallback2(C2TeachyTv);
}
void TeachyTvSetupBg()
{
InitBgReg();
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, &gUnknown_84792E0, 4u);
SetBgTilemapBuffer(1u, (u8 *)gUnknown_203F450 + 4);
SetBgTilemapBuffer(2u, (u8 *)gUnknown_203F450 + 0x1004);
SetBgTilemapBuffer(3u, (u8 *)gUnknown_203F450 + 0x2004);
SetGpuReg(0, 0x3040u);
ShowBg(0);
ShowBg(1u);
ShowBg(2u);
ShowBg(3u);
ChangeBgX(3u, 0x1000u, 2u);
ChangeBgY(3u, 0x2800u, 1u);
*((u8 *)gUnknown_203F450 + 0x4004) = 0;
*((u8 *)gUnknown_203F450 + 0x4005) = 3;
SetGpuReg(0x50u, 0);
}
void TeachyTvLoadGraphic()
{
u16 src;
src = 0;
reset_temp_tile_data_buffers();
decompress_and_copy_tile_data_to_vram(1u, &gUnknown_8E86240, 0, 0, 0);
LZDecompressWram((u8 *)&gUnknown_8E86BE8, (*(u8 **)&gUnknown_203F450) + 4);
LZDecompressWram((u8 *)&gUnknown_8E86D6C, (*(u8 **)&gUnknown_203F450) + 0x3004);
LoadCompressedPalette(&gUnknown_8E86F98, 0, 0x80u);
LoadPalette(&src, 0, 2u);
LoadSpritePalette((struct SpritePalette *)&gUnknown_83A5348);
sub_815BD80((u8 *)gUnknown_203F450 + 0x2004);
}
void TeachyTvCreateAndRenderRbox()
{
InitWindows(&gUnknown_84792F0);
DeactivateAllTextPrinters();
FillWindowPixelBuffer(0, 0xCCu);
PutWindowTilemap(0);
PutWindowTilemap(1u);
CopyWindowToVram(0, 2u);
}
src/tm_case.c
+6 -6
View File
@@ -321,7 +321,7 @@ static bool8 DoSetUpTMCaseUI(void)
switch (gMain.state) switch (gMain.state)
{ {
case 0: case 0:
sub_80BF768(); VblankHblankHandlerSetZero();
clear_scheduled_bg_copies_to_vram(); clear_scheduled_bg_copies_to_vram();
gMain.state++; gMain.state++;
break; break;
@@ -426,7 +426,7 @@ static void ResetBufferPointers_NoFree(void)
static void LoadBGTemplates(void) static void LoadBGTemplates(void)
{ {
void ** ptr; void ** ptr;
sub_80BF7C8(); InitBgReg();
ptr = &sTilemapBuffer; ptr = &sTilemapBuffer;
*ptr = AllocZeroed(0x800); *ptr = AllocZeroed(0x800);
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
@@ -496,11 +496,11 @@ static void InitTMCaseListMenuItems(void)
for (i = 0; i < sTMCaseDynamicResources->numTMs; i++) for (i = 0; i < sTMCaseDynamicResources->numTMs; i++)
{ {
GetTMNumberAndMoveString(sListMenuStringsBuffer[i], pocket->itemSlots[i].itemId); GetTMNumberAndMoveString(sListMenuStringsBuffer[i], pocket->itemSlots[i].itemId);
sListMenuItemsBuffer[i].unk_00 = sListMenuStringsBuffer[i]; sListMenuItemsBuffer[i].name = sListMenuStringsBuffer[i];
sListMenuItemsBuffer[i].unk_04 = i; sListMenuItemsBuffer[i].id = i;
} }
sListMenuItemsBuffer[i].unk_00 = gText_Close; sListMenuItemsBuffer[i].name = gText_Close;
sListMenuItemsBuffer[i].unk_04 = -2; sListMenuItemsBuffer[i].id = -2;
gMultiuseListMenuTemplate.items = sListMenuItemsBuffer; gMultiuseListMenuTemplate.items = sListMenuItemsBuffer;
gMultiuseListMenuTemplate.totalItems = sTMCaseDynamicResources->numTMs + 1; gMultiuseListMenuTemplate.totalItems = sTMCaseDynamicResources->numTMs + 1;
gMultiuseListMenuTemplate.windowId = 0; gMultiuseListMenuTemplate.windowId = 0;
sym_ewram.txt
+1 -4
View File
@@ -1639,10 +1639,7 @@ gUnknown_203F440: @ 203F440
.space 0x4 .space 0x4
gTeachyTV_StaticResources: @ 203F444 gTeachyTV_StaticResources: @ 203F444
.space 0x6 .space 12
gUnknown_203F44A: @ 203F44A
.space 0x6
gUnknown_203F450: @ 203F450 gUnknown_203F450: @ 203F450
.space 0x4 .space 0x4