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

Merge pull request #46 from PikalaxALT/oak_speech

Browse Source 
Oak speech
This commit is contained in:
PikalaxALT
2019-04-11 13:21:26 -04:00
committed by GitHub
parent 7f920b887f 18b20721d9
commit c17af4853c
103 changed files with 4463 additions and 7728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+20 -20
View File
@@ -908,7 +908,7 @@ _0800F8F0:
ldrsh r0, [r5, r1]
cmp r0, 0
beq _0800F958
ldr r4, _0800F944 @ =gUnknown_2022978
ldr r4, _0800F944 @ =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@@ -923,7 +923,7 @@ _0800F90A:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, _0800F948 @ =gUnknown_202297C
ldr r4, _0800F948 @ =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@@ -938,21 +938,21 @@ _0800F928:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r0, _0800F94C @ =gUnknown_202297A
ldr r0, _0800F94C @ =gBattle_BG1_Y
ldr r2, _0800F950 @ =0x0000ffdc
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0800F954 @ =gUnknown_202297E
ldr r0, _0800F954 @ =gBattle_BG2_Y
strh r1, [r0]
b _0800F9C4
.align 2, 0
_0800F944: .4byte gUnknown_2022978
_0800F948: .4byte gUnknown_202297C
_0800F94C: .4byte gUnknown_202297A
_0800F944: .4byte gBattle_BG1_X
_0800F948: .4byte gBattle_BG2_X
_0800F94C: .4byte gBattle_BG1_Y
_0800F950: .4byte 0x0000ffdc
_0800F954: .4byte gUnknown_202297E
_0800F954: .4byte gBattle_BG2_Y
_0800F958:
ldr r4, _0800F9E8 @ =gUnknown_2022978
ldr r4, _0800F9E8 @ =gBattle_BG1_X
ldrh r0, [r5, 0xA]
bl Sin2
lsls r0, 16
@@ -967,7 +967,7 @@ _0800F96A:
adds r0, r3, 0
subs r0, r1
strh r0, [r4]
ldr r4, _0800F9EC @ =gUnknown_202297A
ldr r4, _0800F9EC @ =gBattle_BG1_Y
ldrh r0, [r5, 0xA]
bl Cos2
lsls r0, 16
@@ -979,7 +979,7 @@ _0800F988:
asrs r0, 5
subs r0, 0xA4
strh r0, [r4]
ldr r4, _0800F9F0 @ =gUnknown_202297C
ldr r4, _0800F9F0 @ =gBattle_BG2_X
ldrh r0, [r5, 0xC]
bl Sin2
lsls r0, 16
@@ -994,7 +994,7 @@ _0800F9A0:
adds r0, r2, 0
subs r0, r1
strh r0, [r4]
ldr r4, _0800F9F4 @ =gUnknown_202297E
ldr r4, _0800F9F4 @ =gBattle_BG2_Y
ldrh r0, [r5, 0xC]
bl Cos2
lsls r0, 16
@@ -1025,10 +1025,10 @@ _0800F9C4:
strh r0, [r1, 0xA]
b _0800FAC4
.align 2, 0
_0800F9E8: .4byte gUnknown_2022978
_0800F9EC: .4byte gUnknown_202297A
_0800F9F0: .4byte gUnknown_202297C
_0800F9F4: .4byte gUnknown_202297E
_0800F9E8: .4byte gBattle_BG1_X
_0800F9EC: .4byte gBattle_BG1_Y
_0800F9F0: .4byte gBattle_BG2_X
_0800F9F4: .4byte gBattle_BG2_Y
_0800F9F8: .4byte gTasks
_0800F9FC:
movs r3, 0x12
@@ -1190,11 +1190,11 @@ sub_800FAE0: @ 800FAE0
movs r0, 0x4A
movs r1, 0x36
bl SetGpuReg
ldr r0, _0800FB84 @ =gUnknown_202297A
ldr r0, _0800FB84 @ =gBattle_BG1_Y
ldr r2, _0800FB88 @ =0x0000ff5c
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0800FB8C @ =gUnknown_202297E
ldr r0, _0800FB8C @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _0800FB90 @ =gUnknown_8248318
bl sub_800F034
@@ -1208,9 +1208,9 @@ _0800FB74: .4byte 0x06010000
_0800FB78: .4byte gFile_graphics_battle_transitions_vs_frame_palette
_0800FB7C: .4byte 0x00005c04
_0800FB80: .4byte gFile_graphics_battle_transitions_vs_frame_tilemap
_0800FB84: .4byte gUnknown_202297A
_0800FB84: .4byte gBattle_BG1_Y
_0800FB88: .4byte 0x0000ff5c
_0800FB8C: .4byte gUnknown_202297E
_0800FB8C: .4byte gBattle_BG2_Y
_0800FB90: .4byte gUnknown_8248318
_0800FB94:
movs r0, 0x80
asm/battle_2.s
+88 -88
View File
@@ -104,8 +104,8 @@ sub_800FE24: @ 800FE24
strh r0, [r1]
ldr r0, _0800FF34 @ =gUnknown_2022986
strh r4, [r0]
bl dp12_8087EA4
ldr r0, _0800FF38 @ =gUnknown_2038700
bl ScanlineEffect_Clear
ldr r0, _0800FF38 @ =gScanlineEffectRegBuffers
movs r3, 0xF0
movs r1, 0xF0
lsls r1, 3
@@ -121,7 +121,7 @@ _0800FE88:
bge _0800FE88
movs r1, 0x50
ldr r4, _0800FF3C @ =gUnknown_824EFE4
ldr r0, _0800FF38 @ =gUnknown_2038700
ldr r0, _0800FF38 @ =gScanlineEffectRegBuffers
ldr r3, _0800FF40 @ =0x0000ff10
movs r5, 0x82
lsls r5, 4
@@ -138,24 +138,24 @@ _0800FEA6:
ldr r0, [r4]
ldr r1, [r4, 0x4]
ldr r2, [r4, 0x8]
bl sub_8087EE4
bl ScanlineEffect_SetParams
bl ResetPaletteFade
ldr r0, _0800FF44 @ =gUnknown_2022974
ldr r0, _0800FF44 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _0800FF48 @ =gUnknown_2022976
ldr r0, _0800FF48 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _0800FF4C @ =gUnknown_2022978
ldr r0, _0800FF4C @ =gBattle_BG1_X
strh r1, [r0]
ldr r0, _0800FF50 @ =gUnknown_202297A
ldr r0, _0800FF50 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _0800FF54 @ =gUnknown_202297C
ldr r0, _0800FF54 @ =gBattle_BG2_X
strh r1, [r0]
ldr r0, _0800FF58 @ =gUnknown_202297E
ldr r0, _0800FF58 @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _0800FF5C @ =gUnknown_2022980
ldr r0, _0800FF5C @ =gBattle_BG3_X
strh r1, [r0]
ldr r0, _0800FF60 @ =gUnknown_2022982
ldr r0, _0800FF60 @ =gBattle_BG3_Y
strh r1, [r0]
bl sub_807FC5C
ldr r1, _0800FF64 @ =gUnknown_2022B50
@@ -186,17 +186,17 @@ _0800FF28: .4byte 0x05006000
_0800FF2C: .4byte 0x00005051
_0800FF30: .4byte gUnknown_2022984
_0800FF34: .4byte gUnknown_2022986
_0800FF38: .4byte gUnknown_2038700
_0800FF38: .4byte gScanlineEffectRegBuffers
_0800FF3C: .4byte gUnknown_824EFE4
_0800FF40: .4byte 0x0000ff10
_0800FF44: .4byte gUnknown_2022974
_0800FF48: .4byte gUnknown_2022976
_0800FF4C: .4byte gUnknown_2022978
_0800FF50: .4byte gUnknown_202297A
_0800FF54: .4byte gUnknown_202297C
_0800FF58: .4byte gUnknown_202297E
_0800FF5C: .4byte gUnknown_2022980
_0800FF60: .4byte gUnknown_2022982
_0800FF44: .4byte gBattle_BG0_X
_0800FF48: .4byte gBattle_BG0_Y
_0800FF4C: .4byte gBattle_BG1_X
_0800FF50: .4byte gBattle_BG1_Y
_0800FF54: .4byte gBattle_BG2_X
_0800FF58: .4byte gBattle_BG2_Y
_0800FF5C: .4byte gBattle_BG3_X
_0800FF60: .4byte gBattle_BG3_Y
_0800FF64: .4byte gUnknown_2022B50
_0800FF68: .4byte gReservedSpritePaletteCount
_0800FF6C: .4byte sub_80116F4
@@ -2410,7 +2410,7 @@ FreeRestoreBattleData: @ 8011174
ldr r0, _080111B0 @ =gUnknown_3004F80
ldr r0, [r0]
str r0, [r1]
ldr r2, _080111B4 @ =gUnknown_2039600
ldr r2, _080111B4 @ =gScanlineEffect
movs r0, 0x3
strb r0, [r2, 0x15]
ldr r0, _080111B8 @ =0x00000439
@@ -2431,7 +2431,7 @@ FreeRestoreBattleData: @ 8011174
.align 2, 0
_080111AC: .4byte gMain
_080111B0: .4byte gUnknown_3004F80
_080111B4: .4byte gUnknown_2039600
_080111B4: .4byte gScanlineEffect
_080111B8: .4byte 0x00000439
thumb_func_end FreeRestoreBattleData
@@ -3125,35 +3125,35 @@ _080116F0: .4byte 0x04000008
sub_80116F4: @ 80116F4
push {lr}
bl Random
ldr r0, _08011788 @ =gUnknown_2022974
ldr r0, _08011788 @ =gBattle_BG0_X
ldrh r1, [r0]
movs r0, 0x10
bl SetGpuReg
ldr r0, _0801178C @ =gUnknown_2022976
ldr r0, _0801178C @ =gBattle_BG0_Y
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, _08011790 @ =gUnknown_2022978
ldr r0, _08011790 @ =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, _08011794 @ =gUnknown_202297A
ldr r0, _08011794 @ =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, _08011798 @ =gUnknown_202297C
ldr r0, _08011798 @ =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, _0801179C @ =gUnknown_202297E
ldr r0, _0801179C @ =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, _080117A0 @ =gUnknown_2022980
ldr r0, _080117A0 @ =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
ldr r0, _080117A4 @ =gUnknown_2022982
ldr r0, _080117A4 @ =gBattle_BG3_Y
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
@@ -3176,18 +3176,18 @@ sub_80116F4: @ 80116F4
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
_08011788: .4byte gUnknown_2022974
_0801178C: .4byte gUnknown_2022976
_08011790: .4byte gUnknown_2022978
_08011794: .4byte gUnknown_202297A
_08011798: .4byte gUnknown_202297C
_0801179C: .4byte gUnknown_202297E
_080117A0: .4byte gUnknown_2022980
_080117A4: .4byte gUnknown_2022982
_08011788: .4byte gBattle_BG0_X
_0801178C: .4byte gBattle_BG0_Y
_08011790: .4byte gBattle_BG1_X
_08011794: .4byte gBattle_BG1_Y
_08011798: .4byte gBattle_BG2_X
_0801179C: .4byte gBattle_BG2_Y
_080117A0: .4byte gBattle_BG3_X
_080117A4: .4byte gBattle_BG3_Y
_080117A8: .4byte gUnknown_2022984
_080117AC: .4byte gUnknown_2022986
_080117B0: .4byte gUnknown_2022988
@@ -3548,8 +3548,8 @@ sub_8011A1C: @ 8011A1C
strh r0, [r1]
ldr r0, _08011B4C @ =gUnknown_2022986
strh r4, [r0]
bl dp12_8087EA4
ldr r0, _08011B50 @ =gUnknown_2038700
bl ScanlineEffect_Clear
ldr r0, _08011B50 @ =gScanlineEffectRegBuffers
movs r3, 0xF0
movs r1, 0xF0
lsls r1, 3
@@ -3564,7 +3564,7 @@ _08011A80:
cmp r1, 0
bge _08011A80
movs r1, 0x50
ldr r0, _08011B50 @ =gUnknown_2038700
ldr r0, _08011B50 @ =gScanlineEffectRegBuffers
ldr r3, _08011B54 @ =0x0000ff10
movs r4, 0x82
lsls r4, 4
@@ -3579,22 +3579,22 @@ _08011A9C:
cmp r1, 0x9F
ble _08011A9C
bl ResetPaletteFade
ldr r0, _08011B58 @ =gUnknown_2022974
ldr r0, _08011B58 @ =gBattle_BG0_X
movs r4, 0
strh r4, [r0]
ldr r0, _08011B5C @ =gUnknown_2022976
ldr r0, _08011B5C @ =gBattle_BG0_Y
strh r4, [r0]
ldr r0, _08011B60 @ =gUnknown_2022978
ldr r0, _08011B60 @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _08011B64 @ =gUnknown_202297A
ldr r0, _08011B64 @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _08011B68 @ =gUnknown_202297C
ldr r0, _08011B68 @ =gBattle_BG2_X
strh r4, [r0]
ldr r0, _08011B6C @ =gUnknown_202297E
ldr r0, _08011B6C @ =gBattle_BG2_Y
strh r4, [r0]
ldr r0, _08011B70 @ =gUnknown_2022980
ldr r0, _08011B70 @ =gBattle_BG3_X
strh r4, [r0]
ldr r0, _08011B74 @ =gUnknown_2022982
ldr r0, _08011B74 @ =gBattle_BG3_Y
strh r4, [r0]
bl sub_800F34C
ldr r0, _08011B78 @ =gUnknown_8D004D8
@@ -3645,16 +3645,16 @@ _08011B40: .4byte 0x05006000
_08011B44: .4byte 0x00005051
_08011B48: .4byte gUnknown_2022984
_08011B4C: .4byte gUnknown_2022986
_08011B50: .4byte gUnknown_2038700
_08011B50: .4byte gScanlineEffectRegBuffers
_08011B54: .4byte 0x0000ff10
_08011B58: .4byte gUnknown_2022974
_08011B5C: .4byte gUnknown_2022976
_08011B60: .4byte gUnknown_2022978
_08011B64: .4byte gUnknown_202297A
_08011B68: .4byte gUnknown_202297C
_08011B6C: .4byte gUnknown_202297E
_08011B70: .4byte gUnknown_2022980
_08011B74: .4byte gUnknown_2022982
_08011B58: .4byte gBattle_BG0_X
_08011B5C: .4byte gBattle_BG0_Y
_08011B60: .4byte gBattle_BG1_X
_08011B64: .4byte gBattle_BG1_Y
_08011B68: .4byte gBattle_BG2_X
_08011B6C: .4byte gBattle_BG2_Y
_08011B70: .4byte gBattle_BG3_X
_08011B74: .4byte gBattle_BG3_Y
_08011B78: .4byte gUnknown_8D004D8
_08011B7C: .4byte gReservedSpritePaletteCount
_08011B80: .4byte sub_80116F4
@@ -12610,10 +12610,10 @@ sub_8016374: @ 8016374
adds r0, r1
ldrb r0, [r0]
strb r0, [r3]
ldr r0, _080163EC @ =gUnknown_2022974
ldr r0, _080163EC @ =gBattle_BG0_X
movs r2, 0
strh r2, [r0]
ldr r0, _080163F0 @ =gUnknown_2022976
ldr r0, _080163F0 @ =gBattle_BG0_Y
strh r2, [r0]
ldr r1, _080163F4 @ =gUnknown_2023FF8
ldrb r0, [r3]
@@ -12661,8 +12661,8 @@ _080163DA:
_080163E0: .4byte sBattler_AI
_080163E4: .4byte gUnknown_2023BDE
_080163E8: .4byte gUnknown_2023BE2
_080163EC: .4byte gUnknown_2022974
_080163F0: .4byte gUnknown_2022976
_080163EC: .4byte gBattle_BG0_X
_080163F0: .4byte gBattle_BG0_Y
_080163F4: .4byte gUnknown_2023FF8
_080163F8: .4byte gUnknown_2023FFC
_080163FC: .4byte gBattleTextBuff1
@@ -12690,10 +12690,10 @@ sub_8016418: @ 8016418
ldrb r0, [r0]
strb r0, [r2]
strb r0, [r4]
ldr r0, _08016484 @ =gUnknown_2022974
ldr r0, _08016484 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08016488 @ =gUnknown_2022976
ldr r0, _08016488 @ =gBattle_BG0_Y
strh r1, [r0]
ldrb r0, [r4]
bl ClearFuryCutterDestinyBondGrudge
@@ -12726,8 +12726,8 @@ _08016474: .4byte sBattler_AI
_08016478: .4byte gBattlerTarget
_0801647C: .4byte gUnknown_2023BDE
_08016480: .4byte gUnknown_2023BE2
_08016484: .4byte gUnknown_2022974
_08016488: .4byte gUnknown_2022976
_08016484: .4byte gBattle_BG0_X
_08016488: .4byte gBattle_BG0_Y
_0801648C: .4byte gUnknown_2023D68
_08016490: .4byte gUnknown_20233C4
_08016494: .4byte gUnknown_2023D74
@@ -13391,10 +13391,10 @@ sub_80169E8: @ 80169E8
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016A50 @ =gUnknown_2022974
ldr r0, _08016A50 @ =gBattle_BG0_X
movs r5, 0
strh r5, [r0]
ldr r0, _08016A54 @ =gUnknown_2022976
ldr r0, _08016A54 @ =gBattle_BG0_Y
strh r5, [r0]
ldr r4, _08016A58 @ =gBattleStruct
ldr r1, [r4]
@@ -13431,8 +13431,8 @@ sub_80169E8: @ 80169E8
_08016A44: .4byte sBattler_AI
_08016A48: .4byte gUnknown_2023BDE
_08016A4C: .4byte gUnknown_2023BE2
_08016A50: .4byte gUnknown_2022974
_08016A54: .4byte gUnknown_2022976
_08016A50: .4byte gBattle_BG0_X
_08016A54: .4byte gBattle_BG0_Y
_08016A58: .4byte gBattleStruct
_08016A5C: .4byte gEnemyParty
_08016A60: .4byte gBaseStats
@@ -13492,10 +13492,10 @@ sub_8016AC0: @ 8016AC0
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016B04 @ =gUnknown_2022974
ldr r0, _08016B04 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08016B08 @ =gUnknown_2022976
ldr r0, _08016B08 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r1, _08016B0C @ =gUnknown_2039994
ldrb r0, [r1]
@@ -13516,8 +13516,8 @@ sub_8016AC0: @ 8016AC0
_08016AF8: .4byte sBattler_AI
_08016AFC: .4byte gUnknown_2023BDE
_08016B00: .4byte gUnknown_2023BE2
_08016B04: .4byte gUnknown_2022974
_08016B08: .4byte gUnknown_2022976
_08016B04: .4byte gBattle_BG0_X
_08016B08: .4byte gBattle_BG0_Y
_08016B0C: .4byte gUnknown_2039994
_08016B10: .4byte gUnknown_2023D68
_08016B14: .4byte gUnknown_2023D74
@@ -13535,10 +13535,10 @@ sub_8016B20: @ 8016B20
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016BA8 @ =gUnknown_2022974
ldr r0, _08016BA8 @ =gBattle_BG0_X
movs r7, 0
strh r7, [r0]
ldr r0, _08016BAC @ =gUnknown_2022976
ldr r0, _08016BAC @ =gBattle_BG0_Y
strh r7, [r0]
bl Random
ldr r6, _08016BB0 @ =gBattleStruct
@@ -13592,8 +13592,8 @@ _08016B86:
_08016B9C: .4byte sBattler_AI
_08016BA0: .4byte gUnknown_2023BDE
_08016BA4: .4byte gUnknown_2023BE2
_08016BA8: .4byte gUnknown_2022974
_08016BAC: .4byte gUnknown_2022976
_08016BA8: .4byte gBattle_BG0_X
_08016BAC: .4byte gBattle_BG0_Y
_08016BB0: .4byte gBattleStruct
_08016BB4: .4byte gUnknown_2023D74
_08016BB8: .4byte gUnknown_81D9A04
@@ -13610,10 +13610,10 @@ sub_8016BC0: @ 8016BC0
adds r0, r1
ldrb r0, [r0]
strb r0, [r2]
ldr r0, _08016C48 @ =gUnknown_2022974
ldr r0, _08016C48 @ =gBattle_BG0_X
movs r7, 0
strh r7, [r0]
ldr r0, _08016C4C @ =gUnknown_2022976
ldr r0, _08016C4C @ =gBattle_BG0_Y
strh r7, [r0]
bl Random
ldr r6, _08016C50 @ =gBattleStruct
@@ -13667,8 +13667,8 @@ _08016C26:
_08016C3C: .4byte sBattler_AI
_08016C40: .4byte gUnknown_2023BDE
_08016C44: .4byte gUnknown_2023BE2
_08016C48: .4byte gUnknown_2022974
_08016C4C: .4byte gUnknown_2022976
_08016C48: .4byte gBattle_BG0_X
_08016C4C: .4byte gBattle_BG0_Y
_08016C50: .4byte gBattleStruct
_08016C54: .4byte gUnknown_2023D74
_08016C58: .4byte gUnknown_81D9A04
@@ -13713,10 +13713,10 @@ HandleAction_Action9: @ 8016C9C
adds r0, r1
ldrb r2, [r0]
strb r2, [r3]
ldr r0, _08016CF4 @ =gUnknown_2022974
ldr r0, _08016CF4 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08016CF8 @ =gUnknown_2022976
ldr r0, _08016CF8 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r1, _08016CFC @ =gBattleTextBuff1
movs r0, 0xFD
@@ -13747,8 +13747,8 @@ HandleAction_Action9: @ 8016C9C
_08016CE8: .4byte sBattler_AI
_08016CEC: .4byte gUnknown_2023BDE
_08016CF0: .4byte gUnknown_2023BE2
_08016CF4: .4byte gUnknown_2022974
_08016CF8: .4byte gUnknown_2022976
_08016CF4: .4byte gBattle_BG0_X
_08016CF8: .4byte gBattle_BG0_Y
_08016CFC: .4byte gBattleTextBuff1
_08016D00: .4byte gBattlerPartyIndexes
_08016D04: .4byte gUnknown_2023D74
asm/battle_anim.s
+40 -40
View File
@@ -1037,10 +1037,10 @@ _08072C88:
strh r1, [r2, 0xC]
cmp r7, 0
bne _08072CF4
ldr r0, _08072CEC @ =gUnknown_2022978
ldr r0, _08072CEC @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072CF0 @ =gUnknown_202297A
ldr r0, _08072CF0 @ =gBattle_BG1_Y
b _08072CFC
.align 2, 0
_08072CD8: .4byte gUnknown_2037F1B
@@ -1048,13 +1048,13 @@ _08072CDC: .4byte gUnknown_2023D44
_08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072CE4: .4byte gTasks
_08072CE8: .4byte gSprites
_08072CEC: .4byte gUnknown_2022978
_08072CF0: .4byte gUnknown_202297A
_08072CEC: .4byte gBattle_BG1_X
_08072CF0: .4byte gBattle_BG1_Y
_08072CF4:
ldr r0, _08072D8C @ =gUnknown_202297C
ldr r0, _08072D8C @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072D90 @ =gUnknown_202297E
ldr r0, _08072D90 @ =gBattle_BG2_Y
_08072CFC:
ldrh r0, [r0]
strh r0, [r2, 0x10]
@@ -1121,26 +1121,26 @@ _08072D3E:
strh r1, [r2, 0xC]
cmp r7, 0
bne _08072DB0
ldr r0, _08072DA8 @ =gUnknown_2022978
ldr r0, _08072DA8 @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072DAC @ =gUnknown_202297A
ldr r0, _08072DAC @ =gBattle_BG1_Y
b _08072DB8
.align 2, 0
_08072D8C: .4byte gUnknown_202297C
_08072D90: .4byte gUnknown_202297E
_08072D8C: .4byte gBattle_BG2_X
_08072D90: .4byte gBattle_BG2_Y
_08072D94: .4byte gTasks
_08072D98: .4byte gUnknown_2037F14
_08072D9C: .4byte gUnknown_2023D44
_08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072DA4: .4byte gSprites
_08072DA8: .4byte gUnknown_2022978
_08072DAC: .4byte gUnknown_202297A
_08072DA8: .4byte gBattle_BG1_X
_08072DAC: .4byte gBattle_BG1_Y
_08072DB0:
ldr r0, _08072DDC @ =gUnknown_202297C
ldr r0, _08072DDC @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r2, 0xE]
ldr r0, _08072DE0 @ =gUnknown_202297E
ldr r0, _08072DE0 @ =gBattle_BG2_Y
_08072DB8:
ldrh r0, [r0]
strh r0, [r2, 0x10]
@@ -1162,8 +1162,8 @@ _08072DCE:
pop {r0}
bx r0
.align 2, 0
_08072DDC: .4byte gUnknown_202297C
_08072DE0: .4byte gUnknown_202297E
_08072DDC: .4byte gBattle_BG2_X
_08072DE0: .4byte gBattle_BG2_Y
_08072DE4: .4byte gTasks
_08072DE8: .4byte gUnknown_2037F14
_08072DEC: .4byte gUnknown_2037ED4
@@ -1271,7 +1271,7 @@ _08072E5E:
ldr r2, _08072F6C @ =gUnknown_2023D44
adds r2, r7, r2
ldrb r0, [r2]
ldr r5, _08072F70 @ =gUnknown_2022978
ldr r5, _08072F70 @ =gBattle_BG1_X
ldr r3, _08072F74 @ =gSprites
lsls r1, r0, 4
adds r1, r0
@@ -1283,7 +1283,7 @@ _08072E5E:
negs r0, r0
adds r0, 0x20
strh r0, [r5]
ldr r4, _08072F78 @ =gUnknown_202297A
ldr r4, _08072F78 @ =gBattle_BG1_Y
ldrh r0, [r1, 0x26]
ldrh r1, [r1, 0x22]
adds r0, r1
@@ -1350,9 +1350,9 @@ _08072F60: .4byte 0x0600e000
_08072F64: .4byte 0x01000800
_08072F68: .4byte 0x01000400
_08072F6C: .4byte gUnknown_2023D44
_08072F70: .4byte gUnknown_2022978
_08072F70: .4byte gBattle_BG1_X
_08072F74: .4byte gSprites
_08072F78: .4byte gUnknown_202297A
_08072F78: .4byte gBattle_BG1_Y
_08072F7C: .4byte gPlttBufferUnfaded + 0x200
_08072F80: .4byte 0x04000008
_08072F84:
@@ -1404,7 +1404,7 @@ _08072F84:
ldr r2, _080730A4 @ =gUnknown_2023D44
adds r2, r7, r2
ldrb r0, [r2]
ldr r5, _080730A8 @ =gUnknown_202297C
ldr r5, _080730A8 @ =gBattle_BG2_X
ldr r3, _080730AC @ =gSprites
lsls r1, r0, 4
adds r1, r0
@@ -1416,7 +1416,7 @@ _08072F84:
negs r0, r0
adds r0, 0x20
strh r0, [r5]
ldr r4, _080730B0 @ =gUnknown_202297E
ldr r4, _080730B0 @ =gBattle_BG2_Y
ldrh r0, [r1, 0x26]
ldrh r1, [r1, 0x22]
adds r0, r1
@@ -1484,9 +1484,9 @@ _08073098: .4byte 0x0600f000
_0807309C: .4byte 0x01000800
_080730A0: .4byte 0x01000400
_080730A4: .4byte gUnknown_2023D44
_080730A8: .4byte gUnknown_202297C
_080730A8: .4byte gBattle_BG2_X
_080730AC: .4byte gSprites
_080730B0: .4byte gUnknown_202297E
_080730B0: .4byte gBattle_BG2_Y
_080730B4: .4byte gPlttBufferUnfaded + 0x200
_080730B8: .4byte 0x05000120
_080730BC: .4byte 0x04000008
@@ -1563,21 +1563,21 @@ sub_8073128: @ 8073128
bne _08073154
movs r0, 0x1
bl sub_8075358
ldr r0, _0807314C @ =gUnknown_2022978
ldr r0, _0807314C @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _08073150 @ =gUnknown_202297A
ldr r0, _08073150 @ =gBattle_BG1_Y
strh r4, [r0]
b _08073164
.align 2, 0
_0807314C: .4byte gUnknown_2022978
_08073150: .4byte gUnknown_202297A
_0807314C: .4byte gBattle_BG1_X
_08073150: .4byte gBattle_BG1_Y
_08073154:
movs r0, 0x2
bl sub_8075358
ldr r0, _0807316C @ =gUnknown_202297C
ldr r0, _0807316C @ =gBattle_BG2_X
movs r1, 0
strh r1, [r0]
ldr r0, _08073170 @ =gUnknown_202297E
ldr r0, _08073170 @ =gBattle_BG2_Y
strh r1, [r0]
_08073164:
add sp, 0x10
@@ -1585,8 +1585,8 @@ _08073164:
pop {r0}
bx r0
.align 2, 0
_0807316C: .4byte gUnknown_202297C
_08073170: .4byte gUnknown_202297E
_0807316C: .4byte gBattle_BG2_X
_08073170: .4byte gBattle_BG2_Y
thumb_func_end sub_8073128
thumb_func_start task_pA_ma0A_obj_to_bg_pal
@@ -1627,13 +1627,13 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0807320C
ldr r1, _080731F8 @ =gUnknown_2022978
ldr r1, _080731F8 @ =gBattle_BG1_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, _080731FC @ =gUnknown_202297A
ldr r1, _080731FC @ =gBattle_BG1_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]
@@ -1654,19 +1654,19 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174
.align 2, 0
_080731F0: .4byte gTasks
_080731F4: .4byte gSprites
_080731F8: .4byte gUnknown_2022978
_080731FC: .4byte gUnknown_202297A
_080731F8: .4byte gBattle_BG1_X
_080731FC: .4byte gBattle_BG1_Y
_08073200: .4byte gPlttBufferFaded + 0x200
_08073204: .4byte 0xfffffe00
_08073208: .4byte 0x04000008
_0807320C:
ldr r1, _0807323C @ =gUnknown_202297C
ldr r1, _0807323C @ =gBattle_BG2_X
lsls r0, r3, 16
asrs r0, 16
ldrh r3, [r5, 0xE]
adds r0, r3
strh r0, [r1]
ldr r1, _08073240 @ =gUnknown_202297E
ldr r1, _08073240 @ =gBattle_BG2_Y
lsls r0, r2, 16
asrs r0, 16
ldrh r5, [r5, 0x10]
@@ -1684,8 +1684,8 @@ _08073232:
pop {r0}
bx r0
.align 2, 0
_0807323C: .4byte gUnknown_202297C
_08073240: .4byte gUnknown_202297E
_0807323C: .4byte gBattle_BG2_X
_08073240: .4byte gBattle_BG2_Y
_08073244: .4byte gPlttBufferFaded + 0x200
_08073248: .4byte 0x04000008
thumb_func_end task_pA_ma0A_obj_to_bg_pal
asm/battle_anim_80A22E8.s
+368 -368
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80DE2C0.s
+93 -93
View File
@@ -1644,7 +1644,7 @@ sub_80DEF38: @ 80DEF38
movs r1, 0xFF
ands r0, r1
strh r0, [r2, 0x30]
ldr r1, _080DEF80 @ =gUnknown_825E074
ldr r1, _080DEF80 @ =gSineTable
movs r3, 0x30
ldrsh r0, [r2, r3]
lsls r0, 1
@@ -1671,7 +1671,7 @@ sub_80DEF38: @ 80DEF38
bl DestroyAnimSprite
b _080DEF96
.align 2, 0
_080DEF80: .4byte gUnknown_825E074
_080DEF80: .4byte gSineTable
_080DEF84:
lsls r0, r1, 16
asrs r0, 16
@@ -1742,14 +1742,14 @@ _080DEFF4:
strh r2, [r5, 0x16]
cmp r7, 0x1
bne _080DF01C
ldr r0, _080DF018 @ =gUnknown_2022978
ldr r0, _080DF018 @ =gBattle_BG1_X
b _080DF01E
.align 2, 0
_080DF010: .4byte gUnknown_2037F1B
_080DF014: .4byte gUnknown_2037F02
_080DF018: .4byte gUnknown_2022978
_080DF018: .4byte gBattle_BG1_X
_080DF01C:
ldr r0, _080DF03C @ =gUnknown_202297C
ldr r0, _080DF03C @ =gBattle_BG2_X
_080DF01E:
ldrh r2, [r0]
strh r2, [r5, 0x18]
@@ -1766,7 +1766,7 @@ _080DF01E:
ldrh r3, [r5, 0x18]
b _080DF044
.align 2, 0
_080DF03C: .4byte gUnknown_202297C
_080DF03C: .4byte gBattle_BG2_X
_080DF040:
strh r2, [r5, 0x1E]
ldrh r3, [r5, 0x1A]
@@ -1780,7 +1780,7 @@ _080DF044:
ldrsh r0, [r5, r6]
cmp r1, r0
bgt _080DF07A
ldr r4, _080DF084 @ =gUnknown_2038700
ldr r4, _080DF084 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r0, r4
@@ -1805,7 +1805,7 @@ _080DF07A:
ldr r0, _080DF088 @ =0x04000014
b _080DF08E
.align 2, 0
_080DF084: .4byte gUnknown_2038700
_080DF084: .4byte gScanlineEffectRegBuffers
_080DF088: .4byte 0x04000014
_080DF08C:
ldr r0, _080DF0B8 @ =0x04000018
@@ -1822,7 +1822,7 @@ _080DF08E:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl sub_8087EE4
bl ScanlineEffect_SetParams
ldr r0, _080DF0C0 @ =sub_80DF0C4
str r0, [r5]
add sp, 0xC
@@ -1917,7 +1917,7 @@ _080DF148:
ldrsh r0, [r4, r2]
cmp r1, r0
bge _080DF17C
ldr r5, _080DF1D4 @ =gUnknown_2038700
ldr r5, _080DF1D4 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
@@ -1945,7 +1945,7 @@ _080DF17C:
ldrsh r0, [r4, r2]
cmp r1, r0
bgt _080DF1B0
ldr r5, _080DF1D4 @ =gUnknown_2038700
ldr r5, _080DF1D4 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
@@ -1974,7 +1974,7 @@ _080DF1B0:
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080DF1C6
ldr r1, _080DF1D8 @ =gUnknown_2039600
ldr r1, _080DF1D8 @ =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
_080DF1C6:
@@ -1985,8 +1985,8 @@ _080DF1CC:
pop {r0}
bx r0
.align 2, 0
_080DF1D4: .4byte gUnknown_2038700
_080DF1D8: .4byte gUnknown_2039600
_080DF1D4: .4byte gScanlineEffectRegBuffers
_080DF1D8: .4byte gScanlineEffect
thumb_func_end sub_80DF0C4
thumb_func_start sub_80DF1DC
@@ -3434,7 +3434,7 @@ _080DFCCE:
movs r2, 0
movs r3, 0
bl sub_80730C0
ldr r1, _080DFD28 @ =gUnknown_2022978
ldr r1, _080DFD28 @ =gBattle_BG1_X
ldr r3, _080DFD2C @ =0x0000ffc8
b _080DFD58
.align 2, 0
@@ -3442,7 +3442,7 @@ _080DFD18: .4byte 0x00003f42
_080DFD1C: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap
_080DFD20: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet
_080DFD24: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette
_080DFD28: .4byte gUnknown_2022978
_080DFD28: .4byte gBattle_BG1_X
_080DFD2C: .4byte 0x0000ffc8
_080DFD30:
ldr r0, _080DFD48 @ =gUnknown_2037F1A
@@ -3451,22 +3451,22 @@ _080DFD30:
lsls r0, 24
cmp r0, 0
beq _080DFD54
ldr r1, _080DFD4C @ =gUnknown_2022978
ldr r1, _080DFD4C @ =gBattle_BG1_X
ldr r2, _080DFD50 @ =0x0000ff79
adds r0, r2, 0
b _080DFD5A
.align 2, 0
_080DFD48: .4byte gUnknown_2037F1A
_080DFD4C: .4byte gUnknown_2022978
_080DFD4C: .4byte gBattle_BG1_X
_080DFD50: .4byte 0x0000ff79
_080DFD54:
ldr r1, _080DFD80 @ =gUnknown_2022978
ldr r1, _080DFD80 @ =gBattle_BG1_X
ldr r3, _080DFD84 @ =0x0000fff6
_080DFD58:
adds r0, r3, 0
_080DFD5A:
strh r0, [r1]
ldr r1, _080DFD88 @ =gUnknown_202297A
ldr r1, _080DFD88 @ =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
ldr r0, _080DFD8C @ =gTasks
@@ -3474,19 +3474,19 @@ _080DFD5A:
adds r1, r4
lsls r1, 3
adds r1, r0
ldr r0, _080DFD80 @ =gUnknown_2022978
ldr r0, _080DFD80 @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
ldr r0, _080DFD88 @ =gUnknown_202297A
ldr r0, _080DFD88 @ =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
ldrh r0, [r1, 0x8]
adds r0, 0x1
b _080DFE66
.align 2, 0
_080DFD80: .4byte gUnknown_2022978
_080DFD80: .4byte gBattle_BG1_X
_080DFD84: .4byte 0x0000fff6
_080DFD88: .4byte gUnknown_202297A
_080DFD88: .4byte gBattle_BG1_Y
_080DFD8C: .4byte gTasks
_080DFD90:
lsls r0, r4, 2
@@ -3557,7 +3557,7 @@ _080DFDF8:
ldrsh r0, [r4, r2]
cmp r0, 0
bne _080DFECA
ldr r2, _080DFE3C @ =gUnknown_2022978
ldr r2, _080DFE3C @ =gBattle_BG1_X
ldr r1, _080DFE40 @ =gUnknown_83FF240
movs r3, 0xC
ldrsh r0, [r4, r3]
@@ -3578,7 +3578,7 @@ _080DFDF8:
strh r0, [r4, 0x8]
b _080DFECA
.align 2, 0
_080DFE3C: .4byte gUnknown_2022978
_080DFE3C: .4byte gBattle_BG1_X
_080DFE40: .4byte gUnknown_83FF240
_080DFE44:
movs r0, 0x3
@@ -3629,10 +3629,10 @@ _080DFEA0:
movs r1, 0x4
movs r2, 0x1
bl SetAnimBgAttribute
ldr r0, _080DFED4 @ =gUnknown_2022978
ldr r0, _080DFED4 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, _080DFED8 @ =gUnknown_202297A
ldr r0, _080DFED8 @ =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -3648,8 +3648,8 @@ _080DFECA:
pop {r0}
bx r0
.align 2, 0
_080DFED4: .4byte gUnknown_2022978
_080DFED8: .4byte gUnknown_202297A
_080DFED4: .4byte gBattle_BG1_X
_080DFED8: .4byte gBattle_BG1_Y
thumb_func_end sub_80DFC50
thumb_func_start sub_80DFEDC
@@ -4076,7 +4076,7 @@ _080E01FC:
movs r2, 0
movs r3, 0
bl sub_80730C0
ldr r1, _080E025C @ =gUnknown_2022978
ldr r1, _080E025C @ =gBattle_BG1_X
ldr r3, _080E0260 @ =0x0000ffc8
adds r0, r3, 0
b _080E02CE
@@ -4086,7 +4086,7 @@ _080E024C: .4byte 0x00000d03
_080E0250: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap
_080E0254: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet
_080E0258: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette
_080E025C: .4byte gUnknown_2022978
_080E025C: .4byte gBattle_BG1_X
_080E0260: .4byte 0x0000ffc8
_080E0264:
ldr r0, _080E02A4 @ =gUnknown_2037F1B
@@ -4099,7 +4099,7 @@ _080E0264:
lsrs r0, 24
cmp r0, 0x1
bne _080E02B8
ldr r1, _080E02A8 @ =gUnknown_2022978
ldr r1, _080E02A8 @ =gBattle_BG1_X
cmp r4, 0x1
bne _080E0288
ldr r2, _080E02AC @ =0x0000ff65
@@ -4119,33 +4119,33 @@ _080E0292:
_080E029A:
cmp r4, 0x2
bne _080E02D0
ldr r1, _080E02A8 @ =gUnknown_2022978
ldr r1, _080E02A8 @ =gBattle_BG1_X
ldr r2, _080E02B4 @ =0x0000ffec
b _080E02CC
.align 2, 0
_080E02A4: .4byte gUnknown_2037F1B
_080E02A8: .4byte gUnknown_2022978
_080E02A8: .4byte gBattle_BG1_X
_080E02AC: .4byte 0x0000ff65
_080E02B0: .4byte 0x0000ff8d
_080E02B4: .4byte 0x0000ffec
_080E02B8:
cmp r4, 0x1
bne _080E02C4
ldr r1, _080E02F0 @ =gUnknown_2022978
ldr r1, _080E02F0 @ =gBattle_BG1_X
ldr r3, _080E02F4 @ =0x0000ff79
adds r0, r3, 0
strh r0, [r1]
_080E02C4:
cmp r4, 0
bne _080E02D0
ldr r1, _080E02F0 @ =gUnknown_2022978
ldr r1, _080E02F0 @ =gBattle_BG1_X
ldr r2, _080E02F8 @ =0x0000fff6
_080E02CC:
adds r0, r2, 0
_080E02CE:
strh r0, [r1]
_080E02D0:
ldr r1, _080E02FC @ =gUnknown_202297A
ldr r1, _080E02FC @ =gBattle_BG1_Y
movs r0, 0
strh r0, [r1]
ldr r0, _080E0300 @ =gTasks
@@ -4153,18 +4153,18 @@ _080E02D0:
adds r1, r6
lsls r1, 3
adds r1, r0
ldr r0, _080E02F0 @ =gUnknown_2022978
ldr r0, _080E02F0 @ =gBattle_BG1_X
ldrh r0, [r0]
strh r0, [r1, 0x1C]
ldr r0, _080E02FC @ =gUnknown_202297A
ldr r0, _080E02FC @ =gBattle_BG1_Y
ldrh r0, [r0]
strh r0, [r1, 0x1E]
b _080E0384
.align 2, 0
_080E02F0: .4byte gUnknown_2022978
_080E02F0: .4byte gBattle_BG1_X
_080E02F4: .4byte 0x0000ff79
_080E02F8: .4byte 0x0000fff6
_080E02FC: .4byte gUnknown_202297A
_080E02FC: .4byte gBattle_BG1_Y
_080E0300: .4byte gTasks
_080E0304:
ldr r1, _080E0338 @ =gTasks
@@ -4181,7 +4181,7 @@ _080E0304:
lsrs r0, 24
cmp r0, 0x1
bne _080E0348
ldr r2, _080E0340 @ =gUnknown_2022978
ldr r2, _080E0340 @ =gBattle_BG1_X
ldr r1, _080E0344 @ =gUnknown_83FF284
movs r3, 0xC
ldrsh r0, [r5, r3]
@@ -4195,10 +4195,10 @@ _080E0304:
.align 2, 0
_080E0338: .4byte gTasks
_080E033C: .4byte gUnknown_2037F1B
_080E0340: .4byte gUnknown_2022978
_080E0340: .4byte gBattle_BG1_X
_080E0344: .4byte gUnknown_83FF284
_080E0348:
ldr r2, _080E0378 @ =gUnknown_2022978
ldr r2, _080E0378 @ =gBattle_BG1_X
ldr r1, _080E037C @ =gUnknown_83FF284
movs r3, 0xC
ldrsh r0, [r5, r3]
@@ -4223,7 +4223,7 @@ _080E035A:
strh r0, [r1, 0x8]
b _080E0476
.align 2, 0
_080E0378: .4byte gUnknown_2022978
_080E0378: .4byte gBattle_BG1_X
_080E037C: .4byte gUnknown_83FF284
_080E0380: .4byte gTasks
_080E0384:
@@ -4332,10 +4332,10 @@ _080E044C:
movs r1, 0x4
movs r2, 0x1
bl SetAnimBgAttribute
ldr r0, _080E0480 @ =gUnknown_2022978
ldr r0, _080E0480 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, _080E0484 @ =gUnknown_202297A
ldr r0, _080E0484 @ =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x50
movs r1, 0
@@ -4351,8 +4351,8 @@ _080E0476:
pop {r0}
bx r0
.align 2, 0
_080E0480: .4byte gUnknown_2022978
_080E0484: .4byte gUnknown_202297A
_080E0480: .4byte gBattle_BG1_X
_080E0484: .4byte gBattle_BG1_Y
thumb_func_end sub_80E017C
thumb_func_start sub_80E0488
@@ -6291,31 +6291,31 @@ _080E136C:
ldr r1, _080E13B0 @ =0x00003f42
movs r0, 0x50
bl SetGpuReg
ldr r0, _080E13B4 @ =gUnknown_2022978
ldr r0, _080E13B4 @ =gBattle_BG1_X
ldrh r5, [r0]
ldr r0, _080E13B8 @ =gUnknown_202297A
ldr r0, _080E13B8 @ =gBattle_BG1_Y
b _080E13CE
.align 2, 0
_080E13A4: .4byte gUnknown_2037F1B
_080E13A8: .4byte gUnknown_2037F02
_080E13AC: .4byte 0x04000014
_080E13B0: .4byte 0x00003f42
_080E13B4: .4byte gUnknown_2022978
_080E13B8: .4byte gUnknown_202297A
_080E13B4: .4byte gBattle_BG1_X
_080E13B8: .4byte gBattle_BG1_Y
_080E13BC:
ldr r0, _080E1434 @ =0x04000018
str r0, [sp]
ldr r1, _080E1438 @ =0x00003f44
movs r0, 0x50
bl SetGpuReg
ldr r0, _080E143C @ =gUnknown_202297C
ldr r0, _080E143C @ =gBattle_BG2_X
ldrh r5, [r0]
ldr r0, _080E1440 @ =gUnknown_202297E
ldr r0, _080E1440 @ =gBattle_BG2_Y
_080E13CE:
ldrh r3, [r0]
movs r7, 0
movs r2, 0
ldr r6, _080E1444 @ =gUnknown_2038700
ldr r6, _080E1444 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r0, r6
@@ -6356,7 +6356,7 @@ _080E13DE:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl sub_8087EE4
bl ScanlineEffect_SetParams
ldr r0, _080E144C @ =sub_80E1450
str r0, [r4]
add sp, 0xC
@@ -6366,9 +6366,9 @@ _080E13DE:
.align 2, 0
_080E1434: .4byte 0x04000018
_080E1438: .4byte 0x00003f44
_080E143C: .4byte gUnknown_202297C
_080E1440: .4byte gUnknown_202297E
_080E1444: .4byte gUnknown_2038700
_080E143C: .4byte gBattle_BG2_X
_080E1440: .4byte gBattle_BG2_Y
_080E1444: .4byte gScanlineEffectRegBuffers
_080E1448: .4byte 0xa6600001
_080E144C: .4byte sub_80E1450
thumb_func_end sub_80E12F8
@@ -6394,20 +6394,20 @@ sub_80E1450: @ 80E1450
lsrs r0, 24
cmp r0, 0x1
bne _080E1490
ldr r0, _080E1488 @ =gUnknown_2022978
ldr r0, _080E1488 @ =gBattle_BG1_X
ldrh r0, [r0]
str r0, [sp, 0x4]
ldr r0, _080E148C @ =gUnknown_202297A
ldr r0, _080E148C @ =gBattle_BG1_Y
b _080E1498
.align 2, 0
_080E1484: .4byte gTasks
_080E1488: .4byte gUnknown_2022978
_080E148C: .4byte gUnknown_202297A
_080E1488: .4byte gBattle_BG1_X
_080E148C: .4byte gBattle_BG1_Y
_080E1490:
ldr r0, _080E14B0 @ =gUnknown_202297C
ldr r0, _080E14B0 @ =gBattle_BG2_X
ldrh r0, [r0]
str r0, [sp, 0x4]
ldr r0, _080E14B4 @ =gUnknown_202297E
ldr r0, _080E14B4 @ =gBattle_BG2_Y
_080E1498:
ldrh r0, [r0]
str r0, [sp, 0x8]
@@ -6423,8 +6423,8 @@ _080E14A6:
beq _080E14C6
b _080E16F4
.align 2, 0
_080E14B0: .4byte gUnknown_202297C
_080E14B4: .4byte gUnknown_202297E
_080E14B0: .4byte gBattle_BG2_X
_080E14B4: .4byte gBattle_BG2_Y
_080E14B8:
cmp r0, 0x2
bne _080E14BE
@@ -6480,7 +6480,7 @@ _080E14C6:
ldrsh r0, [r6, r3]
cmp r1, r0
ble _080E15E6
ldr r0, _080E163C @ =gUnknown_2039600
ldr r0, _080E163C @ =gScanlineEffect
mov r10, r0
ldr r1, [sp, 0x4]
lsls r0, r1, 16
@@ -6501,7 +6501,7 @@ _080E1536:
subs r0, r1
lsls r0, 7
adds r2, r0
ldr r0, _080E1640 @ =gUnknown_2038700
ldr r0, _080E1640 @ =gScanlineEffectRegBuffers
adds r2, r0
lsls r4, 16
asrs r4, 16
@@ -6519,7 +6519,7 @@ _080E1536:
subs r0, r1
lsls r0, 7
adds r3, r0
ldr r1, _080E1640 @ =gUnknown_2038700
ldr r1, _080E1640 @ =gScanlineEffectRegBuffers
adds r3, r1
lsls r1, r7, 16
asrs r1, 16
@@ -6529,7 +6529,7 @@ _080E1536:
lsls r2, r7, 16
asrs r2, 16
lsls r0, r2, 1
ldr r7, _080E1644 @ =gUnknown_825E074
ldr r7, _080E1644 @ =gSineTable
adds r0, r7
ldrh r0, [r0]
lsls r0, 16
@@ -6583,7 +6583,7 @@ _080E15E6:
lsls r1, r2, 17
cmp r1, 0
blt _080E1612
ldr r4, _080E1640 @ =gUnknown_2038700
ldr r4, _080E1640 @ =gScanlineEffectRegBuffers
ldr r7, [sp, 0x4]
lsls r0, r7, 16
asrs r0, 16
@@ -6625,9 +6625,9 @@ _080E1612:
strh r0, [r6, 0xE]
b _080E1652
.align 2, 0
_080E163C: .4byte gUnknown_2039600
_080E1640: .4byte gUnknown_2038700
_080E1644: .4byte gUnknown_825E074
_080E163C: .4byte gScanlineEffect
_080E1640: .4byte gScanlineEffectRegBuffers
_080E1644: .4byte gSineTable
_080E1648: .4byte 0xffff0000
_080E164C:
ldrh r0, [r6, 0x10]
@@ -6667,14 +6667,14 @@ _080E1684:
asrs r0, 16
cmp r0, 0xC
ble _080E16F4
ldr r1, _080E16A0 @ =gUnknown_2039600
ldr r1, _080E16A0 @ =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
movs r0, 0
strh r0, [r6, 0xC]
b _080E16E6
.align 2, 0
_080E16A0: .4byte gUnknown_2039600
_080E16A0: .4byte gScanlineEffect
_080E16A4:
ldrh r0, [r6, 0xC]
adds r0, 0x1
@@ -9427,7 +9427,7 @@ _080E2B80:
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
ldr r3, _080E2BBC @ =gUnknown_825E074
ldr r3, _080E2BBC @ =gSineTable
movs r0, 0x30
ldrsh r1, [r4, r0]
lsls r0, r1, 2
@@ -9448,7 +9448,7 @@ _080E2B80:
_080E2BB8:
b _080E2CAE
.align 2, 0
_080E2BBC: .4byte gUnknown_825E074
_080E2BBC: .4byte gSineTable
_080E2BC0:
ldrh r0, [r4, 0x30]
adds r0, 0x1
@@ -9471,7 +9471,7 @@ _080E2BD2:
ldrh r0, [r4, 0x22]
subs r0, r1
strh r0, [r4, 0x22]
ldr r3, _080E2C0C @ =gUnknown_825E074
ldr r3, _080E2C0C @ =gSineTable
movs r0, 0x30
ldrsh r1, [r4, r0]
lsls r0, r1, 2
@@ -9490,7 +9490,7 @@ _080E2BD2:
bne _080E2CDC
b _080E2CB2
.align 2, 0
_080E2C0C: .4byte gUnknown_825E074
_080E2C0C: .4byte gSineTable
_080E2C10:
ldrh r2, [r4, 0x30]
adds r2, 0x1
@@ -9502,7 +9502,7 @@ _080E2C10:
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
ldr r3, _080E2C68 @ =gUnknown_825E074
ldr r3, _080E2C68 @ =gSineTable
movs r0, 0x30
ldrsh r1, [r4, r0]
lsls r0, r1, 2
@@ -9537,7 +9537,7 @@ _080E2C5C:
bne _080E2CDC
b _080E2CAE
.align 2, 0
_080E2C68: .4byte gUnknown_825E074
_080E2C68: .4byte gSineTable
_080E2C6C: .4byte 0x000003ff
_080E2C70: .4byte 0xfffffc00
_080E2C74:
@@ -10738,7 +10738,7 @@ _080E3588:
adds r1, 0x4
movs r5, 0
strh r1, [r4, 0x30]
ldr r2, _080E35C4 @ =gUnknown_825E074
ldr r2, _080E35C4 @ =gSineTable
movs r3, 0x30
ldrsh r0, [r4, r3]
lsls r0, 1
@@ -10763,13 +10763,13 @@ _080E3588:
strh r5, [r4, 0x26]
b _080E361C
.align 2, 0
_080E35C4: .4byte gUnknown_825E074
_080E35C4: .4byte gSineTable
_080E35C8:
ldrh r1, [r4, 0x30]
adds r1, 0x6
movs r3, 0
strh r1, [r4, 0x30]
ldr r2, _080E35F4 @ =gUnknown_825E074
ldr r2, _080E35F4 @ =gSineTable
movs r5, 0x30
ldrsh r0, [r4, r5]
lsls r0, 1
@@ -10787,7 +10787,7 @@ _080E35C8:
strh r3, [r4, 0x26]
b _080E361C
.align 2, 0
_080E35F4: .4byte gUnknown_825E074
_080E35F4: .4byte gSineTable
_080E35F8:
ldrh r0, [r4, 0x30]
adds r0, 0x1
@@ -12322,7 +12322,7 @@ _080E4206:
adds r1, r0
lsls r1, 2
adds r1, r5
ldr r3, _080E427C @ =gUnknown_825E074
ldr r3, _080E427C @ =gSineTable
movs r6, 0x1E
ldrsh r0, [r4, r6]
lsls r0, 1
@@ -12368,7 +12368,7 @@ _080E4206:
b _080E42C0
.align 2, 0
_080E4278: .4byte gSprites
_080E427C: .4byte gUnknown_825E074
_080E427C: .4byte gSineTable
_080E4280:
ldrh r0, [r4, 0x1E]
adds r0, 0x8
@@ -12382,7 +12382,7 @@ _080E4280:
adds r1, r0
lsls r1, 2
adds r1, r3
ldr r2, _080E42CC @ =gUnknown_825E074
ldr r2, _080E42CC @ =gSineTable
movs r5, 0x1E
ldrsh r0, [r4, r5]
lsls r0, 1
@@ -12409,7 +12409,7 @@ _080E42C0:
b _080E42D6
.align 2, 0
_080E42C8: .4byte gSprites
_080E42CC: .4byte gUnknown_825E074
_080E42CC: .4byte gSineTable
_080E42D0:
adds r0, r2, 0
bl DestroyAnimVisualTask
asm/battle_anim_80EEC0C.s
+6 -6
View File
@@ -168,12 +168,12 @@ sub_80EEC0C: @ 80EEC0C
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
ldr r1, _080EEDE4 @ =gUnknown_2022978
ldr r1, _080EEDE4 @ =gBattle_BG1_X
ldrh r0, [r7, 0x20]
negs r0, r0
adds r0, 0x20
strh r0, [r1]
ldr r1, _080EEDE8 @ =gUnknown_202297A
ldr r1, _080EEDE8 @ =gBattle_BG1_Y
ldrh r0, [r7, 0x22]
negs r0, r0
subs r0, 0x20
@@ -215,8 +215,8 @@ _080EEDD4: .4byte SpriteCallbackDummy
_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
_080EEDDC: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet
_080EEDE0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette
_080EEDE4: .4byte gUnknown_2022978
_080EEDE8: .4byte gUnknown_202297A
_080EEDE4: .4byte gBattle_BG1_X
_080EEDE8: .4byte gBattle_BG1_Y
_080EEDEC: .4byte gTasks
_080EEDF0: .4byte sub_80EEDF4
thumb_func_end sub_80EEC0C
@@ -241,7 +241,7 @@ sub_80EEDF4: @ 80EEDF4
adds r1, r0
movs r3, 0
strh r1, [r5, 0x22]
ldr r2, _080EEE44 @ =gUnknown_202297A
ldr r2, _080EEE44 @ =gBattle_BG1_Y
lsls r0, r1, 16
lsrs r0, 24
ldrh r4, [r2]
@@ -262,7 +262,7 @@ sub_80EEDF4: @ 80EEDF4
.align 2, 0
_080EEE3C: .4byte gUnknown_2037F1A
_080EEE40: .4byte gTasks
_080EEE44: .4byte gUnknown_202297A
_080EEE44: .4byte gBattle_BG1_Y
_080EEE48:
cmp r0, 0x2
beq _080EEE9C
asm/battle_controller_link_opponent.s
+4 -4
View File
@@ -4952,10 +4952,10 @@ _0803CF40:
thumb_func_start sub_803CF50
sub_803CF50: @ 803CF50
push {r4,lr}
ldr r0, _0803CF84 @ =gUnknown_2022974
ldr r0, _0803CF84 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _0803CF88 @ =gUnknown_2022976
ldr r0, _0803CF88 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _0803CF8C @ =gActiveBattler
ldrb r4, [r0]
@@ -4974,8 +4974,8 @@ sub_803CF50: @ 803CF50
bl sub_80D87BC
b _0803CFA0
.align 2, 0
_0803CF84: .4byte gUnknown_2022974
_0803CF88: .4byte gUnknown_2022976
_0803CF84: .4byte gBattle_BG0_X
_0803CF88: .4byte gBattle_BG0_Y
_0803CF8C: .4byte gActiveBattler
_0803CF90: .4byte gUnknown_2022BC6
_0803CF94: .4byte gDisplayedStringBattle
asm/battle_controller_link_partner.s
+4 -4
View File
@@ -4573,10 +4573,10 @@ _080D67BC:
thumb_func_start sub_80D67CC
sub_80D67CC: @ 80D67CC
push {r4,lr}
ldr r0, _080D6800 @ =gUnknown_2022974
ldr r0, _080D6800 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080D6804 @ =gUnknown_2022976
ldr r0, _080D6804 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080D6808 @ =gActiveBattler
ldrb r4, [r0]
@@ -4595,8 +4595,8 @@ sub_80D67CC: @ 80D67CC
bl sub_80D87BC
b _080D681C
.align 2, 0
_080D6800: .4byte gUnknown_2022974
_080D6804: .4byte gUnknown_2022976
_080D6800: .4byte gBattle_BG0_X
_080D6804: .4byte gBattle_BG0_Y
_080D6808: .4byte gActiveBattler
_080D680C: .4byte gUnknown_2022BC6
_080D6810: .4byte gDisplayedStringBattle
asm/battle_controller_oak.s
+12 -12
View File
@@ -5776,10 +5776,10 @@ _080EA520:
thumb_func_start sub_80EA52C
sub_80EA52C: @ 80EA52C
push {r4,lr}
ldr r0, _080EA55C @ =gUnknown_2022974
ldr r0, _080EA55C @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080EA560 @ =gUnknown_2022976
ldr r0, _080EA560 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080EA564 @ =gActiveBattler
ldrb r0, [r0]
@@ -5799,8 +5799,8 @@ sub_80EA52C: @ 80EA52C
bl WallyBufferExecCompleted
b _080EA65A
.align 2, 0
_080EA55C: .4byte gUnknown_2022974
_080EA560: .4byte gUnknown_2022976
_080EA55C: .4byte gBattle_BG0_X
_080EA560: .4byte gBattle_BG0_Y
_080EA564: .4byte gActiveBattler
_080EA568: .4byte gUnknown_2022BC6
_080EA56C: .4byte gBattleTypeFlags
@@ -5951,9 +5951,9 @@ sub_80EA690: @ 80EA690
lsrs r1, r0, 24
cmp r1, 0
bne _080EA6EA
ldr r0, _080EA6C4 @ =gUnknown_2022974
ldr r0, _080EA6C4 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _080EA6C8 @ =gUnknown_2022976
ldr r1, _080EA6C8 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r0, _080EA6CC @ =gBattleTypeFlags
@@ -5970,8 +5970,8 @@ sub_80EA690: @ 80EA690
ldr r1, _080EA6D8 @ =sub_80E763C
b _080EA6E8
.align 2, 0
_080EA6C4: .4byte gUnknown_2022974
_080EA6C8: .4byte gUnknown_2022976
_080EA6C4: .4byte gBattle_BG0_X
_080EA6C8: .4byte gBattle_BG0_Y
_080EA6CC: .4byte gBattleTypeFlags
_080EA6D0: .4byte gUnknown_3004FE0
_080EA6D4: .4byte gActiveBattler
@@ -6074,9 +6074,9 @@ sub_80EA798: @ 80EA798
lsrs r1, r0, 24
cmp r1, 0
bne _080EA7C2
ldr r0, _080EA7C8 @ =gUnknown_2022974
ldr r0, _080EA7C8 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _080EA7CC @ =gUnknown_2022976
ldr r1, _080EA7CC @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -6092,8 +6092,8 @@ _080EA7C2:
pop {r0}
bx r0
.align 2, 0
_080EA7C8: .4byte gUnknown_2022974
_080EA7CC: .4byte gUnknown_2022976
_080EA7C8: .4byte gBattle_BG0_X
_080EA7CC: .4byte gBattle_BG0_Y
_080EA7D0: .4byte gUnknown_3004FE0
_080EA7D4: .4byte gActiveBattler
_080EA7D8: .4byte sub_80E7988
asm/battle_controller_opponent.s
+4 -4
View File
@@ -5113,10 +5113,10 @@ _080384AC:
thumb_func_start sub_80384BC
sub_80384BC: @ 80384BC
push {r4,lr}
ldr r0, _080384F0 @ =gUnknown_2022974
ldr r0, _080384F0 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080384F4 @ =gUnknown_2022976
ldr r0, _080384F4 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080384F8 @ =gActiveBattler
ldrb r0, [r0]
@@ -5135,8 +5135,8 @@ sub_80384BC: @ 80384BC
bl sub_80D87BC
b _0803850C
.align 2, 0
_080384F0: .4byte gUnknown_2022974
_080384F4: .4byte gUnknown_2022976
_080384F0: .4byte gBattle_BG0_X
_080384F4: .4byte gBattle_BG0_Y
_080384F8: .4byte gActiveBattler
_080384FC: .4byte gUnknown_2022BC6
_08038500: .4byte gDisplayedStringBattle
asm/battle_controller_player.s
+36 -36
View File
@@ -1354,10 +1354,10 @@ _0802EDF6:
beq _0802EE18
movs r0, 0x5
bl PlaySE
ldr r1, _0802EF44 @ =gUnknown_2022974
ldr r1, _0802EF44 @ =gBattle_BG0_X
movs r0, 0
strh r0, [r1]
ldr r1, _0802EF48 @ =gUnknown_2022976
ldr r1, _0802EF48 @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -1505,8 +1505,8 @@ _0802EF36:
bx r1
.align 2, 0
_0802EF40: .4byte gMain
_0802EF44: .4byte gUnknown_2022974
_0802EF48: .4byte gUnknown_2022976
_0802EF44: .4byte gBattle_BG0_X
_0802EF48: .4byte gBattle_BG0_Y
_0802EF4C: .4byte gUnknown_2023FFC
_0802EF50: .4byte gActiveBattler
_0802EF54: .4byte gUnknown_3004FF8
@@ -4051,19 +4051,19 @@ _08030428:
bne _0803051C
cmp r6, 0
bne _0803044C
ldr r1, _08030444 @ =gUnknown_2022978
ldr r1, _08030444 @ =gBattle_BG1_X
ldrh r0, [r1]
strh r0, [r5, 0x1C]
ldr r2, _08030448 @ =gUnknown_202297A
ldr r2, _08030448 @ =gBattle_BG1_Y
b _08030454
.align 2, 0
_08030444: .4byte gUnknown_2022978
_08030448: .4byte gUnknown_202297A
_08030444: .4byte gBattle_BG1_X
_08030448: .4byte gBattle_BG1_Y
_0803044C:
ldr r1, _08030474 @ =gUnknown_202297C
ldr r1, _08030474 @ =gBattle_BG2_X
ldrh r0, [r1]
strh r0, [r5, 0x1C]
ldr r2, _08030478 @ =gUnknown_202297E
ldr r2, _08030478 @ =gBattle_BG2_Y
_08030454:
ldrh r0, [r2]
strh r0, [r5, 0x1A]
@@ -4081,8 +4081,8 @@ _08030454:
strh r0, [r2]
b _080304E0
.align 2, 0
_08030474: .4byte gUnknown_202297C
_08030478: .4byte gUnknown_202297E
_08030474: .4byte gBattle_BG2_X
_08030478: .4byte gBattle_BG2_Y
_0803047C:
adds r0, r7, 0
adds r1, r6, 0
@@ -4138,19 +4138,19 @@ _080304E0:
_080304E8:
cmp r6, 0
bne _08030500
ldr r1, _080304F8 @ =gUnknown_2022978
ldr r1, _080304F8 @ =gBattle_BG1_X
ldrh r0, [r5, 0x1C]
strh r0, [r1]
ldr r1, _080304FC @ =gUnknown_202297A
ldr r1, _080304FC @ =gBattle_BG1_Y
b _08030508
.align 2, 0
_080304F8: .4byte gUnknown_2022978
_080304FC: .4byte gUnknown_202297A
_080304F8: .4byte gBattle_BG1_X
_080304FC: .4byte gBattle_BG1_Y
_08030500:
ldr r1, _08030528 @ =gUnknown_202297C
ldr r1, _08030528 @ =gBattle_BG2_X
ldrh r0, [r5, 0x1C]
strh r0, [r1]
ldr r1, _0803052C @ =gUnknown_202297E
ldr r1, _0803052C @ =gBattle_BG2_Y
_08030508:
ldrh r0, [r5, 0x1A]
strh r0, [r1]
@@ -4169,8 +4169,8 @@ _0803051C:
pop {r0}
bx r0
.align 2, 0
_08030528: .4byte gUnknown_202297C
_0803052C: .4byte gUnknown_202297E
_08030528: .4byte gBattle_BG2_X
_0803052C: .4byte gBattle_BG2_Y
_08030530: .4byte gUnknown_3004FE0
_08030534: .4byte sub_802FE94
thumb_func_end sub_80303A8
@@ -4964,10 +4964,10 @@ PrintLinkStandbyMsg: @ 8030B5C
ands r0, r1
cmp r0, 0
beq _08030B7C
ldr r0, _08030B84 @ =gUnknown_2022974
ldr r0, _08030B84 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08030B88 @ =gUnknown_2022976
ldr r0, _08030B88 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _08030B8C @ =gUnknown_83FE714
movs r1, 0
@@ -4977,8 +4977,8 @@ _08030B7C:
bx r0
.align 2, 0
_08030B80: .4byte gBattleTypeFlags
_08030B84: .4byte gUnknown_2022974
_08030B88: .4byte gUnknown_2022976
_08030B84: .4byte gBattle_BG0_X
_08030B88: .4byte gBattle_BG0_Y
_08030B8C: .4byte gUnknown_83FE714
thumb_func_end PrintLinkStandbyMsg
@@ -8747,10 +8747,10 @@ _08032AEC:
thumb_func_start sub_8032AFC
sub_8032AFC: @ 8032AFC
push {r4,lr}
ldr r0, _08032B30 @ =gUnknown_2022974
ldr r0, _08032B30 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08032B34 @ =gUnknown_2022976
ldr r0, _08032B34 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _08032B38 @ =gActiveBattler
ldrb r4, [r0]
@@ -8769,8 +8769,8 @@ sub_8032AFC: @ 8032AFC
bl sub_80D87BC
b _08032B4C
.align 2, 0
_08032B30: .4byte gUnknown_2022974
_08032B34: .4byte gUnknown_2022976
_08032B30: .4byte gBattle_BG0_X
_08032B34: .4byte gBattle_BG0_Y
_08032B38: .4byte gActiveBattler
_08032B3C: .4byte gUnknown_2022BC6
_08032B40: .4byte gDisplayedStringBattle
@@ -8824,9 +8824,9 @@ sub_8032B94: @ 8032B94
lsrs r1, r0, 24
cmp r1, 0
bne _08032BBA
ldr r0, _08032BC0 @ =gUnknown_2022974
ldr r0, _08032BC0 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08032BC4 @ =gUnknown_2022976
ldr r1, _08032BC4 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, _08032BC8 @ =gUnknown_3004FE0
@@ -8840,8 +8840,8 @@ _08032BBA:
pop {r0}
bx r0
.align 2, 0
_08032BC0: .4byte gUnknown_2022974
_08032BC4: .4byte gUnknown_2022976
_08032BC0: .4byte gBattle_BG0_X
_08032BC4: .4byte gBattle_BG0_Y
_08032BC8: .4byte gUnknown_3004FE0
_08032BCC: .4byte gActiveBattler
_08032BD0: .4byte sub_802E438
@@ -8910,9 +8910,9 @@ sub_8032C4C: @ 8032C4C
lsrs r1, r0, 24
cmp r1, 0
bne _08032C76
ldr r0, _08032C7C @ =gUnknown_2022974
ldr r0, _08032C7C @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08032C80 @ =gUnknown_2022976
ldr r1, _08032C80 @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -8928,8 +8928,8 @@ _08032C76:
pop {r0}
bx r0
.align 2, 0
_08032C7C: .4byte gUnknown_2022974
_08032C80: .4byte gUnknown_2022976
_08032C7C: .4byte gBattle_BG0_X
_08032C80: .4byte gBattle_BG0_Y
_08032C84: .4byte gUnknown_3004FE0
_08032C88: .4byte gActiveBattler
_08032C8C: .4byte sub_802EA10
asm/battle_controller_pokedude.s
+18 -18
View File
@@ -5055,10 +5055,10 @@ _08158A7C:
thumb_func_start sub_8158A88
sub_8158A88: @ 8158A88
push {r4,lr}
ldr r0, _08158ABC @ =gUnknown_2022974
ldr r0, _08158ABC @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _08158AC0 @ =gUnknown_2022976
ldr r0, _08158AC0 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _08158AC4 @ =gActiveBattler
ldrb r4, [r0]
@@ -5077,8 +5077,8 @@ sub_8158A88: @ 8158A88
bl sub_80D87BC
b _08158AD8
.align 2, 0
_08158ABC: .4byte gUnknown_2022974
_08158AC0: .4byte gUnknown_2022976
_08158ABC: .4byte gBattle_BG0_X
_08158AC0: .4byte gBattle_BG0_Y
_08158AC4: .4byte gActiveBattler
_08158AC8: .4byte gUnknown_2022BC6
_08158ACC: .4byte gDisplayedStringBattle
@@ -5132,9 +5132,9 @@ sub_8158B20: @ 8158B20
lsrs r1, r0, 24
cmp r1, 0
bne _08158B46
ldr r0, _08158B4C @ =gUnknown_2022974
ldr r0, _08158B4C @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08158B50 @ =gUnknown_2022976
ldr r1, _08158B50 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, _08158B54 @ =gUnknown_3004FE0
@@ -5148,8 +5148,8 @@ _08158B46:
pop {r0}
bx r0
.align 2, 0
_08158B4C: .4byte gUnknown_2022974
_08158B50: .4byte gUnknown_2022976
_08158B4C: .4byte gBattle_BG0_X
_08158B50: .4byte gBattle_BG0_Y
_08158B54: .4byte gUnknown_3004FE0
_08158B58: .4byte gActiveBattler
_08158B5C: .4byte sub_8156140
@@ -5238,9 +5238,9 @@ sub_8158C04: @ 8158C04
lsrs r1, r0, 24
cmp r1, 0
bne _08158C2E
ldr r0, _08158C34 @ =gUnknown_2022974
ldr r0, _08158C34 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _08158C38 @ =gUnknown_2022976
ldr r1, _08158C38 @ =gBattle_BG0_Y
movs r2, 0xA0
lsls r2, 1
adds r0, r2, 0
@@ -5256,8 +5256,8 @@ _08158C2E:
pop {r0}
bx r0
.align 2, 0
_08158C34: .4byte gUnknown_2022974
_08158C38: .4byte gUnknown_2022976
_08158C34: .4byte gBattle_BG0_X
_08158C38: .4byte gBattle_BG0_Y
_08158C3C: .4byte gUnknown_3004FE0
_08158C40: .4byte gActiveBattler
_08158C44: .4byte sub_81564E4
@@ -7250,7 +7250,7 @@ _08159C14:
lsls r0, 2
adds r0, r5
ldr r1, [r0]
ldr r0, _08159C40 @ =gUnknown_2022976
ldr r0, _08159C40 @ =gBattle_BG0_Y
ldrh r0, [r0]
strb r0, [r1, 0x4]
bl sub_80EB30C
@@ -7260,9 +7260,9 @@ _08159C14:
b _08159C9E
.align 2, 0
_08159C3C: .4byte gPaletteFade
_08159C40: .4byte gUnknown_2022976
_08159C40: .4byte gBattle_BG0_Y
_08159C44:
ldr r1, _08159C5C @ =gUnknown_2022976
ldr r1, _08159C5C @ =gBattle_BG0_Y
movs r0, 0
strh r0, [r1]
bl sub_8159EF0
@@ -7272,7 +7272,7 @@ _08159C44:
bl sub_80D87BC
b _08159C94
.align 2, 0
_08159C5C: .4byte gUnknown_2022976
_08159C5C: .4byte gBattle_BG0_Y
_08159C60: .4byte gDisplayedStringBattle
_08159C64:
movs r0, 0x18
@@ -7331,7 +7331,7 @@ _08159CB4:
ldr r0, _08159CFC @ =0x00000137
bl PlayBGM
_08159CD8:
ldr r1, _08159D00 @ =gUnknown_2022976
ldr r1, _08159D00 @ =gBattle_BG0_Y
ldrb r0, [r4]
lsls r0, 2
adds r0, r5
@@ -7348,7 +7348,7 @@ _08159CEE:
.align 2, 0
_08159CF8: .4byte gPaletteFade
_08159CFC: .4byte 0x00000137
_08159D00: .4byte gUnknown_2022976
_08159D00: .4byte gBattle_BG0_Y
thumb_func_end sub_8159BA8
thumb_func_start sub_8159D04
asm/battle_controller_safari.s
+8 -8
View File
@@ -849,10 +849,10 @@ sub_80DDB94: @ 80DDB94
thumb_func_start sub_80DDBA0
sub_80DDBA0: @ 80DDBA0
push {r4,lr}
ldr r0, _080DDBD4 @ =gUnknown_2022974
ldr r0, _080DDBD4 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080DDBD8 @ =gUnknown_2022976
ldr r0, _080DDBD8 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080DDBDC @ =gActiveBattler
ldrb r4, [r0]
@@ -871,8 +871,8 @@ sub_80DDBA0: @ 80DDBA0
bl sub_80D87BC
b _080DDBF0
.align 2, 0
_080DDBD4: .4byte gUnknown_2022974
_080DDBD8: .4byte gUnknown_2022976
_080DDBD4: .4byte gBattle_BG0_X
_080DDBD8: .4byte gBattle_BG0_Y
_080DDBDC: .4byte gActiveBattler
_080DDBE0: .4byte gUnknown_2022BC6
_080DDBE4: .4byte gDisplayedStringBattle
@@ -926,9 +926,9 @@ sub_80DDC38: @ 80DDC38
lsrs r1, r0, 24
cmp r1, 0
bne _080DDC5E
ldr r0, _080DDC64 @ =gUnknown_2022974
ldr r0, _080DDC64 @ =gBattle_BG0_X
strh r1, [r0]
ldr r1, _080DDC68 @ =gUnknown_2022976
ldr r1, _080DDC68 @ =gBattle_BG0_Y
movs r0, 0xA0
strh r0, [r1]
ldr r1, _080DDC6C @ =gUnknown_3004FE0
@@ -942,8 +942,8 @@ _080DDC5E:
pop {r0}
bx r0
.align 2, 0
_080DDC64: .4byte gUnknown_2022974
_080DDC68: .4byte gUnknown_2022976
_080DDC64: .4byte gBattle_BG0_X
_080DDC68: .4byte gBattle_BG0_Y
_080DDC6C: .4byte gUnknown_3004FE0
_080DDC70: .4byte gActiveBattler
_080DDC74: .4byte HandleInputChooseAction_0
asm/battle_records.s
+1 -1
View File
@@ -471,7 +471,7 @@ _080CD604: .4byte 0x81000800
thumb_func_start sub_80CD608
sub_80CD608: @ 80CD608
push {lr}
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl dp13_810BB8C
asm/battle_script_commands.s
+22 -22
View File
@@ -17358,7 +17358,7 @@ _08026244:
.4byte _08026380
.4byte _080263C4
_0802626C:
ldr r1, _08026290 @ =gUnknown_202297E
ldr r1, _08026290 @ =gBattle_BG2_Y
movs r0, 0x60
strh r0, [r1]
movs r0, 0x2
@@ -17373,7 +17373,7 @@ _0802626C:
strb r0, [r1, 0x1E]
b _080263F6
.align 2, 0
_08026290: .4byte gUnknown_202297E
_08026290: .4byte gBattle_BG2_Y
_08026294: .4byte gBattleScripting
_08026298:
bl sub_80264D0
@@ -17389,10 +17389,10 @@ _080262A4:
.align 2, 0
_080262AC: .4byte gBattleScripting
_080262B0:
ldr r1, _080262F8 @ =gUnknown_2022978
ldr r1, _080262F8 @ =gBattle_BG1_X
movs r0, 0
strh r0, [r1]
ldr r1, _080262FC @ =gUnknown_202297A
ldr r1, _080262FC @ =gBattle_BG1_Y
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
@@ -17421,8 +17421,8 @@ _080262B0:
strb r0, [r1, 0x1E]
b _080263F6
.align 2, 0
_080262F8: .4byte gUnknown_2022978
_080262FC: .4byte gUnknown_202297A
_080262F8: .4byte gBattle_BG1_X
_080262FC: .4byte gBattle_BG1_Y
_08026300: .4byte gBattleScripting
_08026304:
bl sub_8026404
@@ -17438,11 +17438,11 @@ _08026318:
lsrs r1, r0, 24
cmp r1, 0
bne _080263F6
ldr r0, _0802632C @ =gUnknown_202297A
ldr r0, _0802632C @ =gBattle_BG1_Y
strh r1, [r0]
b _0802636E
.align 2, 0
_0802632C: .4byte gUnknown_202297A
_0802632C: .4byte gBattle_BG1_Y
_08026330:
ldr r0, _0802634C @ =gMain
ldrh r0, [r0, 0x2E]
@@ -17601,10 +17601,10 @@ _0802647C: .4byte gPlayerParty
thumb_func_start sub_8026480
sub_8026480: @ 8026480
push {lr}
ldr r1, _080264C0 @ =gUnknown_202297E
ldr r1, _080264C0 @ =gBattle_BG2_Y
movs r0, 0
strh r0, [r1]
ldr r1, _080264C4 @ =gUnknown_202297C
ldr r1, _080264C4 @ =gBattle_BG2_X
movs r2, 0xD0
lsls r2, 1
adds r0, r2, 0
@@ -17627,8 +17627,8 @@ sub_8026480: @ 8026480
pop {r0}
bx r0
.align 2, 0
_080264C0: .4byte gUnknown_202297E
_080264C4: .4byte gUnknown_202297C
_080264C0: .4byte gBattle_BG2_Y
_080264C4: .4byte gBattle_BG2_X
_080264C8: .4byte gUnknown_82506D0
_080264CC: .4byte gUnknown_82506F0
thumb_func_end sub_8026480
@@ -17643,7 +17643,7 @@ sub_80264D0: @ 80264D0
movs r0, 0x1
b _0802651A
_080264E0:
ldr r4, _080264F0 @ =gUnknown_202297C
ldr r4, _080264F0 @ =gBattle_BG2_X
ldrh r1, [r4]
movs r5, 0x80
lsls r5, 2
@@ -17652,7 +17652,7 @@ _080264E0:
movs r0, 0
b _0802651A
.align 2, 0
_080264F0: .4byte gUnknown_202297C
_080264F0: .4byte gBattle_BG2_X
_080264F4:
movs r0, 0xD0
lsls r0, 1
@@ -17823,7 +17823,7 @@ _08026624:
thumb_func_start sub_8026648
sub_8026648: @ 8026648
push {lr}
ldr r0, _0802665C @ =gUnknown_202297C
ldr r0, _0802665C @ =gBattle_BG2_X
ldrh r1, [r0]
movs r3, 0xD0
lsls r3, 1
@@ -17833,7 +17833,7 @@ sub_8026648: @ 8026648
movs r0, 0
b _08026684
.align 2, 0
_0802665C: .4byte gUnknown_202297C
_0802665C: .4byte gBattle_BG2_X
_08026660:
ldrh r0, [r2]
adds r1, r0, 0
@@ -17930,7 +17930,7 @@ PutMonIconOnLvlUpBox: @ 8026688
adds r1, r2
movs r0, 0
strh r0, [r1, 0x2E]
ldr r0, _08026750 @ =gUnknown_202297C
ldr r0, _08026750 @ =gBattle_BG2_X
ldrh r0, [r0]
strh r0, [r1, 0x30]
add sp, 0x10
@@ -17948,14 +17948,14 @@ _08026740: .4byte 0xd75a0000
_08026744: .4byte 0x0000d75a
_08026748: .4byte gUnknown_82507C8
_0802674C: .4byte gSprites
_08026750: .4byte gUnknown_202297C
_08026750: .4byte gBattle_BG2_X
thumb_func_end PutMonIconOnLvlUpBox
thumb_func_start SpriteCB_MonIconOnLvlUpBox
SpriteCB_MonIconOnLvlUpBox: @ 8026754
push {r4,lr}
adds r2, r0, 0
ldr r0, _08026770 @ =gUnknown_202297C
ldr r0, _08026770 @ =gBattle_BG2_X
ldrh r1, [r2, 0x30]
ldrh r0, [r0]
subs r1, r0
@@ -17967,7 +17967,7 @@ SpriteCB_MonIconOnLvlUpBox: @ 8026754
strh r0, [r2, 0x2E]
b _08026790
.align 2, 0
_08026770: .4byte gUnknown_202297C
_08026770: .4byte gBattle_BG2_X
_08026774:
movs r1, 0x2E
ldrsh r0, [r2, r1]
@@ -32507,14 +32507,14 @@ _0802DAC4: .4byte sub_80116F4
_0802DAC8:
bl sub_800F34C
bl LoadBattleTextboxAndBackground
ldr r1, _0802DADC @ =gUnknown_2022980
ldr r1, _0802DADC @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
b _0802DB34
.align 2, 0
_0802DADC: .4byte gUnknown_2022980
_0802DADC: .4byte gBattle_BG3_X
_0802DAE0:
bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
asm/battle_transition.s
+156 -156
View File
File diff suppressed because it is too large Load Diff
asm/berry_fix_program.s
+1 -1
View File
@@ -90,7 +90,7 @@ sub_815F74C: @ 815F74C
ldr r0, [r0, 0x8]
bl ResetSpriteData
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
ldr r0, _0815F7D4 @ =gUnknown_3005ECC
strb r4, [r0]
ldr r0, _0815F7D8 @ =sub_815F7F0
asm/berry_pouch.s
+1 -1
View File
@@ -187,7 +187,7 @@ _0813CED0:
bl clear_scheduled_bg_copies_to_vram
b _0813CFD2
_0813CEDA:
bl remove_some_task
bl ScanlineEffect_Stop
b _0813CFD2
_0813CEE0:
bl FreeAllSpritePalettes
asm/diploma.s
+1 -1
View File
@@ -279,7 +279,7 @@ sub_80F4E24: @ 80F4E24
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
pop {r0}
bx r0
thumb_func_end sub_80F4E24
asm/egg_hatch.s
+1 -1
View File
@@ -621,7 +621,7 @@ _08047090:
bl FreeAllSpritePalettes
bl ResetSpriteData
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
bl m4aSoundVSyncOn
b _0804724A
.align 2, 0
asm/evolution_scene.s
+117 -117
View File
@@ -171,25 +171,25 @@ EvolutionScene: @ 80CDDF4
movs r1, 0
bl SetGpuReg
bl ResetPaletteFade
ldr r0, _080CE080 @ =gUnknown_2022974
ldr r0, _080CE080 @ =gBattle_BG0_X
movs r2, 0
strh r2, [r0]
ldr r0, _080CE084 @ =gUnknown_2022976
ldr r0, _080CE084 @ =gBattle_BG0_Y
strh r2, [r0]
ldr r0, _080CE088 @ =gUnknown_2022978
ldr r0, _080CE088 @ =gBattle_BG1_X
strh r2, [r0]
ldr r0, _080CE08C @ =gUnknown_202297A
ldr r0, _080CE08C @ =gBattle_BG1_Y
strh r2, [r0]
ldr r0, _080CE090 @ =gUnknown_202297C
ldr r0, _080CE090 @ =gBattle_BG2_X
strh r2, [r0]
ldr r0, _080CE094 @ =gUnknown_202297E
ldr r0, _080CE094 @ =gBattle_BG2_Y
strh r2, [r0]
ldr r1, _080CE098 @ =gUnknown_2022980
ldr r1, _080CE098 @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
ldr r0, _080CE09C @ =gUnknown_2022982
ldr r0, _080CE09C @ =gBattle_BG3_Y
movs r1, 0
strh r1, [r0]
ldr r1, _080CE0A0 @ =gUnknown_2022B50
@@ -198,7 +198,7 @@ EvolutionScene: @ 80CDDF4
bl sub_800F34C
bl LoadBattleTextboxAndBackground
bl ResetSpriteData
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl FreeAllSpritePalettes
ldr r0, _080CE0A4 @ =gReservedSpritePaletteCount
@@ -401,14 +401,14 @@ EvolutionScene: @ 80CDDF4
bx r0
.align 2, 0
_080CE07C: .4byte 0x05006000
_080CE080: .4byte gUnknown_2022974
_080CE084: .4byte gUnknown_2022976
_080CE088: .4byte gUnknown_2022978
_080CE08C: .4byte gUnknown_202297A
_080CE090: .4byte gUnknown_202297C
_080CE094: .4byte gUnknown_202297E
_080CE098: .4byte gUnknown_2022980
_080CE09C: .4byte gUnknown_2022982
_080CE080: .4byte gBattle_BG0_X
_080CE084: .4byte gBattle_BG0_Y
_080CE088: .4byte gBattle_BG1_X
_080CE08C: .4byte gBattle_BG1_Y
_080CE090: .4byte gBattle_BG2_X
_080CE094: .4byte gBattle_BG2_Y
_080CE098: .4byte gBattle_BG3_X
_080CE09C: .4byte gBattle_BG3_Y
_080CE0A0: .4byte gUnknown_2022B50
_080CE0A4: .4byte gReservedSpritePaletteCount
_080CE0A8: .4byte gUnknown_2039A20
@@ -494,24 +494,24 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
movs r1, 0
bl SetGpuReg
bl ResetPaletteFade
ldr r0, _080CE290 @ =gUnknown_2022974
ldr r0, _080CE290 @ =gBattle_BG0_X
strh r4, [r0]
ldr r0, _080CE294 @ =gUnknown_2022976
ldr r0, _080CE294 @ =gBattle_BG0_Y
strh r4, [r0]
ldr r0, _080CE298 @ =gUnknown_2022978
ldr r0, _080CE298 @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _080CE29C @ =gUnknown_202297A
ldr r0, _080CE29C @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _080CE2A0 @ =gUnknown_202297C
ldr r0, _080CE2A0 @ =gBattle_BG2_X
strh r4, [r0]
ldr r0, _080CE2A4 @ =gUnknown_202297E
ldr r0, _080CE2A4 @ =gBattle_BG2_Y
strh r4, [r0]
ldr r1, _080CE2A8 @ =gUnknown_2022980
ldr r1, _080CE2A8 @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
ldr r0, _080CE2AC @ =gUnknown_2022982
ldr r0, _080CE2AC @ =gBattle_BG3_Y
strh r4, [r0]
ldr r1, _080CE2B0 @ =gUnknown_2022B50
movs r0, 0x9
@@ -608,14 +608,14 @@ _080CE280: .4byte gTasks
_080CE284: .4byte gUnknown_2039A20
_080CE288: .4byte gPlayerParty
_080CE28C: .4byte 0x05006000
_080CE290: .4byte gUnknown_2022974
_080CE294: .4byte gUnknown_2022976
_080CE298: .4byte gUnknown_2022978
_080CE29C: .4byte gUnknown_202297A
_080CE2A0: .4byte gUnknown_202297C
_080CE2A4: .4byte gUnknown_202297E
_080CE2A8: .4byte gUnknown_2022980
_080CE2AC: .4byte gUnknown_2022982
_080CE290: .4byte gBattle_BG0_X
_080CE294: .4byte gBattle_BG0_Y
_080CE298: .4byte gBattle_BG1_X
_080CE29C: .4byte gBattle_BG1_Y
_080CE2A0: .4byte gBattle_BG2_X
_080CE2A4: .4byte gBattle_BG2_Y
_080CE2A8: .4byte gBattle_BG3_X
_080CE2AC: .4byte gBattle_BG3_Y
_080CE2B0: .4byte gUnknown_2022B50
_080CE2B4: .4byte gReservedSpritePaletteCount
_080CE2B8: .4byte gUnknown_82350AC
@@ -691,37 +691,37 @@ _080CE34C:
ldr r1, _080CE398 @ =gReservedSpritePaletteCount
movs r0, 0x4
strb r0, [r1]
ldr r0, _080CE39C @ =gUnknown_2022974
ldr r0, _080CE39C @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080CE3A0 @ =gUnknown_2022976
ldr r0, _080CE3A0 @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080CE3A4 @ =gUnknown_2022978
ldr r0, _080CE3A4 @ =gBattle_BG1_X
strh r1, [r0]
ldr r0, _080CE3A8 @ =gUnknown_202297A
ldr r0, _080CE3A8 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _080CE3AC @ =gUnknown_202297C
ldr r0, _080CE3AC @ =gBattle_BG2_X
strh r1, [r0]
ldr r0, _080CE3B0 @ =gUnknown_202297E
ldr r0, _080CE3B0 @ =gBattle_BG2_Y
strh r1, [r0]
ldr r2, _080CE3B4 @ =gUnknown_2022980
ldr r2, _080CE3B4 @ =gBattle_BG3_X
movs r3, 0x80
lsls r3, 1
adds r0, r3, 0
strh r0, [r2]
ldr r0, _080CE3B8 @ =gUnknown_2022982
ldr r0, _080CE3B8 @ =gBattle_BG3_Y
strh r1, [r0]
b _080CE4EC
.align 2, 0
_080CE398: .4byte gReservedSpritePaletteCount
_080CE39C: .4byte gUnknown_2022974
_080CE3A0: .4byte gUnknown_2022976
_080CE3A4: .4byte gUnknown_2022978
_080CE3A8: .4byte gUnknown_202297A
_080CE3AC: .4byte gUnknown_202297C
_080CE3B0: .4byte gUnknown_202297E
_080CE3B4: .4byte gUnknown_2022980
_080CE3B8: .4byte gUnknown_2022982
_080CE39C: .4byte gBattle_BG0_X
_080CE3A0: .4byte gBattle_BG0_Y
_080CE3A4: .4byte gBattle_BG1_X
_080CE3A8: .4byte gBattle_BG1_Y
_080CE3AC: .4byte gBattle_BG2_X
_080CE3B0: .4byte gBattle_BG2_Y
_080CE3B4: .4byte gBattle_BG3_X
_080CE3B8: .4byte gBattle_BG3_Y
_080CE3BC:
bl ResetPaletteFade
ldr r0, _080CE3D8 @ =nullsub_76
@@ -1027,24 +1027,24 @@ TradeEvolutionScene: @ 80CE540
mov r1, sp
ldrh r1, [r1, 0x14]
strh r1, [r0, 0x1C]
ldr r0, _080CE6E4 @ =gUnknown_2022974
ldr r0, _080CE6E4 @ =gBattle_BG0_X
strh r4, [r0]
ldr r0, _080CE6E8 @ =gUnknown_2022976
ldr r0, _080CE6E8 @ =gBattle_BG0_Y
strh r4, [r0]
ldr r0, _080CE6EC @ =gUnknown_2022978
ldr r0, _080CE6EC @ =gBattle_BG1_X
strh r4, [r0]
ldr r0, _080CE6F0 @ =gUnknown_202297A
ldr r0, _080CE6F0 @ =gBattle_BG1_Y
strh r4, [r0]
ldr r0, _080CE6F4 @ =gUnknown_202297C
ldr r0, _080CE6F4 @ =gBattle_BG2_X
strh r4, [r0]
ldr r0, _080CE6F8 @ =gUnknown_202297E
ldr r0, _080CE6F8 @ =gBattle_BG2_Y
strh r4, [r0]
ldr r1, _080CE6FC @ =gUnknown_2022980
ldr r1, _080CE6FC @ =gBattle_BG3_X
movs r2, 0x80
lsls r2, 1
adds r0, r2, 0
strh r0, [r1]
ldr r0, _080CE700 @ =gUnknown_2022982
ldr r0, _080CE700 @ =gBattle_BG3_Y
strh r4, [r0]
ldr r2, _080CE704 @ =gTextFlags
ldrb r0, [r2]
@@ -1077,14 +1077,14 @@ _080CE6D4: .4byte gSprites
_080CE6D8: .4byte nullsub_10
_080CE6DC: .4byte sub_80CF53C
_080CE6E0: .4byte gTasks
_080CE6E4: .4byte gUnknown_2022974
_080CE6E8: .4byte gUnknown_2022976
_080CE6EC: .4byte gUnknown_2022978
_080CE6F0: .4byte gUnknown_202297A
_080CE6F4: .4byte gUnknown_202297C
_080CE6F8: .4byte gUnknown_202297E
_080CE6FC: .4byte gUnknown_2022980
_080CE700: .4byte gUnknown_2022982
_080CE6E4: .4byte gBattle_BG0_X
_080CE6E8: .4byte gBattle_BG0_Y
_080CE6EC: .4byte gBattle_BG1_X
_080CE6F0: .4byte gBattle_BG1_Y
_080CE6F4: .4byte gBattle_BG2_X
_080CE6F8: .4byte gBattle_BG2_Y
_080CE6FC: .4byte gBattle_BG3_X
_080CE700: .4byte gBattle_BG3_Y
_080CE704: .4byte gTextFlags
_080CE708: .4byte sub_80D00D8
_080CE70C: .4byte sub_80CE72C
@@ -3981,105 +3981,105 @@ nullsub_76: @ 80D004C
thumb_func_start sub_80D0050
sub_80D0050: @ 80D0050
push {lr}
ldr r0, _080D00B8 @ =gUnknown_2022974
ldr r0, _080D00B8 @ =gBattle_BG0_X
ldrh r1, [r0]
movs r0, 0x10
bl SetGpuReg
ldr r0, _080D00BC @ =gUnknown_2022976
ldr r0, _080D00BC @ =gBattle_BG0_Y
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, _080D00C0 @ =gUnknown_2022978
ldr r0, _080D00C0 @ =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, _080D00C4 @ =gUnknown_202297A
ldr r0, _080D00C4 @ =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, _080D00C8 @ =gUnknown_202297C
ldr r0, _080D00C8 @ =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, _080D00CC @ =gUnknown_202297E
ldr r0, _080D00CC @ =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, _080D00D0 @ =gUnknown_2022980
ldr r0, _080D00D0 @ =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
ldr r0, _080D00D4 @ =gUnknown_2022982
ldr r0, _080D00D4 @ =gBattle_BG3_Y
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
_080D00B8: .4byte gUnknown_2022974
_080D00BC: .4byte gUnknown_2022976
_080D00C0: .4byte gUnknown_2022978
_080D00C4: .4byte gUnknown_202297A
_080D00C8: .4byte gUnknown_202297C
_080D00CC: .4byte gUnknown_202297E
_080D00D0: .4byte gUnknown_2022980
_080D00D4: .4byte gUnknown_2022982
_080D00B8: .4byte gBattle_BG0_X
_080D00BC: .4byte gBattle_BG0_Y
_080D00C0: .4byte gBattle_BG1_X
_080D00C4: .4byte gBattle_BG1_Y
_080D00C8: .4byte gBattle_BG2_X
_080D00CC: .4byte gBattle_BG2_Y
_080D00D0: .4byte gBattle_BG3_X
_080D00D4: .4byte gBattle_BG3_Y
thumb_func_end sub_80D0050
thumb_func_start sub_80D00D8
sub_80D00D8: @ 80D00D8
push {lr}
ldr r0, _080D0140 @ =gUnknown_2022974
ldr r0, _080D0140 @ =gBattle_BG0_X
ldrh r1, [r0]
movs r0, 0x10
bl SetGpuReg
ldr r0, _080D0144 @ =gUnknown_2022976
ldr r0, _080D0144 @ =gBattle_BG0_Y
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, _080D0148 @ =gUnknown_2022978
ldr r0, _080D0148 @ =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, _080D014C @ =gUnknown_202297A
ldr r0, _080D014C @ =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, _080D0150 @ =gUnknown_202297C
ldr r0, _080D0150 @ =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, _080D0154 @ =gUnknown_202297E
ldr r0, _080D0154 @ =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
ldr r0, _080D0158 @ =gUnknown_2022980
ldr r0, _080D0158 @ =gBattle_BG3_X
ldrh r1, [r0]
movs r0, 0x1C
bl SetGpuReg
ldr r0, _080D015C @ =gUnknown_2022982
ldr r0, _080D015C @ =gBattle_BG3_Y
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
_080D0140: .4byte gUnknown_2022974
_080D0144: .4byte gUnknown_2022976
_080D0148: .4byte gUnknown_2022978
_080D014C: .4byte gUnknown_202297A
_080D0150: .4byte gUnknown_202297C
_080D0154: .4byte gUnknown_202297E
_080D0158: .4byte gUnknown_2022980
_080D015C: .4byte gUnknown_2022982
_080D0140: .4byte gBattle_BG0_X
_080D0144: .4byte gBattle_BG0_Y
_080D0148: .4byte gBattle_BG1_X
_080D014C: .4byte gBattle_BG1_Y
_080D0150: .4byte gBattle_BG2_X
_080D0154: .4byte gBattle_BG2_Y
_080D0158: .4byte gBattle_BG3_X
_080D015C: .4byte gBattle_BG3_Y
thumb_func_end sub_80D00D8
thumb_func_start sub_80D0160
@@ -4225,9 +4225,9 @@ sub_80D025C: @ 80D025C
push {r6,r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080D0288 @ =gUnknown_2022978
ldr r0, _080D0288 @ =gBattle_BG1_X
mov r8, r0
ldr r1, _080D028C @ =gUnknown_202297A
ldr r1, _080D028C @ =gBattle_BG1_Y
mov r9, r1
ldr r1, _080D0290 @ =gTasks
lsls r0, r5, 2
@@ -4238,18 +4238,18 @@ sub_80D025C: @ 80D025C
ldrsh r0, [r0, r2]
cmp r0, 0
bne _080D029C
ldr r7, _080D0294 @ =gUnknown_202297C
ldr r6, _080D0298 @ =gUnknown_202297E
ldr r7, _080D0294 @ =gBattle_BG2_X
ldr r6, _080D0298 @ =gBattle_BG2_Y
b _080D02A0
.align 2, 0
_080D0288: .4byte gUnknown_2022978
_080D028C: .4byte gUnknown_202297A
_080D0288: .4byte gBattle_BG1_X
_080D028C: .4byte gBattle_BG1_Y
_080D0290: .4byte gTasks
_080D0294: .4byte gUnknown_202297C
_080D0298: .4byte gUnknown_202297E
_080D0294: .4byte gBattle_BG2_X
_080D0298: .4byte gBattle_BG2_Y
_080D029C:
ldr r7, _080D0328 @ =gUnknown_2022980
ldr r6, _080D032C @ =gUnknown_2022982
ldr r7, _080D0328 @ =gBattle_BG3_X
ldr r6, _080D032C @ =gBattle_BG3_Y
_080D02A0:
lsls r4, r5, 2
adds r4, r5
@@ -4314,8 +4314,8 @@ _080D031A:
pop {r0}
bx r0
.align 2, 0
_080D0328: .4byte gUnknown_2022980
_080D032C: .4byte gUnknown_2022982
_080D0328: .4byte gBattle_BG3_X
_080D032C: .4byte gBattle_BG3_Y
_080D0330: .4byte sub_80D0160
thumb_func_end sub_80D025C
@@ -4527,12 +4527,12 @@ sub_80D04E8: @ 80D04E8
movs r0, 0x50
movs r1, 0
bl SetGpuReg
ldr r0, _080D0544 @ =gUnknown_2022978
ldr r0, _080D0544 @ =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, _080D0548 @ =gUnknown_202297A
ldr r0, _080D0548 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _080D054C @ =gUnknown_202297C
ldr r0, _080D054C @ =gBattle_BG2_X
strh r1, [r0]
movs r0, 0x1
movs r1, 0x5
@@ -4562,9 +4562,9 @@ sub_80D04E8: @ 80D04E8
pop {r0}
bx r0
.align 2, 0
_080D0544: .4byte gUnknown_2022978
_080D0548: .4byte gUnknown_202297A
_080D054C: .4byte gUnknown_202297C
_080D0544: .4byte gBattle_BG1_X
_080D0548: .4byte gBattle_BG1_Y
_080D054C: .4byte gBattle_BG2_X
_080D0550: .4byte gUnknown_2039A24
thumb_func_end sub_80D04E8
asm/field_map_obj.s
+4 -4
View File
@@ -21605,7 +21605,7 @@ _080677EA:
ands r0, r1
strb r0, [r5, 0x1]
_08067822:
ldr r1, _08067850 @ =gUnknown_825E074
ldr r1, _08067850 @ =gSineTable
movs r2, 0x3A
ldrsh r0, [r4, r2]
lsls r0, 1
@@ -21629,7 +21629,7 @@ _08067822:
strb r0, [r5]
b _080678B6
.align 2, 0
_08067850: .4byte gUnknown_825E074
_08067850: .4byte gSineTable
_08067854:
ldrh r0, [r4, 0x36]
adds r0, 0x1
@@ -21697,7 +21697,7 @@ sub_80678C0: @ 80678C0
movs r0, 0xFF
ands r2, r0
strh r2, [r1, 0x3C]
ldr r3, _080678EC @ =gUnknown_825E074
ldr r3, _080678EC @ =gSineTable
movs r4, 0x3C
ldrsh r0, [r1, r4]
lsls r0, 1
@@ -21715,7 +21715,7 @@ _080678E6:
pop {r1}
bx r1
.align 2, 0
_080678EC: .4byte gUnknown_825E074
_080678EC: .4byte gSineTable
thumb_func_end sub_80678C0
thumb_func_start sub_80678F0
asm/field_screen_effect.s
+12 -12
View File
@@ -135,12 +135,12 @@ _0807EEE0:
beq _0807EF6C
b _0807EF76
_0807EEE6:
ldr r0, _0807EF0C @ =gUnknown_2039600
ldr r0, _0807EF0C @ =gScanlineEffect
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
ldr r1, _0807EF10 @ =gUnknown_2038700
ldr r1, _0807EF10 @ =gScanlineEffectRegBuffers
adds r0, r1
movs r2, 0x2
ldrsh r1, [r4, r2]
@@ -153,15 +153,15 @@ _0807EEE6:
strh r0, [r4]
b _0807EF76
.align 2, 0
_0807EF0C: .4byte gUnknown_2039600
_0807EF10: .4byte gUnknown_2038700
_0807EF0C: .4byte gScanlineEffect
_0807EF10: .4byte gScanlineEffectRegBuffers
_0807EF14:
ldr r0, _0807EF5C @ =gUnknown_2039600
ldr r0, _0807EF5C @ =gScanlineEffect
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
ldr r1, _0807EF60 @ =gUnknown_2038700
ldr r1, _0807EF60 @ =gScanlineEffectRegBuffers
adds r0, r1
movs r6, 0x2
ldrsh r1, [r4, r6]
@@ -186,19 +186,19 @@ _0807EF14:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _0807EF64
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0x2
strh r0, [r4]
b _0807EF76
.align 2, 0
_0807EF5C: .4byte gUnknown_2039600
_0807EF60: .4byte gUnknown_2038700
_0807EF5C: .4byte gScanlineEffect
_0807EF60: .4byte gScanlineEffectRegBuffers
_0807EF64:
adds r0, r5, 0
bl DestroyTask
b _0807EF76
_0807EF6C:
bl dp12_8087EA4
bl ScanlineEffect_Clear
adds r0, r5, 0
bl DestroyTask
_0807EF76:
@@ -344,7 +344,7 @@ sub_807F074: @ 807F074
lsrs r0, 24
cmp r0, 0
beq _0807F0A2
ldr r4, _0807F0A8 @ =gUnknown_2038700
ldr r4, _0807F0A8 @ =gScanlineEffectRegBuffers
ldr r1, _0807F0AC @ =gUnknown_83C68D4
lsls r0, 1
adds r0, r1
@@ -365,7 +365,7 @@ _0807F0A2:
pop {r0}
bx r0
.align 2, 0
_0807F0A8: .4byte gUnknown_2038700
_0807F0A8: .4byte gScanlineEffectRegBuffers
_0807F0AC: .4byte gUnknown_83C68D4
thumb_func_end sub_807F074
asm/field_weather.s
+2 -2
View File
@@ -2250,7 +2250,7 @@ _0807AD14:
movs r1, 0x7F
ands r0, r1
strh r0, [r2]
ldr r1, _0807AD5C @ =gUnknown_825E074
ldr r1, _0807AD5C @ =gSineTable
movs r3, 0
ldrsh r0, [r2, r3]
lsls r0, 1
@@ -2278,7 +2278,7 @@ _0807AD54:
strh r0, [r4]
b _0807ADA0
.align 2, 0
_0807AD5C: .4byte gUnknown_825E074
_0807AD5C: .4byte gSineTable
_0807AD60: .4byte 0x0000073c
_0807AD64: .4byte 0x0000073e
_0807AD68:
asm/field_weather_effects.s
+6 -6
View File
@@ -1972,7 +1972,7 @@ sub_807C1AC: @ 807C1AC
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x34]
ldr r1, _0807C224 @ =gUnknown_825E074
ldr r1, _0807C224 @ =gSineTable
movs r3, 0x34
ldrsh r0, [r4, r3]
lsls r0, 1
@@ -2020,7 +2020,7 @@ _0807C210:
subs r0, r1
b _0807C23C
.align 2, 0
_0807C224: .4byte gUnknown_825E074
_0807C224: .4byte gSineTable
_0807C228: .4byte gSpriteCoordOffsetX
_0807C22C: .4byte 0x000001ff
_0807C230: .4byte 0xffffff00
@@ -4417,7 +4417,7 @@ sub_807D4C4: @ 807D4C4
ldr r2, [r0]
ldr r0, _0807D52C @ =0x00000704
adds r4, r2, r0
ldr r6, _0807D530 @ =gUnknown_825E074
ldr r6, _0807D530 @ =gSineTable
ldr r1, _0807D534 @ =0x00000712
adds r5, r2, r1
ldrh r0, [r5]
@@ -4465,7 +4465,7 @@ sub_807D4C4: @ 807D4C4
.align 2, 0
_0807D528: .4byte gUnknown_83C2BBC
_0807D52C: .4byte 0x00000704
_0807D530: .4byte gUnknown_825E074
_0807D530: .4byte gSineTable
_0807D534: .4byte 0x00000712
_0807D538: .4byte gSpriteCoordOffsetX
_0807D53C: .4byte 0x0000070e
@@ -4856,7 +4856,7 @@ SandstormSpriteCallback3: @ 807D81C
_0807D83A:
movs r0, 0x2E
ldrsh r4, [r5, r0]
ldr r3, _0807D88C @ =gUnknown_825E074
ldr r3, _0807D88C @ =gSineTable
movs r2, 0x30
ldrsh r1, [r5, r2]
lsls r0, r1, 1
@@ -4897,7 +4897,7 @@ _0807D886:
pop {r0}
bx r0
.align 2, 0
_0807D88C: .4byte gUnknown_825E074
_0807D88C: .4byte gSineTable
thumb_func_end SandstormSpriteCallback3
thumb_func_start Weather11_InitVars
asm/hall_of_fame.s
+3 -3
View File
@@ -3070,7 +3070,7 @@ _080F36B8: .4byte gUnknown_840C39C
thumb_func_start sub_80F36BC
sub_80F36BC: @ 80F36BC
push {lr}
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl reset_temp_tile_data_buffers
@@ -3353,7 +3353,7 @@ _080F38EE:
movs r1, 0x3
ands r0, r1
adds r0, 0x8
ldr r1, _080F392C @ =gUnknown_825E074
ldr r1, _080F392C @ =gSineTable
lsls r4, 1
adds r4, r1
movs r2, 0
@@ -3373,7 +3373,7 @@ _080F3926:
pop {r0}
bx r0
.align 2, 0
_080F392C: .4byte gUnknown_825E074
_080F392C: .4byte gSineTable
thumb_func_end sub_80F38D8
thumb_func_start sub_80F3930
asm/intro.s
+11 -11
View File
@@ -166,7 +166,7 @@ _080EC65E:
movs r0, 0
movs r2, 0
bl load_copyright_graphics
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl FreeAllSpritePalettes
@@ -3369,7 +3369,7 @@ _080EE114:
_080EE11C:
movs r4, 0x6
ldrsh r3, [r5, r4]
ldr r4, _080EE15C @ =gUnknown_825E074
ldr r4, _080EE15C @ =gSineTable
adds r0, r3, 0
adds r0, 0x40
lsls r0, 1
@@ -3400,7 +3400,7 @@ _080EE156:
pop {r0}
bx r0
.align 2, 0
_080EE15C: .4byte gUnknown_825E074
_080EE15C: .4byte gSineTable
thumb_func_end sub_80EE024
thumb_func_start sub_80EE160
@@ -3587,7 +3587,7 @@ sub_80EE29C: @ 80EE29C
lsls r1, 16
asrs r1, 20
strh r1, [r5, 0x22]
ldr r1, _080EE340 @ =gUnknown_825E074
ldr r1, _080EE340 @ =gSineTable
lsls r0, 16
asrs r0, 20
adds r0, 0x40
@@ -3646,7 +3646,7 @@ _080EE336:
pop {r0}
bx r0
.align 2, 0
_080EE340: .4byte gUnknown_825E074
_080EE340: .4byte gSineTable
_080EE344: .4byte gUnknown_203AB16
_080EE348: .4byte 0x41c64e6d
_080EE34C: .4byte 0x00006073
@@ -4208,7 +4208,7 @@ _080EE740:
lsls r1, 16
asrs r1, 20
strh r1, [r4, 0x24]
ldr r1, _080EE7B0 @ =gUnknown_825E074
ldr r1, _080EE7B0 @ =gSineTable
movs r3, 0x34
ldrsh r0, [r4, r3]
lsls r0, 1
@@ -4253,7 +4253,7 @@ _080EE78C:
strh r0, [r4, 0x3C]
b _080EE818
.align 2, 0
_080EE7B0: .4byte gUnknown_825E074
_080EE7B0: .4byte gSineTable
_080EE7B4: .4byte gUnknown_203AB04
_080EE7B8: .4byte gUnknown_203AB08
_080EE7BC: .4byte gUnknown_203AB06
@@ -4585,7 +4585,7 @@ _080EEA08:
lsls r1, 16
asrs r1, 20
strh r1, [r4, 0x24]
ldr r1, _080EEA48 @ =gUnknown_825E074
ldr r1, _080EEA48 @ =gSineTable
lsls r0, 16
asrs r0, 20
lsls r0, 1
@@ -4599,7 +4599,7 @@ _080EEA08:
strh r0, [r4, 0x26]
b _080EEA88
.align 2, 0
_080EEA48: .4byte gUnknown_825E074
_080EEA48: .4byte gSineTable
_080EEA4C:
ldrh r0, [r4, 0x32]
lsrs r0, 4
@@ -4775,7 +4775,7 @@ _080EEB84:
asrs r0, 20
negs r1, r0
strh r1, [r4, 0x24]
ldr r1, _080EEBD4 @ =gUnknown_825E074
ldr r1, _080EEBD4 @ =gSineTable
lsls r0, 1
adds r0, r1
movs r3, 0
@@ -4810,7 +4810,7 @@ _080EEBCE:
pop {r0}
bx r0
.align 2, 0
_080EEBD4: .4byte gUnknown_825E074
_080EEBD4: .4byte gSineTable
_080EEBD8: .4byte gUnknown_203AB04
_080EEBDC: .4byte gUnknown_203AB08
_080EEBE0: .4byte SpriteCallbackDummy
asm/item_menu.s
+1 -1
View File
@@ -257,7 +257,7 @@ _08107FB0:
bl clear_scheduled_bg_copies_to_vram
b _08108104
_08107FBA:
bl remove_some_task
bl ScanlineEffect_Stop
b _08108104
_08107FC0:
bl FreeAllSpritePalettes
asm/item_pc.s
+1 -1
View File
@@ -162,7 +162,7 @@ _0810D53C:
bl clear_scheduled_bg_copies_to_vram
b _0810D674
_0810D546:
bl remove_some_task
bl ScanlineEffect_Stop
b _0810D674
_0810D54C:
bl FreeAllSpritePalettes
asm/link.s
+1 -1
View File
@@ -3252,7 +3252,7 @@ c2_800ACD4: @ 800ACD4
movs r2, 0x2
bl FillPalette
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
ldr r1, _0800ADF0 @ =gWirelessCommType
ldrb r0, [r1]
cmp r0, 0
asm/macros.inc
+5
View File
@@ -147,3 +147,8 @@
.2byte MAP_\map_name
.space 2
.endm
.macro window_template bg, top, left, height, width, palno, baseBlock
.byte \bg, \top, \left, \height, \width, \palno
.2byte \baseBlock
.endm
asm/mail.s
+1 -1
View File
@@ -200,7 +200,7 @@ _080BED40:
_080BED8C:
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0
movs r1, 0
bl SetGpuReg
asm/main_menu.s
+1 -1
View File
@@ -113,7 +113,7 @@ sub_800C318: @ 800C318
ldr r0, _0800C4B0 @ =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl FreeAllSpritePalettes
asm/menu_indicators.s
+6 -6
View File
@@ -38,7 +38,7 @@ _0813392A:
_0813393A:
movs r0, 0x34
ldrsh r3, [r4, r0]
ldr r1, _0813395C @ =gUnknown_825E074
ldr r1, _0813395C @ =gSineTable
ldrh r2, [r4, 0x38]
lsls r0, r2, 24
lsrs r0, 23
@@ -54,11 +54,11 @@ _08133954:
strh r0, [r4, 0x24]
b _0813397E
.align 2, 0
_0813395C: .4byte gUnknown_825E074
_0813395C: .4byte gSineTable
_08133960:
movs r0, 0x34
ldrsh r3, [r4, r0]
ldr r1, _0813398C @ =gUnknown_825E074
ldr r1, _0813398C @ =gSineTable
ldrh r2, [r4, 0x38]
lsls r0, r2, 24
lsrs r0, 23
@@ -81,7 +81,7 @@ _08133984:
pop {r0}
bx r0
.align 2, 0
_0813398C: .4byte gUnknown_825E074
_0813398C: .4byte gSineTable
thumb_func_end sub_8133904
thumb_func_start AddScrollIndicatorArrowObject
@@ -959,7 +959,7 @@ _0813403C: .4byte gSprites
ObjectCB_RedArrowCursor: @ 8134040
push {lr}
adds r2, r0, 0
ldr r1, _08134068 @ =gUnknown_825E074
ldr r1, _08134068 @ =gSineTable
ldrh r3, [r2, 0x2E]
lsls r0, r3, 24
lsrs r0, 23
@@ -978,7 +978,7 @@ _08134058:
pop {r0}
bx r0
.align 2, 0
_08134068: .4byte gUnknown_825E074
_08134068: .4byte gSineTable
thumb_func_end ObjectCB_RedArrowCursor
thumb_func_start nullsub_95
asm/mystery_gift_menu.s
+1 -1
View File
@@ -64,7 +64,7 @@ _081420D6:
bl ResetSpriteData
bl FreeAllSpritePalettes
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0x1
bl ResetBgsAndClearDma3BusyFlags
ldr r1, _081421E0 @ =gUnknown_8466D60
asm/oak_speech.s
-5728
View File
File diff suppressed because it is too large Load Diff
asm/option_menu.s
+1 -1
View File
@@ -431,7 +431,7 @@ sub_80886D4: @ 80886D4
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
pop {r0}
bx r0
thumb_func_end sub_80886D4
asm/overworld.s
+5 -5
View File
@@ -3933,7 +3933,7 @@ VBlankCB_Field: @ 8056A14
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
bl FieldUpdateBgTilemapScroll
bl TransferPlttBuffer
bl TransferTilesetAnimsBuffer
@@ -3954,7 +3954,7 @@ sub_8056A34: @ 8056A34
ldr r0, [r2]
ldr r1, [r2, 0x4]
ldr r2, [r2, 0x8]
bl sub_8087EE4
bl ScanlineEffect_SetParams
_08056A52:
pop {r0}
bx r0
@@ -4451,7 +4451,7 @@ sub_8056E80: @ 8056E80
movs r0, 0
movs r1, 0
bl SetGpuReg
bl remove_some_task
bl ScanlineEffect_Stop
ldr r2, _08056EF8 @ =0x05000002
mov r1, sp
movs r0, 0
@@ -4630,7 +4630,7 @@ sub_8057024: @ 8057024
bl ResetTasks
bl ResetSpriteData
bl ResetPaletteFade
bl dp12_8087EA4
bl ScanlineEffect_Clear
bl dp13_810BB8C
bl ResetCameraUpdateInfo
bl InstallCameraPanAheadCallback
@@ -5395,7 +5395,7 @@ _08057690:
bl sub_8055920
b _0805772A
_0805769C:
bl dp12_8087EA4
bl ScanlineEffect_Clear
bl dp13_810BB8C
bl ResetCameraUpdateInfo
bl InstallCameraPanAheadCallback
asm/party_menu.s
+1 -1
View File
@@ -281,7 +281,7 @@ _0811EC80:
bl clear_scheduled_bg_copies_to_vram
b _0811EDFC
_0811EC8E:
bl remove_some_task
bl ScanlineEffect_Stop
b _0811EDFC
_0811EC94:
bl ResetPaletteFade
asm/pokeball.s
+2 -2
View File
@@ -2276,7 +2276,7 @@ _0804BB22:
ldrsh r0, [r4, r7]
cmp r0, 0x7F
bgt _0804BB64
ldr r1, _0804BB60 @ =gUnknown_825E074
ldr r1, _0804BB60 @ =gSineTable
lsls r0, r2, 24
lsrs r0, 23
adds r0, r1
@@ -2297,7 +2297,7 @@ _0804BB48:
b _0804BB72
.align 2, 0
_0804BB5C: .4byte gSprites
_0804BB60: .4byte gUnknown_825E074
_0804BB60: .4byte gSineTable
_0804BB64:
ldrh r0, [r4, 0x38]
strh r0, [r5, 0x20]
asm/pokedex_screen.s
+1 -1
View File
@@ -58,7 +58,7 @@ sub_810250C: @ 810250C
bl ResetPaletteFade
bl ResetSpriteData
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
movs r0, 0x1
bl ResetBgsAndClearDma3BusyFlags
ldr r1, _08102598 @ =gUnknown_8451EBC
asm/pokemon_special_anim.s
+4 -4
View File
@@ -3400,7 +3400,7 @@ sub_811DFC0: @ 811DFC0
strh r0, [r3, 0x4]
movs r5, 0x4
ldrsh r1, [r3, r5]
ldr r2, _0811E018 @ =gUnknown_825E074
ldr r2, _0811E018 @ =gSineTable
movs r5, 0x2
ldrsh r0, [r3, r5]
adds r0, 0x40
@@ -3424,7 +3424,7 @@ sub_811DFC0: @ 811DFC0
strh r0, [r4, 0x26]
b _0811E036
.align 2, 0
_0811E018: .4byte gUnknown_825E074
_0811E018: .4byte gSineTable
_0811E01C:
ldr r2, _0811E03C @ =gTasks
movs r5, 0xE
@@ -3958,7 +3958,7 @@ _0811E3E0:
lsls r0, 16
lsrs r0, 16
adds r0, 0x46
ldr r3, _0811E4BC @ =gUnknown_825E074
ldr r3, _0811E4BC @ =gSineTable
movs r4, 0xA
ldrsh r2, [r5, r4]
adds r1, r2, 0
@@ -4035,7 +4035,7 @@ _0811E4A4:
strh r0, [r5]
b _0811E4DC
.align 2, 0
_0811E4BC: .4byte gUnknown_825E074
_0811E4BC: .4byte gSineTable
_0811E4C0: .4byte gUnknown_8459B30
_0811E4C4: .4byte gSprites
_0811E4C8:
asm/pokemon_storage_system.s
+6 -6
View File
@@ -10686,7 +10686,7 @@ _08090EC6:
ldr r0, [r4]
ldr r0, [r0]
mov r8, r0
ldr r5, _08090FB8 @ =gUnknown_825E074
ldr r5, _08090FB8 @ =gSineTable
mov r0, r9
adds r1, r3, r0
ldrb r0, [r1]
@@ -10803,7 +10803,7 @@ _08090FA0:
_08090FAC: .4byte 0x00000c59
_08090FB0: .4byte 0x00000afc
_08090FB4: .4byte 0x00000a68
_08090FB8: .4byte gUnknown_825E074
_08090FB8: .4byte gSineTable
_08090FBC: .4byte sub_80911B0
_08090FC0: .4byte SpriteCallbackDummy
thumb_func_end sub_8090E74
@@ -22569,7 +22569,7 @@ _08096AA2:
lsls r0, 16
asrs r0, 20
strh r0, [r4, 0x22]
ldr r1, _08096B08 @ =gUnknown_825E074
ldr r1, _08096B08 @ =gSineTable
movs r2, 0x38
ldrsh r0, [r4, r2]
lsls r0, 4
@@ -22605,7 +22605,7 @@ _08096B00:
pop {r0}
bx r0
.align 2, 0
_08096B08: .4byte gUnknown_825E074
_08096B08: .4byte gSineTable
_08096B0C: .4byte sub_80969BC
thumb_func_end sub_8096A74
@@ -22650,7 +22650,7 @@ _08096B3E:
lsls r1, 16
asrs r1, 20
strh r1, [r4, 0x22]
ldr r1, _08096BA4 @ =gUnknown_825E074
ldr r1, _08096BA4 @ =gSineTable
movs r2, 0x38
ldrsh r0, [r4, r2]
lsls r0, 4
@@ -22687,7 +22687,7 @@ _08096B9E:
pop {r0}
bx r0
.align 2, 0
_08096BA4: .4byte gUnknown_825E074
_08096BA4: .4byte gSineTable
_08096BA8: .4byte SpriteCallbackDummy
thumb_func_end sub_8096B10
asm/pokemon_summary_screen.s
+1 -1
View File
@@ -4567,7 +4567,7 @@ sub_8136BAC: @ 8136BAC
bl ResetSpriteData
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl remove_some_task
bl ScanlineEffect_Stop
pop {r0}
bx r0
thumb_func_end sub_8136BAC
asm/region_map.s
+1 -1
View File
@@ -1487,7 +1487,7 @@ sub_80C0A6C: @ 80C0A6C
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
pop {r0}
bx r0
thumb_func_end sub_80C0A6C
asm/reshow_battle_screen.s
+17 -17
View File
@@ -123,7 +123,7 @@ _08077860:
_08077866:
movs r0, 0
bl SetVBlankCallback
bl dp12_8087EA4
bl ScanlineEffect_Clear
bl sub_800F324
movs r0, 0x1
movs r1, 0x1
@@ -142,33 +142,33 @@ _08077866:
movs r0, 0x3
bl ShowBg
bl ResetPaletteFade
ldr r0, _080778C8 @ =gUnknown_2022974
ldr r0, _080778C8 @ =gBattle_BG0_X
movs r1, 0
strh r1, [r0]
ldr r0, _080778CC @ =gUnknown_2022976
ldr r0, _080778CC @ =gBattle_BG0_Y
strh r1, [r0]
ldr r0, _080778D0 @ =gUnknown_2022978
ldr r0, _080778D0 @ =gBattle_BG1_X
strh r1, [r0]
ldr r0, _080778D4 @ =gUnknown_202297A
ldr r0, _080778D4 @ =gBattle_BG1_Y
strh r1, [r0]
ldr r0, _080778D8 @ =gUnknown_202297C
ldr r0, _080778D8 @ =gBattle_BG2_X
strh r1, [r0]
ldr r0, _080778DC @ =gUnknown_202297E
ldr r0, _080778DC @ =gBattle_BG2_Y
strh r1, [r0]
ldr r0, _080778E0 @ =gUnknown_2022980
ldr r0, _080778E0 @ =gBattle_BG3_X
strh r1, [r0]
ldr r0, _080778E4 @ =gUnknown_2022982
ldr r0, _080778E4 @ =gBattle_BG3_Y
strh r1, [r0]
b _08077A8A
.align 2, 0
_080778C8: .4byte gUnknown_2022974
_080778CC: .4byte gUnknown_2022976
_080778D0: .4byte gUnknown_2022978
_080778D4: .4byte gUnknown_202297A
_080778D8: .4byte gUnknown_202297C
_080778DC: .4byte gUnknown_202297E
_080778E0: .4byte gUnknown_2022980
_080778E4: .4byte gUnknown_2022982
_080778C8: .4byte gBattle_BG0_X
_080778CC: .4byte gBattle_BG0_Y
_080778D0: .4byte gBattle_BG1_X
_080778D4: .4byte gBattle_BG1_Y
_080778D8: .4byte gBattle_BG2_X
_080778DC: .4byte gBattle_BG2_Y
_080778E0: .4byte gBattle_BG3_X
_080778E4: .4byte gBattle_BG3_Y
_080778E8:
movs r0, 0
str r0, [sp, 0x4]
asm/seagallop.s
+1 -1
View File
@@ -533,7 +533,7 @@ _081472F8: .4byte 0x81000800
thumb_func_start sub_81472FC
sub_81472FC: @ 81472FC
push {lr}
bl remove_some_task
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
bl dp13_810BB8C
asm/shop.s
+1 -1
View File
@@ -522,7 +522,7 @@ _0809AEAC:
ldr r2, _0809AF4C @ =0x01000100
add r0, sp, 0x8
bl CpuFastSet
bl remove_some_task
bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers
bl FreeAllSpritePalettes
bl ResetPaletteFade
asm/slot_machine.s
+4 -4
View File
@@ -4424,7 +4424,7 @@ _08141984:
ldrsh r0, [r5, r2]
cmp r0, 0
bne _081419C4
ldr r1, _081419BC @ =gUnknown_825E074
ldr r1, _081419BC @ =gSineTable
movs r2, 0x4
ldrsh r0, [r5, r2]
lsls r0, 1
@@ -4447,7 +4447,7 @@ _08141984:
movs r0, 0x8
b _081419C6
.align 2, 0
_081419BC: .4byte gUnknown_825E074
_081419BC: .4byte gSineTable
_081419C0: .4byte gUnknown_84664DC
_081419C4:
subs r0, r1, 0x1
@@ -4462,7 +4462,7 @@ _081419C6:
movs r1, 0x7F
ands r0, r1
strh r0, [r5, 0x8]
ldr r1, _081419FC @ =gUnknown_825E074
ldr r1, _081419FC @ =gSineTable
movs r2, 0x8
ldrsh r0, [r5, r2]
lsls r0, 1
@@ -4478,7 +4478,7 @@ _081419C6:
bl BlendPalettes
b _08141A2C
.align 2, 0
_081419FC: .4byte gUnknown_825E074
_081419FC: .4byte gSineTable
_08141A00:
ldrh r0, [r5, 0x8]
adds r0, 0x1
asm/start_menu.s
+2 -2
View File
@@ -1713,7 +1713,7 @@ _0806FA88:
bl SetGpuReg
movs r0, 0
bl SetVBlankCallback
bl remove_some_task
bl ScanlineEffect_Stop
movs r2, 0xA0
lsls r2, 19
mov r1, sp
@@ -1767,7 +1767,7 @@ _0806FB00:
bl ResetSpriteData
bl ResetTasks
bl ResetPaletteFade
bl dp12_8087EA4
bl ScanlineEffect_Clear
b _0806FB64
_0806FB12:
movs r0, 0
asm/teachy_tv.s
+1 -1
View File
@@ -122,7 +122,7 @@ _0815AC48:
strb r1, [r0]
bl sub_80BF768
bl clear_scheduled_bg_copies_to_vram
bl remove_some_task
bl ScanlineEffect_Stop
bl FreeAllSpritePalettes
bl ResetPaletteFade
bl ResetSpriteData
asm/title_screen.s
+18 -18
View File
@@ -292,7 +292,7 @@ sub_8078BB4: @ 8078BB4
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
ldr r1, _08078BE4 @ =gUnknown_2037F30
ldrb r0, [r1]
cmp r0, 0xFF
@@ -433,7 +433,7 @@ sub_8078C9C: @ 8078C9C
strb r5, [r0, 0x9]
add r0, sp, 0xC
strh r5, [r0]
ldr r4, _08078D1C @ =gUnknown_2038700
ldr r4, _08078D1C @ =gScanlineEffectRegBuffers
ldr r6, _08078D20 @ =0x010000a0
adds r1, r4, 0
adds r2, r6, 0
@@ -450,7 +450,7 @@ sub_8078C9C: @ 8078C9C
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl sub_8087EE4
bl ScanlineEffect_SetParams
mov r0, r8
movs r1, 0x1
bl sub_8078C90
@@ -463,7 +463,7 @@ sub_8078C9C: @ 8078C9C
.align 2, 0
_08078D14: .4byte 0x04000054
_08078D18: .4byte 0xa2600001
_08078D1C: .4byte gUnknown_2038700
_08078D1C: .4byte gScanlineEffectRegBuffers
_08078D20: .4byte 0x010000a0
thumb_func_end sub_8078C9C
@@ -507,7 +507,7 @@ _08078D5C:
ldrsh r0, [r4, r1]
cmp r0, 0
bge _08078D9C
ldr r1, _08078D80 @ =gUnknown_2039600
ldr r1, _08078D80 @ =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
_08078D78:
@@ -516,7 +516,7 @@ _08078D78:
strh r0, [r4, 0x2]
b _08078D9C
.align 2, 0
_08078D80: .4byte gUnknown_2039600
_08078D80: .4byte gScanlineEffect
_08078D84:
movs r0, 0x50
movs r1, 0
@@ -1481,9 +1481,9 @@ sub_8079550: @ 8079550
asrs r4, r5, 16
cmp r4, 0
blt _08079574
ldr r3, _08079618 @ =gUnknown_2038700
ldr r3, _08079618 @ =gScanlineEffectRegBuffers
lsls r2, r4, 1
ldr r0, _0807961C @ =gUnknown_2039600
ldr r0, _0807961C @ =gScanlineEffect
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
@@ -1496,9 +1496,9 @@ _08079574:
movs r3, 0
mov r8, r5
adds r6, r4, 0
ldr r0, _08079618 @ =gUnknown_2038700
ldr r0, _08079618 @ =gScanlineEffectRegBuffers
mov r12, r0
ldr r7, _0807961C @ =gUnknown_2039600
ldr r7, _0807961C @ =gScanlineEffect
movs r5, 0xF
lsls r2, r6, 1
adds r4, r2, 0
@@ -1537,8 +1537,8 @@ _080795AE:
adds r3, 0x10
cmp r3, 0x9F
bgt _080795E6
ldr r6, _08079618 @ =gUnknown_2038700
ldr r5, _0807961C @ =gUnknown_2039600
ldr r6, _08079618 @ =gScanlineEffectRegBuffers
ldr r5, _0807961C @ =gScanlineEffect
movs r4, 0
_080795CC:
cmp r3, 0
@@ -1562,8 +1562,8 @@ _080795E6:
subs r3, 0x10
cmp r3, 0
blt _0807960E
ldr r6, _08079618 @ =gUnknown_2038700
ldr r5, _0807961C @ =gUnknown_2039600
ldr r6, _08079618 @ =gScanlineEffectRegBuffers
ldr r5, _0807961C @ =gScanlineEffect
movs r4, 0
_080795F8:
lsls r2, r3, 1
@@ -1584,14 +1584,14 @@ _0807960E:
pop {r0}
bx r0
.align 2, 0
_08079618: .4byte gUnknown_2038700
_0807961C: .4byte gUnknown_2039600
_08079618: .4byte gScanlineEffectRegBuffers
_0807961C: .4byte gScanlineEffect
thumb_func_end sub_8079550
thumb_func_start sub_8079620
sub_8079620: @ 8079620
push {lr}
ldr r1, _08079644 @ =gUnknown_2039600
ldr r1, _08079644 @ =gScanlineEffect
ldrb r0, [r1, 0x15]
cmp r0, 0
beq _0807962E
@@ -1607,7 +1607,7 @@ _0807962E:
pop {r0}
bx r0
.align 2, 0
_08079644: .4byte gUnknown_2039600
_08079644: .4byte gScanlineEffect
thumb_func_end sub_8079620
thumb_func_start sub_8079648
asm/tm_case.s
+1 -1
View File
@@ -152,7 +152,7 @@ _08131934:
bl clear_scheduled_bg_copies_to_vram
b _08131A52
_0813193E:
bl remove_some_task
bl ScanlineEffect_Stop
b _08131A52
_08131944:
bl FreeAllSpritePalettes
asm/trainer_card.s
+17 -17
View File
@@ -18,7 +18,7 @@ sub_8088FF0: @ 8088FF0
cmp r0, 0
beq _08089020
ldr r1, _08089028 @ =0x040000d4
ldr r0, _0808902C @ =gUnknown_2038700
ldr r0, _0808902C @ =gScanlineEffectRegBuffers
str r0, [r1]
movs r2, 0xF0
lsls r2, 3
@@ -33,7 +33,7 @@ _08089020:
.align 2, 0
_08089024: .4byte gUnknown_20397A4
_08089028: .4byte 0x040000d4
_0808902C: .4byte gUnknown_2038700
_0808902C: .4byte gScanlineEffectRegBuffers
_08089030: .4byte 0x800000a0
thumb_func_end sub_8088FF0
@@ -44,7 +44,7 @@ sub_8089034: @ 8089034
ldrh r3, [r4]
movs r0, 0
strh r0, [r4]
ldr r1, _08089064 @ =gUnknown_2038700
ldr r1, _08089064 @ =gScanlineEffectRegBuffers
ldr r0, _08089068 @ =0x04000006
ldrh r2, [r0]
movs r0, 0xFF
@@ -63,7 +63,7 @@ sub_8089034: @ 8089034
bx r0
.align 2, 0
_08089060: .4byte 0x04000208
_08089064: .4byte gUnknown_2038700
_08089064: .4byte gScanlineEffectRegBuffers
_08089068: .4byte 0x04000006
_0808906C: .4byte 0x04000012
thumb_func_end sub_8089034
@@ -1658,7 +1658,7 @@ _08089DA0: .4byte sub_8089070
sub_8089DA4: @ 8089DA4
push {lr}
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
ldr r0, _08089DC4 @ =sub_80890C0
movs r1, 0
bl CreateTask
@@ -4179,10 +4179,10 @@ sub_808B254: @ 808B254
bl HideBg
movs r0, 0x3
bl HideBg
bl remove_some_task
bl dp12_8087EA4
bl ScanlineEffect_Stop
bl ScanlineEffect_Clear
movs r1, 0
ldr r0, _0808B290 @ =gUnknown_2038700
ldr r0, _0808B290 @ =gScanlineEffectRegBuffers
movs r2, 0
movs r3, 0xF0
lsls r3, 3
@@ -4201,7 +4201,7 @@ _0808B278:
pop {r1}
bx r1
.align 2, 0
_0808B290: .4byte gUnknown_2038700
_0808B290: .4byte gScanlineEffectRegBuffers
thumb_func_end sub_808B254
thumb_func_start sub_808B294
@@ -4271,7 +4271,7 @@ _0808B2CA:
movs r2, 0
cmp r2, r7
bcs _0808B334
ldr r3, _0808B3C0 @ =gUnknown_2038700
ldr r3, _0808B3C0 @ =gScanlineEffectRegBuffers
_0808B31C:
lsls r0, r2, 16
asrs r0, 16
@@ -4296,7 +4296,7 @@ _0808B334:
lsrs r7, r4, 16
cmp r1, r0
bge _0808B36C
ldr r0, _0808B3C0 @ =gUnknown_2038700
ldr r0, _0808B3C0 @ =gScanlineEffectRegBuffers
mov r12, r0
adds r4, r3, 0
_0808B34E:
@@ -4321,7 +4321,7 @@ _0808B36C:
asrs r0, r1, 16
cmp r0, 0x9F
bgt _0808B38A
ldr r2, _0808B3C0 @ =gUnknown_2038700
ldr r2, _0808B3C0 @ =gScanlineEffectRegBuffers
_0808B378:
asrs r0, r1, 16
lsls r1, r0, 1
@@ -4359,7 +4359,7 @@ _0808B3A2:
_0808B3B4: .4byte gUnknown_20397A4
_0808B3B8: .4byte 0x00007bcc
_0808B3BC: .4byte 0xffff0000
_0808B3C0: .4byte gUnknown_2038700
_0808B3C0: .4byte gScanlineEffectRegBuffers
thumb_func_end sub_808B294
thumb_func_start sub_808B3C4
@@ -4612,7 +4612,7 @@ _0808B572:
movs r2, 0
cmp r2, r7
bcs _0808B5DC
ldr r3, _0808B668 @ =gUnknown_2038700
ldr r3, _0808B668 @ =gScanlineEffectRegBuffers
_0808B5C4:
lsls r0, r2, 16
asrs r0, 16
@@ -4637,7 +4637,7 @@ _0808B5DC:
lsrs r7, r4, 16
cmp r1, r0
bge _0808B612
ldr r0, _0808B668 @ =gUnknown_2038700
ldr r0, _0808B668 @ =gScanlineEffectRegBuffers
mov r12, r0
adds r4, r3, 0
_0808B5F6:
@@ -4661,7 +4661,7 @@ _0808B612:
asrs r0, r1, 16
cmp r0, 0x9F
bgt _0808B630
ldr r2, _0808B668 @ =gUnknown_2038700
ldr r2, _0808B668 @ =gScanlineEffectRegBuffers
_0808B61E:
asrs r0, r1, 16
lsls r1, r0, 1
@@ -4699,7 +4699,7 @@ _0808B648:
_0808B65C: .4byte gUnknown_20397A4
_0808B660: .4byte 0x00007bcc
_0808B664: .4byte 0xffff0000
_0808B668: .4byte gUnknown_2038700
_0808B668: .4byte gScanlineEffectRegBuffers
thumb_func_end sub_808B540
thumb_func_start sub_808B66C
asm/trig.s
+4 -4
View File
@@ -9,7 +9,7 @@
Sin: @ 8044E30
lsls r1, 16
asrs r1, 16
ldr r2, _08044E48 @ =gUnknown_825E074
ldr r2, _08044E48 @ =gSineTable
lsls r0, 16
asrs r0, 15
adds r0, r2
@@ -20,14 +20,14 @@ Sin: @ 8044E30
asrs r0, 16
bx lr
.align 2, 0
_08044E48: .4byte gUnknown_825E074
_08044E48: .4byte gSineTable
thumb_func_end Sin
thumb_func_start Cos
Cos: @ 8044E4C
lsls r1, 16
asrs r1, 16
ldr r2, _08044E68 @ =gUnknown_825E074
ldr r2, _08044E68 @ =gSineTable
lsls r0, 16
asrs r0, 15
adds r0, 0x80
@@ -39,7 +39,7 @@ Cos: @ 8044E4C
asrs r0, 16
bx lr
.align 2, 0
_08044E68: .4byte gUnknown_825E074
_08044E68: .4byte gSineTable
thumb_func_end Cos
thumb_func_start Sin2
asm/union_room_chat.s
+12 -12
View File
@@ -200,7 +200,7 @@ sub_81285B4: @ 81285B4
bl TransferPlttBuffer
bl LoadOam
bl ProcessSpriteCopyRequests
bl sub_8087F54
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
thumb_func_end sub_81285B4
@@ -3046,7 +3046,7 @@ sub_8129B88: @ 8129B88
str r0, [r4]
_08129B9E:
bl FreeAllWindowBuffers
ldr r1, _08129BB4 @ =gUnknown_2039600
ldr r1, _08129BB4 @ =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
pop {r4}
@@ -3054,7 +3054,7 @@ _08129B9E:
bx r0
.align 2, 0
_08129BB0: .4byte gUnknown_203B0E4
_08129BB4: .4byte gUnknown_2039600
_08129BB4: .4byte gScanlineEffect
thumb_func_end sub_8129B88
thumb_func_start sub_8129BB8
@@ -5384,13 +5384,13 @@ sub_812AD50: @ 812AD50
strh r1, [r0, 0x20]
str r1, [sp, 0xC]
add r0, sp, 0xC
ldr r1, _0812AD98 @ =gUnknown_2038700
ldr r1, _0812AD98 @ =gScanlineEffectRegBuffers
ldr r2, _0812AD9C @ =0x010003c0
bl CpuFastSet
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl sub_8087EE4
bl ScanlineEffect_SetParams
add sp, 0x10
pop {r0}
bx r0
@@ -5398,7 +5398,7 @@ sub_812AD50: @ 812AD50
_0812AD8C: .4byte 0xa2600001
_0812AD90: .4byte 0x04000014
_0812AD94: .4byte gUnknown_203B0E4
_0812AD98: .4byte gUnknown_2038700
_0812AD98: .4byte gScanlineEffectRegBuffers
_0812AD9C: .4byte 0x010003c0
thumb_func_end sub_812AD50
@@ -5410,12 +5410,12 @@ sub_812ADA0: @ 812ADA0
lsrs r0, 16
mov r1, sp
strh r0, [r1]
ldr r5, _0812ADE8 @ =gUnknown_2039600
ldr r5, _0812ADE8 @ =gScanlineEffect
ldrb r0, [r5, 0x14]
lsls r1, r0, 4
subs r1, r0
lsls r1, 7
ldr r4, _0812ADEC @ =gUnknown_2038700
ldr r4, _0812ADEC @ =gScanlineEffectRegBuffers
adds r1, r4
ldr r2, _0812ADF0 @ =0x01000090
mov r0, sp
@@ -5439,8 +5439,8 @@ sub_812ADA0: @ 812ADA0
pop {r0}
bx r0
.align 2, 0
_0812ADE8: .4byte gUnknown_2039600
_0812ADEC: .4byte gUnknown_2038700
_0812ADE8: .4byte gScanlineEffect
_0812ADEC: .4byte gScanlineEffectRegBuffers
_0812ADF0: .4byte 0x01000090
_0812ADF4: .4byte 0x01000010
thumb_func_end sub_812ADA0
@@ -5457,7 +5457,7 @@ sub_812ADF8: @ 812ADF8
lsrs r4, 16
mov r0, sp
strh r4, [r0]
ldr r5, _0812AE64 @ =gUnknown_2038700
ldr r5, _0812AE64 @ =gScanlineEffectRegBuffers
ldr r0, _0812AE68 @ =0x01000090
mov r9, r0
mov r0, sp
@@ -5498,7 +5498,7 @@ sub_812ADF8: @ 812ADF8
pop {r0}
bx r0
.align 2, 0
_0812AE64: .4byte gUnknown_2038700
_0812AE64: .4byte gScanlineEffectRegBuffers
_0812AE68: .4byte 0x01000090
_0812AE6C: .4byte 0x01000010
thumb_func_end sub_812ADF8
asm/unk_8147AA8.s
+2 -2
View File
@@ -7393,7 +7393,7 @@ _0814B1EC:
movs r0, 0
strh r0, [r5, 0x30]
_0814B1FE:
ldr r1, _0814B22C @ =gUnknown_825E074
ldr r1, _0814B22C @ =gSineTable
movs r2, 0x30
ldrsh r0, [r5, r2]
lsls r0, 1
@@ -7417,7 +7417,7 @@ _0814B1FE:
strh r1, [r5, 0x2E]
b _0814B234
.align 2, 0
_0814B22C: .4byte gUnknown_825E074
_0814B22C: .4byte gSineTable
_0814B230:
ldr r0, _0814B23C @ =SpriteCallbackDummy
str r0, [r5, 0x1C]
asm/unk_814D5C8.s
+1 -1
View File
@@ -49,7 +49,7 @@ _0814D61C:
movs r0, 0
movs r1, 0
bl SetGpuReg
bl remove_some_task
bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers
b _0814D878
_0814D63A:
asm/unk_815F138.s
+4 -4
View File
@@ -500,7 +500,7 @@ _0815F4DC:
adds r0, 0x1
strh r0, [r4]
_0815F4FA:
ldr r0, _0815F50C @ =gUnknown_825E074
ldr r0, _0815F50C @ =gSineTable
movs r2, 0x2
ldrsh r1, [r4, r2]
lsls r1, 1
@@ -510,7 +510,7 @@ _0815F4FA:
asrs r0, 4
b _0815F53E
.align 2, 0
_0815F50C: .4byte gUnknown_825E074
_0815F50C: .4byte gSineTable
_0815F510:
ldrh r0, [r4, 0x2]
adds r0, 0x10
@@ -527,7 +527,7 @@ _0815F510:
adds r0, 0x1
strh r0, [r4]
_0815F52E:
ldr r1, _0815F544 @ =gUnknown_825E074
ldr r1, _0815F544 @ =gSineTable
movs r2, 0x2
ldrsh r0, [r4, r2]
lsls r0, 1
@@ -540,7 +540,7 @@ _0815F53E:
strh r0, [r5, 0x26]
b _0815F55A
.align 2, 0
_0815F544: .4byte gUnknown_825E074
_0815F544: .4byte gSineTable
_0815F548:
ldrh r0, [r4, 0x2]
adds r0, 0x1
asm/unknown_task.s
-644
View File
@@ -1,644 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start remove_some_task
remove_some_task: @ 8087E64
push {r4,lr}
ldr r4, _08087E94 @ =gUnknown_2039600
movs r0, 0
strb r0, [r4, 0x15]
ldr r1, _08087E98 @ =0x040000b0
ldrh r2, [r1, 0xA]
ldr r0, _08087E9C @ =0x0000c5ff
ands r0, r2
strh r0, [r1, 0xA]
ldrh r2, [r1, 0xA]
ldr r0, _08087EA0 @ =0x00007fff
ands r0, r2
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
ldrb r0, [r4, 0x18]
cmp r0, 0xFF
beq _08087E8E
bl DestroyTask
movs r0, 0xFF
strb r0, [r4, 0x18]
_08087E8E:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08087E94: .4byte gUnknown_2039600
_08087E98: .4byte 0x040000b0
_08087E9C: .4byte 0x0000c5ff
_08087EA0: .4byte 0x00007fff
thumb_func_end remove_some_task
thumb_func_start dp12_8087EA4
dp12_8087EA4: @ 8087EA4
push {r4,lr}
sub sp, 0x4
mov r0, sp
movs r4, 0
strh r4, [r0]
ldr r1, _08087ED8 @ =gUnknown_2038700
ldr r2, _08087EDC @ =0x01000780
bl CpuSet
ldr r0, _08087EE0 @ =gUnknown_2039600
movs r1, 0
str r1, [r0]
str r1, [r0, 0x4]
str r1, [r0, 0x8]
str r1, [r0, 0xC]
strb r4, [r0, 0x14]
strb r4, [r0, 0x15]
strb r4, [r0, 0x16]
strb r4, [r0, 0x17]
movs r1, 0xFF
strb r1, [r0, 0x18]
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08087ED8: .4byte gUnknown_2038700
_08087EDC: .4byte 0x01000780
_08087EE0: .4byte gUnknown_2039600
thumb_func_end dp12_8087EA4
thumb_func_start sub_8087EE4
sub_8087EE4: @ 8087EE4
push {lr}
sub sp, 0xC
str r0, [sp]
str r1, [sp, 0x4]
str r2, [sp, 0x8]
ldr r0, _08087F08 @ =0xa2600001
cmp r1, r0
bne _08087F18
ldr r0, _08087F0C @ =gUnknown_2039600
ldr r1, _08087F10 @ =gUnknown_2038702
str r1, [r0]
movs r2, 0xF0
lsls r2, 3
adds r1, r2
str r1, [r0, 0x4]
ldr r1, _08087F14 @ =sub_8087FE0
b _08087F28
.align 2, 0
_08087F08: .4byte 0xa2600001
_08087F0C: .4byte gUnknown_2039600
_08087F10: .4byte gUnknown_2038702
_08087F14: .4byte sub_8087FE0
_08087F18:
ldr r0, _08087F48 @ =gUnknown_2039600
ldr r1, _08087F4C @ =gUnknown_2038704
str r1, [r0]
movs r2, 0xF0
lsls r2, 3
adds r1, r2
str r1, [r0, 0x4]
ldr r1, _08087F50 @ =sub_8088000
_08087F28:
str r1, [r0, 0x10]
adds r1, r0, 0
ldr r0, [sp, 0x4]
str r0, [r1, 0xC]
ldr r0, [sp]
str r0, [r1, 0x8]
mov r0, sp
ldrb r0, [r0, 0x8]
strb r0, [r1, 0x15]
mov r0, sp
ldrb r0, [r0, 0x9]
strb r0, [r1, 0x16]
strb r0, [r1, 0x17]
add sp, 0xC
pop {r0}
bx r0
.align 2, 0
_08087F48: .4byte gUnknown_2039600
_08087F4C: .4byte gUnknown_2038704
_08087F50: .4byte sub_8088000
thumb_func_end sub_8087EE4
thumb_func_start sub_8087F54
sub_8087F54: @ 8087F54
push {r4,lr}
ldr r4, _08087F84 @ =gUnknown_2039600
ldrb r0, [r4, 0x15]
cmp r0, 0
beq _08087FCE
cmp r0, 0x3
bne _08087F98
movs r0, 0
strb r0, [r4, 0x15]
ldr r1, _08087F88 @ =0x040000b0
ldrh r2, [r1, 0xA]
ldr r0, _08087F8C @ =0x0000c5ff
ands r0, r2
strh r0, [r1, 0xA]
ldrh r2, [r1, 0xA]
ldr r0, _08087F90 @ =0x00007fff
ands r0, r2
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
ldr r1, _08087F94 @ =gUnknown_203961C
movs r0, 0x1
strb r0, [r1]
b _08087FCE
.align 2, 0
_08087F84: .4byte gUnknown_2039600
_08087F88: .4byte 0x040000b0
_08087F8C: .4byte 0x0000c5ff
_08087F90: .4byte 0x00007fff
_08087F94: .4byte gUnknown_203961C
_08087F98:
ldr r1, _08087FD4 @ =0x040000b0
ldrh r2, [r1, 0xA]
ldr r0, _08087FD8 @ =0x0000c5ff
ands r0, r2
strh r0, [r1, 0xA]
ldrh r2, [r1, 0xA]
ldr r0, _08087FDC @ =0x00007fff
ands r0, r2
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
ldrb r0, [r4, 0x14]
lsls r0, 2
adds r0, r4
ldr r0, [r0]
str r0, [r1]
ldr r0, [r4, 0x8]
str r0, [r1, 0x4]
ldr r0, [r4, 0xC]
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
ldr r0, [r4, 0x10]
bl _call_via_r0
ldrb r0, [r4, 0x14]
movs r1, 0x1
eors r0, r1
strb r0, [r4, 0x14]
_08087FCE:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08087FD4: .4byte 0x040000b0
_08087FD8: .4byte 0x0000c5ff
_08087FDC: .4byte 0x00007fff
thumb_func_end sub_8087F54
thumb_func_start sub_8087FE0
sub_8087FE0: @ 8087FE0
ldr r0, _08087FF8 @ =gUnknown_2039600
ldr r2, [r0, 0x8]
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
ldr r1, _08087FFC @ =gUnknown_2038700
adds r0, r1
ldrh r0, [r0]
strh r0, [r2]
bx lr
.align 2, 0
_08087FF8: .4byte gUnknown_2039600
_08087FFC: .4byte gUnknown_2038700
thumb_func_end sub_8087FE0
thumb_func_start sub_8088000
sub_8088000: @ 8088000
ldr r0, _08088018 @ =gUnknown_2039600
ldr r2, [r0, 0x8]
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
ldr r1, _0808801C @ =gUnknown_2038700
adds r0, r1
ldr r0, [r0]
str r0, [r2]
bx lr
.align 2, 0
_08088018: .4byte gUnknown_2039600
_0808801C: .4byte gUnknown_2038700
thumb_func_end sub_8088000
thumb_func_start task00_for_dp12
task00_for_dp12: @ 8088020
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
lsls r0, 24
lsrs r0, 24
mov r12, r0
movs r6, 0
ldr r0, _08088048 @ =gUnknown_203961C
ldrb r0, [r0]
cmp r0, 0
beq _08088050
mov r0, r12
bl DestroyTask
ldr r1, _0808804C @ =gUnknown_2039600
movs r0, 0xFF
strb r0, [r1, 0x18]
b _080881D0
.align 2, 0
_08088048: .4byte gUnknown_203961C
_0808804C: .4byte gUnknown_2039600
_08088050:
ldr r1, _0808807C @ =gTasks
mov r0, r12
lsls r2, r0, 2
adds r0, r2, r0
lsls r0, 3
adds r3, r0, r1
movs r4, 0x16
ldrsh r0, [r3, r4]
mov r10, r1
mov r9, r2
cmp r0, 0
beq _080880FC
movs r1, 0x14
ldrsh r0, [r3, r1]
cmp r0, 0xE
bhi _080880FC
lsls r0, 2
ldr r1, _08088080 @ =_08088084
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0808807C: .4byte gTasks
_08088080: .4byte _08088084
.align 2, 0
_08088084:
.4byte _080880C0
.4byte _080880FC
.4byte _080880C8
.4byte _080880FC
.4byte _080880D0
.4byte _080880FC
.4byte _080880D8
.4byte _080880FC
.4byte _080880E0
.4byte _080880FC
.4byte _080880E8
.4byte _080880FC
.4byte _080880F0
.4byte _080880FC
.4byte _080880F8
_080880C0:
ldr r0, _080880C4 @ =gUnknown_2022974
b _080880FA
.align 2, 0
_080880C4: .4byte gUnknown_2022974
_080880C8:
ldr r0, _080880CC @ =gUnknown_2022976
b _080880FA
.align 2, 0
_080880CC: .4byte gUnknown_2022976
_080880D0:
ldr r0, _080880D4 @ =gUnknown_2022978
b _080880FA
.align 2, 0
_080880D4: .4byte gUnknown_2022978
_080880D8:
ldr r0, _080880DC @ =gUnknown_202297A
b _080880FA
.align 2, 0
_080880DC: .4byte gUnknown_202297A
_080880E0:
ldr r0, _080880E4 @ =gUnknown_202297C
b _080880FA
.align 2, 0
_080880E4: .4byte gUnknown_202297C
_080880E8:
ldr r0, _080880EC @ =gUnknown_202297E
b _080880FA
.align 2, 0
_080880EC: .4byte gUnknown_202297E
_080880F0:
ldr r0, _080880F4 @ =gUnknown_2022980
b _080880FA
.align 2, 0
_080880F4: .4byte gUnknown_2022980
_080880F8:
ldr r0, _0808815C @ =gUnknown_2022982
_080880FA:
ldrh r6, [r0]
_080880FC:
mov r0, r9
add r0, r12
lsls r0, 3
mov r2, r10
adds r1, r0, r2
ldrh r2, [r1, 0x10]
movs r3, 0x10
ldrsh r0, [r1, r3]
cmp r0, 0
beq _08088168
subs r0, r2, 0x1
strh r0, [r1, 0x10]
movs r4, 0xE
ldrsh r0, [r1, r4]
movs r3, 0xA0
lsls r3, 1
adds r2, r0, r3
movs r4, 0x8
ldrsh r3, [r1, r4]
movs r4, 0xA
ldrsh r0, [r1, r4]
cmp r3, r0
bge _080881D0
ldr r5, _08088160 @ =gUnknown_2038700
ldr r0, _08088164 @ =gUnknown_2039600
mov r8, r0
adds r7, r1, 0
lsls r0, r2, 1
adds r4, r0, r5
_08088136:
lsls r2, r3, 1
mov r0, r8
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
adds r2, r0
adds r2, r5
ldrh r0, [r4]
adds r0, r6
strh r0, [r2]
adds r4, 0x2
adds r3, 0x1
movs r1, 0xA
ldrsh r0, [r7, r1]
cmp r3, r0
blt _08088136
b _080881D0
.align 2, 0
_0808815C: .4byte gUnknown_2022982
_08088160: .4byte gUnknown_2038700
_08088164: .4byte gUnknown_2039600
_08088168:
ldrh r0, [r1, 0x12]
strh r0, [r1, 0x10]
movs r2, 0xE
ldrsh r0, [r1, r2]
movs r3, 0xA0
lsls r3, 1
adds r2, r0, r3
movs r4, 0x8
ldrsh r3, [r1, r4]
movs r4, 0xA
ldrsh r0, [r1, r4]
cmp r3, r0
bge _080881B0
ldr r5, _080881E0 @ =gUnknown_2038700
adds r7, r1, 0
lsls r0, r2, 1
adds r4, r0, r5
ldr r0, _080881E4 @ =gUnknown_2039600
mov r8, r0
_0808818E:
lsls r2, r3, 1
mov r0, r8
ldrb r1, [r0, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
adds r2, r0
adds r2, r5
ldrh r0, [r4]
adds r0, r6
strh r0, [r2]
adds r4, 0x2
adds r3, 0x1
movs r1, 0xA
ldrsh r0, [r7, r1]
cmp r3, r0
blt _0808818E
_080881B0:
mov r0, r9
add r0, r12
lsls r0, 3
mov r3, r10
adds r2, r0, r3
ldrh r0, [r2, 0xE]
adds r0, 0x1
strh r0, [r2, 0xE]
lsls r0, 16
asrs r0, 16
movs r4, 0xC
ldrsh r1, [r2, r4]
cmp r0, r1
bne _080881D0
movs r0, 0
strh r0, [r2, 0xE]
_080881D0:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080881E0: .4byte gUnknown_2038700
_080881E4: .4byte gUnknown_2039600
thumb_func_end task00_for_dp12
thumb_func_start sub_80881E8
sub_80881E8: @ 80881E8
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 24
lsrs r5, r1, 24
lsls r2, 24
lsrs r4, r2, 24
movs r1, 0
movs r2, 0
ldr r0, _0808822C @ =gUnknown_825E074
mov r12, r0
_080881FC:
lsls r0, r1, 1
adds r3, r0, r6
lsls r0, r2, 1
add r0, r12
movs r7, 0
ldrsh r0, [r0, r7]
muls r0, r4
cmp r0, 0
bge _08088210
adds r0, 0xFF
_08088210:
asrs r0, 8
strh r0, [r3]
adds r0, r2, r5
lsls r0, 24
lsrs r2, r0, 24
adds r0, r1, 0x1
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0xFF
bls _080881FC
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0808822C: .4byte gUnknown_825E074
thumb_func_end sub_80881E8
thumb_func_start sub_8088230
sub_8088230: @ 8088230
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x20
adds r5, r0, 0
str r1, [sp, 0x10]
ldr r0, [sp, 0x40]
mov r8, r0
ldr r1, [sp, 0x44]
mov r9, r1
ldr r0, [sp, 0x48]
mov r10, r0
lsls r5, 24
lsrs r5, 24
ldr r1, [sp, 0x10]
lsls r1, 24
str r1, [sp, 0x14]
lsrs r0, r1, 24
str r0, [sp, 0xC]
lsls r1, r2, 24
lsrs r1, 24
str r1, [sp, 0x18]
lsls r2, r3, 24
lsrs r2, 24
str r2, [sp, 0x1C]
mov r1, r8
lsls r1, 24
lsrs r1, 24
mov r8, r1
mov r3, r9
lsls r3, 24
lsrs r3, 24
mov r9, r3
mov r0, r10
lsls r0, 24
lsrs r0, 24
mov r10, r0
bl dp12_8087EA4
ldr r0, _0808833C @ =0x04000010
add r0, r9
str r0, [sp]
ldr r0, _08088340 @ =0xa2600001
str r0, [sp, 0x4]
mov r1, sp
movs r0, 0x1
strb r0, [r1, 0x8]
mov r0, sp
movs r1, 0
strb r1, [r0, 0x9]
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl sub_8087EE4
ldr r0, _08088344 @ =task00_for_dp12
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08088348 @ =gTasks
lsls r4, r7, 2
adds r4, r7
lsls r4, 3
adds r4, r0
strh r5, [r4, 0x8]
mov r3, sp
ldrh r3, [r3, 0xC]
strh r3, [r4, 0xA]
movs r0, 0x80
lsls r0, 1
ldr r1, [sp, 0x18]
bl __divsi3
strh r0, [r4, 0xC]
movs r0, 0
strh r0, [r4, 0xE]
mov r1, r8
strh r1, [r4, 0x10]
strh r1, [r4, 0x12]
mov r3, r9
strh r3, [r4, 0x14]
mov r0, r10
strh r0, [r4, 0x16]
ldr r0, _0808834C @ =gUnknown_2039600
strb r7, [r0, 0x18]
ldr r0, _08088350 @ =gUnknown_203961C
movs r1, 0
strb r1, [r0]
ldr r4, _08088354 @ =gUnknown_2038980
ldr r3, [sp, 0xC]
subs r6, r3, r5
lsls r3, r6, 24
lsrs r3, 24
adds r0, r4, 0
ldr r1, [sp, 0x18]
ldr r2, [sp, 0x1C]
bl sub_80881E8
ldr r0, [sp, 0xC]
cmp r5, r0
bge _0808832A
ldr r1, _08088358 @ =0xfffffd80
adds r2, r4, r1
lsls r1, r5, 1
movs r3, 0xF0
lsls r3, 3
adds r0, r1, r3
adds r3, r0, r2
adds r1, r2
adds r2, r4, 0
adds r5, r6, 0
_08088316:
ldrh r0, [r2]
strh r0, [r1]
ldrh r0, [r2]
strh r0, [r3]
adds r2, 0x2
adds r3, 0x2
adds r1, 0x2
subs r5, 0x1
cmp r5, 0
bne _08088316
_0808832A:
adds r0, r7, 0
add sp, 0x20
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_0808833C: .4byte 0x04000010
_08088340: .4byte 0xa2600001
_08088344: .4byte task00_for_dp12
_08088348: .4byte gTasks
_0808834C: .4byte gUnknown_2039600
_08088350: .4byte gUnknown_203961C
_08088354: .4byte gUnknown_2038980
_08088358: .4byte 0xfffffd80
thumb_func_end sub_8088230
.align 2, 0 @ Don't pad with nop.
asm/wild_encounter.s
+4 -4
View File
@@ -482,7 +482,7 @@ _08082A8E:
lsrs r0, 16
orrs r4, r0
adds r0, r4, 0
bl sub_8082AB8
bl GetUnownLetterByPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, r5
@@ -493,8 +493,8 @@ _08082A8E:
bx r1
thumb_func_end sub_8082A88
thumb_func_start sub_8082AB8
sub_8082AB8: @ 8082AB8
thumb_func_start GetUnownLetterByPersonality
GetUnownLetterByPersonality: @ 8082AB8
push {lr}
adds r2, r0, 0
movs r0, 0xC0
@@ -520,7 +520,7 @@ sub_8082AB8: @ 8082AB8
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_8082AB8
thumb_func_end GetUnownLetterByPersonality
thumb_func_start sub_8082AEC
sub_8082AEC: @ 8082AEC
asm/wireless_communication_status_screen.s
+1 -1
View File
@@ -92,7 +92,7 @@ sub_814F1E4: @ 814F1E4
bl ResetPaletteFade
bl ResetSpriteData
bl ResetTasks
bl remove_some_task
bl ScanlineEffect_Stop
bl m4aSoundVSyncOn
ldr r0, _0814F31C @ =sub_814F1C0
bl SetVBlankCallback
data/data.s
+1 -1
View File
@@ -547,7 +547,7 @@ gUnknown_825E032:: @ 825E032
gUnknown_825E05C:: @ 825E05C
.incbin "baserom.gba", 0x25E05C, 0x18
gUnknown_825E074:: @ 825E074
gSineTable:: @ 825E074
.incbin "baserom.gba", 0x25E074, 0x280
gUnknown_825E2F4:: @ 825E2F4
data/data_835B488.s
+11 -2
View File
@@ -738,13 +738,22 @@ sFanfares:: @ 83AC990
.incbin "baserom.gba", 0x3AC990, 0x40
gUnknown_83AC9D0:: @ 83AC9D0
.incbin "baserom.gba", 0x3AC9D0, 0x28
.incbin "baserom.gba", 0x3AC9D0, 0x8
gUnknown_83AC9D8::
.incbin "baserom.gba", 0x3AC9D8, 0x10
gUnknown_83AC9E8::
.incbin "baserom.gba", 0x3AC9E8, 0x10
gUnknown_83AC9F8::
.incbin "baserom.gba", 0x3AC9F8, 0x8
gUnknown_83ACA00::
.incbin "baserom.gba", 0x3ACA00, 0x208
.incbin "baserom.gba", 0x3ACA00, 0xF8
gUnknown_83ACAF8::
.incbin "baserom.gba", 0x3ACAF8, 0x110
gUnknown_83ACC08:: @ 83ACC08
.incbin "baserom.gba", 0x3ACC08, 0x440
data/data_83FECCC.s
+10 -3
View File
@@ -587,14 +587,21 @@ gUnknown_8415CE8:: @ 8415CE8
.incbin "baserom.gba", 0x415CE8, 0x44
gUnknown_8415D2C:: @ 8415D2C
.incbin "baserom.gba", 0x415D2C, 0x1C
.string "CONTROLS$"
.align 2
gUnknown_8415D38:: @ 8415D2C
.string "{KEYGFX_DPAD_UP_DOWN}えらぶ {KEYGFX_A_BUTTON}けってい$"
.align 2
gUnknown_8415D48:: @ 8415D48
.incbin "baserom.gba", 0x415D48, 0x8
.string "{KEYGFX_A_BUTTON}NEXT$"
.align 2
gUnknown_8415D50:: @ 8415D50
.incbin "baserom.gba", 0x415D50, 0x10
.string "{KEYGFX_A_BUTTON}NEXT {KEYGFX_B_BUTTON}BACK$"
.align 2
gUnknown_8415D60:: @ 8415D60
.incbin "baserom.gba", 0x415D60, 0x18
data/data_845FD54.s
+4 -106
View File
@@ -1,112 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
// oak_speech
gUnknown_845FD54:: @ 845FD54
.incbin "baserom.gba", 0x45FD54, 0x814
gUnknown_8460568:: @ 8460568
.incbin "baserom.gba", 0x460568, 0x80
gUnknown_84605E8:: @ 84605E8
.incbin "baserom.gba", 0x4605E8, 0x5C0
gUnknown_8460BA8:: @ 8460BA8
.incbin "baserom.gba", 0x460BA8, 0xFC
gUnknown_8460CA4:: @ 8460CA4
.incbin "baserom.gba", 0x460CA4, 0x44
gUnknown_8460CE8:: @ 8460CE8
.incbin "baserom.gba", 0x460CE8, 0xAC
gUnknown_8460D94:: @ 8460D94
.incbin "baserom.gba", 0x460D94, 0xA0
gUnknown_8460E34:: @ 8460E34
.incbin "baserom.gba", 0x460E34, 0xA0
gUnknown_8460ED4:: @ 8460ED4
.incbin "baserom.gba", 0x460ED4, 0x40
gUnknown_8460F14:: @ 8460F14
.incbin "baserom.gba", 0x460F14, 0x6E8
gUnknown_84615FC:: @ 84615FC
.incbin "baserom.gba", 0x4615FC, 0x40
gUnknown_846163C:: @ 846163C
.incbin "baserom.gba", 0x46163C, 0x698
gUnknown_8461CD4:: @ 8461CD4
.incbin "baserom.gba", 0x461CD4, 0x40
gUnknown_8461D14:: @ 8461D14
.incbin "baserom.gba", 0x461D14, 0x698
gUnknown_84623AC:: @ 84623AC
.incbin "baserom.gba", 0x4623AC, 0x40
gUnknown_84623EC:: @ 84623EC
.incbin "baserom.gba", 0x4623EC, 0xA6C
gUnknown_8462E58:: @ 8462E58
.incbin "baserom.gba", 0x462E58, 0x5C
gUnknown_8462EB4:: @ 8462EB4
.incbin "baserom.gba", 0x462EB4, 0xC
gUnknown_8462EC0:: @ 8462EC0
.incbin "baserom.gba", 0x462EC0, 0x8
gUnknown_8462EC8:: @ 8462EC8
.incbin "baserom.gba", 0x462EC8, 0x8
gUnknown_8462ED0:: @ 8462ED0
.incbin "baserom.gba", 0x462ED0, 0x8
gUnknown_8462ED8:: @ 8462ED8
.incbin "baserom.gba", 0x462ED8, 0x10
gUnknown_8462EE8:: @ 8462EE8
.incbin "baserom.gba", 0x462EE8, 0x4
gUnknown_8462EEC:: @ 8462EEC
.incbin "baserom.gba", 0x462EEC, 0x4
gUnknown_8462EF0:: @ 8462EF0
.incbin "baserom.gba", 0x462EF0, 0xC
gUnknown_8462EFC:: @ 8462EFC
.incbin "baserom.gba", 0x462EFC, 0x18
gUnknown_8462F14:: @ 8462F14
.incbin "baserom.gba", 0x462F14, 0x8
gUnknown_8462F1C:: @ 8462F1C
.incbin "baserom.gba", 0x462F1C, 0x8
gUnknown_8462F24:: @ 8462F24
.incbin "baserom.gba", 0x462F24, 0x2C
gUnknown_8462F50:: @ 8462F50
.incbin "baserom.gba", 0x462F50, 0xDC
gUnknown_846302C:: @ 846302C
.incbin "baserom.gba", 0x46302C, 0x48
gUnknown_8463074:: @ 8463074
.incbin "baserom.gba", 0x463074, 0x18
gUnknown_846308C:: @ 846308C
.incbin "baserom.gba", 0x46308C, 0x4C
gUnknown_84630D8:: @ 84630D8
.incbin "baserom.gba", 0x4630D8, 0x4C
gUnknown_8463124:: @ 8463124
.incbin "baserom.gba", 0x463124, 0x10
@ tm_case
gUnknown_8463134:: @ 8463134
.incbin "baserom.gba", 0x463134, 0xC
data/event_scripts.s
+205 -15
View File
@@ -429,49 +429,239 @@ gUnknown_81C566A:: @ 81C566A
.incbin "baserom.gba", 0x1C566A, 0xE5
gUnknown_81C574F:: @ 81C574F
.incbin "baserom.gba", 0x1C574F, 0xDE
.string "NEW NAME$"
gUnknown_81C5758:: @ 81C5758
.string "GREEN$"
gUnknown_81C575E:: @ 81C575E
.string "RED$"
gUnknown_81C5762:: @ 81C5762
.string "LEAF$"
gUnknown_81C5767:: @ 81C5767
.string "FIRE$"
gUnknown_81C576C:: @ 81C576C
.string "GARY$"
gUnknown_81C5771:: @ 81C5771
.string "KAZ$"
gUnknown_81C5775:: @ 81C5775
.string "TORU$"
gUnknown_81C577A:: @ 81C577A
.string "ASH$"
gUnknown_81C577E:: @ 81C577E
.string "KENE$"
gUnknown_81C5783:: @ 81C5783
.string "GEKI$"
gUnknown_81C5788:: @ 81C5788
.string "JAK$"
gUnknown_81C578C:: @ 81C578C
.string "JANNE$"
gUnknown_81C5792:: @ 81C5792
.string "JONN$"
gUnknown_81C5797:: @ 81C5797
.string "KAMON$"
gUnknown_81C579D:: @ 81C579D
.string "KARL$"
gUnknown_81C57A2:: @ 81C57A2
.string "TAYLOR$"
gUnknown_81C57A9:: @ 81C57A9
.string "OSCAR$"
gUnknown_81C57AF:: @ 81C57AF
.string "HIRO$"
gUnknown_81C57B4:: @ 81C57B4
.string "MAX$"
gUnknown_81C57B8:: @ 81C57B8
.string "JON$"
gUnknown_81C57BC:: @ 81C57BC
.string "RALPH$"
gUnknown_81C57C2:: @ 81C57C2
.string "KAY$"
gUnknown_81C57C6:: @ 81C57C6
.string "TOSH$"
gUnknown_81C57CB:: @ 81C57CB
.string "ROAK$"
gUnknown_81C57D0:: @ 81C57D0
.string "OMI$"
gUnknown_81C57D4:: @ 81C57D4
.string "JODI$"
gUnknown_81C57D9:: @ 81C57D9
.string "AMANDA$"
gUnknown_81C57E0:: @ 81C57E0
.string "HILLARY$"
gUnknown_81C57E8:: @ 81C57E8
.string "MAKEY$"
gUnknown_81C57EE:: @ 81C57EE
.string "MICHI$"
gUnknown_81C57F4:: @ 81C57F4
.string "PAULA$"
gUnknown_81C57FA:: @ 81C57FA
.string "JUNE$"
gUnknown_81C57FF:: @ 81C57FF
.string "CASSIE$"
gUnknown_81C5806:: @ 81C5806
.string "REY$"
gUnknown_81C580A:: @ 81C580A
.string "SEDA$"
gUnknown_81C580F:: @ 81C580F
.string "KIKO$"
gUnknown_81C5814:: @ 81C5814
.string "MINA$"
gUnknown_81C5819:: @ 81C5819
.string "NORIE$"
gUnknown_81C581F:: @ 81C581F
.string "SAI$"
gUnknown_81C5823:: @ 81C5823
.string "MOMO$"
gUnknown_81C5828:: @ 81C5828
.string "SUZI$"
gUnknown_81C582D:: @ 81C582D
.incbin "baserom.gba", 0x1C582D, 0x1A8
.string "The various buttons will be explained in\n"
.string "the order of their importance.$"
gUnknown_81C5875:: @ 81C5875
.string "Moves the main character.\n"
.string "Also used to choose various data\n"
.string "headings.$"
gUnknown_81C58BA:: @ 81C58BA
.string "Used to confirm a choice, check\n"
.string "things, chat, and scroll text.$"
gUnknown_81C58F9:: @ 81C58F9
.string "Used to exit, cancel a choice,\n"
.string "and cancel a mode.$"
gUnknown_81C592B:: @ 81C592B
.string "Press this button to open the\n"
.string "MENU.$"
gUnknown_81C594F:: @ 81C594F
.string "Used to shift items and to use\n"
.string "a registered item.$"
gUnknown_81C5981:: @ 81C5981
.string "If you need help playing the\n"
.string "game, or on how to do things,\n"
.string "press the L or R Button.$"
gUnknown_81C59D5:: @ 81C59D5
.incbin "baserom.gba", 0x1C59D5, 0x2A3
.string "Now tell me. Are you a boy?\n"
.string "Or are you a girl?$"
gUnknown_81C5A04::
.string "In the world which you are about to\n"
.string "enter, you will embark on a grand\n"
.string "adventure with you as the hero.\n"
.string "\n"
.string "Speak to people and check things\n"
.string "wherever you go, be it towns, roads,\n"
.string "or caves. Gather information and\n"
.string "hints from every source.$"
gUnknown_81C5AEB::
.string "New paths will open to you by helping\n"
.string "people in need, overcoming challenges,\n"
.string "and solving mysteries.\n"
.string "\n"
.string "At times, you will be challenged by\n"
.string "others and attacked by wild creatures.\n"
.string "Be brave and keep pushing on.$"
gUnknown_81C5BB9::
.string "Through your adventure, we hope\n"
.string "that you will interact with all sorts\n"
.string "of people and achieve personal growth.\n"
.string "That is our biggest objective.\n"
.string "\n"
.string "Press the A Button, and let your\n"
.string "adventure begin!$"
gUnknown_81C5C78:: @ 81C5C78
.incbin "baserom.gba", 0x1C5C78, 0x8E
.string "Hello, there!\n"
.string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n"
.string "as the POKéMON PROFESSOR.\p$"
gUnknown_81C5D06:: @ 81C5D06
.incbin "baserom.gba", 0x1C5D06, 0xC
.string "This world…$"
gUnknown_81C5D12:: @ 81C5D12
.incbin "baserom.gba", 0x1C5D12, 0x39
.string "…is inhabited far and wide by\n"
.string "creatures called POKéMON.\p$"
gUnknown_81C5D4B:: @ 81C5D4B
.incbin "baserom.gba", 0x1C5D4B, 0x72
.string "For some people, POKéMON are pets.\n"
.string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$"
gUnknown_81C5DBD:: @ 81C5DBD
.incbin "baserom.gba", 0x1C5DBD, 0x2D
.string "But first, tell me a little about\n"
.string "yourself.\p$"
gUnknown_81C5DEA:: @ 81C5DEA
.incbin "baserom.gba", 0x1C5DEA, 0x29
.string "Let’s begin with your name.\n"
.string "What is it?\p$"
gUnknown_81C5E13:: @ 81C5E13
.incbin "baserom.gba", 0x1C5E13, 0x1B
.string "Right…\n"
.string "So your name is {PLAYER}.$"
gUnknown_81C5E2E:: @ 81C5E2E
.incbin "baserom.gba", 0x1C5E2E, 0x63
.string "This is my grandson.\pHe’s been your rival since you both\n"
.string "were babies.\p…Erm, what was his name now?$"
gUnknown_81C5E91:: @ 81C5E91
.incbin "baserom.gba", 0x1C5E91, 0x24
.string "Your rival’s name, what was it now?$"
gUnknown_81C5EB5:: @ 81C5EB5
.incbin "baserom.gba", 0x1C5EB5, 0x10
.string "…Er, was it {RIVAL}?$"
gUnknown_81C5EC5:: @ 81C5EC5
.incbin "baserom.gba", 0x1C5EC5, 0x2F
.string "That’s right! I remember now!\n"
.string "His name is {RIVAL}!\p$"
gUnknown_81C5EF4:: @ 81C5EF4
.incbin "baserom.gba", 0x1C5EF4, 0x75
.string "{PLAYER}!\pYour very own POKéMON legend is\n"
.string "about to unfold!\pA world of dreams and adventures\n"
.string "with POKéMON awaits! Let’s go!$"
@ pokedude data
.incbin "baserom.gba", 0x1C5F69, 0x983
data/oak_speech/unk_8460568.pal
+67
View File
@@ -0,0 +1,67 @@
JASC-PAL
0100
64
16 115 230
65 139 131
82 148 139
106 164 156
131 180 172
156 197 189
180 213 205
205 230 222
230 246 238
255 0 255
255 0 255
0 90 16
255 0 0
49 82 205
255 255 255
32 32 32
16 115 230
255 255 164
255 255 106
222 222 90
189 189 74
156 156 57
156 156 57
123 123 49
90 90 32
57 57 16
255 0 0
255 0 0
255 0 0
255 0 0
255 0 0
0 0 0
238 230 172
115 180 197
156 213 238
205 238 246
246 255 255
230 246 246
106 106 106
74 82 106
82 98 180
230 246 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 74 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 0 255
123 123 123
172 172 156
197 197 197
222 222 222
238 238 238
255 255 255
data/oak_speech/unk_84605E8.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

data/oak_speech/unk_8460BA8.bin
+2
View File
@@ -0,0 +1,2 @@
^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^                                ` `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` `   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (`   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` `   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` `   ` ` a b c d e f   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (p q r s t u v   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` g h i j k l m   ` ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (w x y z { | }   ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` ` n o ‚ ƒ „ … †   ` ~  ’ “ ” • –  
data/oak_speech/unk_8460CA4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 110 B

data/oak_speech/unk_8460CE8.bin
BIN
View File
Binary file not shown.
data/oak_speech/unk_8460ED4.pal
+35
View File
@@ -0,0 +1,35 @@
JASC-PAL
0100
32
115 197 164
255 238 205
246 205 180
213 164 148
172 131 106
106 74 65
205 164 139
164 123 98
115 74 49
74 41 16
222 222 222
180 180 180
131 131 131
82 82 90
41 41 49
255 255 255
0 0 0
131 189 213
106 156 180
82 131 156
49 90 115
32 65 90
0 0 255
255 255 189
222 222 82
172 172 57
98 98 0
213 131 123
189 106 98
164 82 74
139 57 49
98 24 16
data/oak_speech/unk_84615FC.pal
+35
View File
@@ -0,0 +1,35 @@
JASC-PAL
0100
32
115 197 164
255 230 205
222 189 156
197 148 131
148 106 90
106 74 65
205 164 139
164 123 98
115 74 49
82 65 32
222 222 222
180 180 180
131 131 131
82 82 90
57 57 65
255 255 255
0 0 0
131 189 213
106 156 180
82 131 156
49 90 115
32 65 90
0 0 255
238 238 74
205 205 49
164 164 32
98 98 0
213 131 123
189 106 98
164 82 74
139 57 49
98 24 16
data/oak_speech/unk_8461CD4.pal
+35
View File
@@ -0,0 +1,35 @@
JASC-PAL
0100
32
115 197 164
255 230 205
222 189 156
197 148 115
106 74 65
238 222 148
205 189 115
172 156 90
139 123 65
98 90 49
255 0 255
205 205 222
123 131 156
57 74 106
255 255 255
0 0 0
0 0 255
172 148 222
131 115 172
82 65 115
230 222 180
205 197 156
180 172 139
164 156 123
123 115 90
82 57 49
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
data/oak_speech/unk_84623AC.pal
+35
View File
@@ -0,0 +1,35 @@
JASC-PAL
0100
32
115 197 164
255 230 205
222 189 156
197 148 115
106 74 65
238 189 74
213 156 57
189 123 41
139 82 41
164 123 106
222 222 222
197 197 197
139 139 139
98 98 98
65 65 65
255 255 255
0 0 0
180 148 180
139 106 139
106 74 106
82 49 82
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
246 131 131
205 82 82
data/oak_speech/unk_84629D0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
189 189 164
65 139 131
82 148 139
106 164 156
131 180 172
156 197 189
180 213 205
205 230 222
230 246 238
0 0 0
255 0 255
139 189 164
156 205 172
180 222 197
205 238 222
115 172 156
data/oak_speech/unk_84629F0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
205 205 180
255 255 255
255 246 106
246 213 0
238 172 0
197 139 0
131 82 0
255 0 255
255 0 255
180 180 180
255 74 74
230 0 0
180 0 0
106 106 106
16 16 16
255 0 255
data/oak_speech/unk_8462A10.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 271 B

data/oak_speech/unk_8462B74.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 350 B

data/oak_speech/unk_8462D34.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

data/oak_speech/unk_8462E18.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 B

include/constants/species.h
+3
View File
@@ -445,6 +445,9 @@
#define SPECIES_UNOWN_EMARK 438
#define SPECIES_UNOWN_QMARK 439
#define SPECIES_OLD_UNOWN_EMARK 412
#define SPECIES_OLD_UNOWN_QMARK 413
#define NUM_SPECIES SPECIES_EGG
#endif // GUARD_CONSTANTS_SPECIES_H
include/decompress.h
+2
View File
@@ -18,6 +18,8 @@ void LoadCompressedObjectPalette(const struct CompressedSpritePalette *src);
void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer);
bool8 LoadCompressedObjectPaletteUsingHeap(const struct CompressedSpritePalette *src);
bool8 sub_800F078(const struct CompressedSpritePalette *src);
void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
include/event_scripts.h
+67
View File
@@ -705,4 +705,71 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
extern const u8 gUnknown_81C574F[];
extern const u8 gUnknown_81C5758[];
extern const u8 gUnknown_81C575E[];
extern const u8 gUnknown_81C575E[];
extern const u8 gUnknown_81C5767[];
extern const u8 gUnknown_81C5767[];
extern const u8 gUnknown_81C576C[];
extern const u8 gUnknown_81C5771[];
extern const u8 gUnknown_81C5775[];
extern const u8 gUnknown_81C577A[];
extern const u8 gUnknown_81C577E[];
extern const u8 gUnknown_81C5783[];
extern const u8 gUnknown_81C5788[];
extern const u8 gUnknown_81C578C[];
extern const u8 gUnknown_81C5792[];
extern const u8 gUnknown_81C5797[];
extern const u8 gUnknown_81C579D[];
extern const u8 gUnknown_81C57A2[];
extern const u8 gUnknown_81C57A9[];
extern const u8 gUnknown_81C57AF[];
extern const u8 gUnknown_81C57B4[];
extern const u8 gUnknown_81C57B8[];
extern const u8 gUnknown_81C57BC[];
extern const u8 gUnknown_81C57C2[];
extern const u8 gUnknown_81C57C6[];
extern const u8 gUnknown_81C57CB[];
extern const u8 gUnknown_81C57D0[];
extern const u8 gUnknown_81C57D4[];
extern const u8 gUnknown_81C57D9[];
extern const u8 gUnknown_81C57E0[];
extern const u8 gUnknown_81C57E8[];
extern const u8 gUnknown_81C57EE[];
extern const u8 gUnknown_81C57F4[];
extern const u8 gUnknown_81C57FA[];
extern const u8 gUnknown_81C57FF[];
extern const u8 gUnknown_81C5806[];
extern const u8 gUnknown_81C580A[];
extern const u8 gUnknown_81C580F[];
extern const u8 gUnknown_81C5814[];
extern const u8 gUnknown_81C5819[];
extern const u8 gUnknown_81C581F[];
extern const u8 gUnknown_81C5823[];
extern const u8 gUnknown_81C5828[];
extern const u8 gUnknown_81C582D[];
extern const u8 gUnknown_81C5875[];
extern const u8 gUnknown_81C58BA[];
extern const u8 gUnknown_81C58F9[];
extern const u8 gUnknown_81C592B[];
extern const u8 gUnknown_81C594F[];
extern const u8 gUnknown_81C5981[];
extern const u8 gUnknown_81C59D5[];
extern const u8 gUnknown_81C5A04[];
extern const u8 gUnknown_81C5AEB[];
extern const u8 gUnknown_81C5BB9[];
extern const u8 gUnknown_81C5C78[];
extern const u8 gUnknown_81C5D06[];
extern const u8 gUnknown_81C5D12[];
extern const u8 gUnknown_81C5D4B[];
extern const u8 gUnknown_81C5DBD[];
extern const u8 gUnknown_81C5DEA[];
extern const u8 gUnknown_81C5E13[];
extern const u8 gUnknown_81C5E2E[];
extern const u8 gUnknown_81C5E91[];
extern const u8 gUnknown_81C5EB5[];
extern const u8 gUnknown_81C5EC5[];
extern const u8 gUnknown_81C5EF4[];
#endif //GUARD_EVENT_SCRIPTS_H
include/help_system.h
+1
View File
@@ -6,5 +6,6 @@
extern bool8 gUnknown_3005ECC;
void sub_812B484(void);
void sub_812B1F0(u8);
#endif //GUARD_HELP_SYSTEM_H
include/math_util.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_MATH_UTIL_H
#define GUARD_MATH_UTIL_H
s16 sub_80D8B90(s16 y);
#endif //GUARD_MATH_UTIL_H
include/menu.h
+7
View File
@@ -38,5 +38,12 @@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSp
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_810F4D8(u8 windowId, bool32 someBool);
void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void sub_810F558(u8, u8, u8, u8, u16);
void sub_810F650(const u8 *, const u8 *, u8, u32, u8);
void sub_810F5E8(const u8 *, u32, u8);
void sub_810F71C(void);
void sub_810F740(void);
void sub_810F7D8(u8, u8, u8, u8, u8, u8, u8);
void sub_810FF60(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8);
#endif // GUARD_MENU_H
include/new_menu_helpers.h
+5
View File
@@ -24,5 +24,10 @@ u8 GetStartMenuWindowId(void);
void sub_80F7998(void);
void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void sub_80F6F1C(u8 windowId, bool8 copyNow);
void sub_80F6C6C(void);
void sub_80F6C98(void);
void sub_80F77CC(u16);
void * malloc_and_decompress(const void * src, u32 * size);
u16 sub_80F796C(void);
#endif // GUARD_NEW_MENU_HELPERS_H
include/overworld.h
+1
View File
@@ -99,5 +99,6 @@ extern u8 gUnknown_2036E28;
extern bool8 (* gUnknown_3005024)(void);
void SetLastHealLocationWarp(u8 healLocaionId);
void sub_8055864(u8 mapGroup, u8 mapNum);
void CB2_NewGame(void);
#endif //GUARD_ROM4_H
include/pokeball.h
+2 -1
View File
@@ -24,7 +24,8 @@ enum
#define POKEBALL_OPPONENT_SENDOUT 0xFE
u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow);
void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species);
void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
u8 sub_804BB98(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h);
void sub_8076918(u8 bank);
void DoHitAnimHealthboxEffect(u8 bank);
include/pokemon.h
+1
View File
@@ -673,5 +673,6 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
void PlayMapChosenOrBattleBGM(u16 songId);
u8 GetMonsStateToDoubles(void);
void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src);
void sub_803F7D4(u16 trainerSpriteId, u8 battlerPosition);
#endif // GUARD_POKEMON_H
include/pokemon_3.h
+3
View File
@@ -5,5 +5,8 @@
const u8* GetTrainerClassNameFromId(u16 trainerId);
const u8* GetTrainerNameFromId(u16 trainerId);
void sub_8044AF0(u8, u8);
void sub_8044D80(void);
void * sub_8044E00(u8 buffId);
#endif // GUARD_POKEMON_3_H
include/scanline_effect.h
+44 -2
View File
@@ -1,6 +1,48 @@
#ifndef GUARD_SCANLINE_EFFECT_H
#define GUARD_SCANLINE_EFFECT_H
void remove_some_task(void);
// DMA control value to transfer a single 16-bit value at HBlank
#define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1)
#define SCANLINE_EFFECT_DMACNT_32BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_32BIT | DMA_DEST_RELOAD) << 16) | 1)
#endif //GUARD_SCANLINE_EFFECT_H
#define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG0VOFS (REG_ADDR_BG0VOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG1HOFS (REG_ADDR_BG1HOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG1VOFS (REG_ADDR_BG1VOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG2HOFS (REG_ADDR_BG2HOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG2VOFS (REG_ADDR_BG2VOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG3HOFS (REG_ADDR_BG3HOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG3VOFS (REG_ADDR_BG3VOFS - REG_ADDR_BG0HOFS)
struct ScanlineEffectParams
{
volatile void *dmaDest;
u32 dmaControl;
u8 initState;
u8 unused9;
};
struct ScanlineEffect
{
void *dmaSrcBuffers[2];
volatile void *dmaDest;
u32 dmaControl;
void (*setFirstScanlineReg)(void);
u8 srcBuffer;
u8 state;
u8 unused16;
u8 unused17;
u8 waveTaskId;
};
extern struct ScanlineEffect gScanlineEffect;
extern u16 gScanlineEffectRegBuffers[2][0x3C0];
void ScanlineEffect_Stop(void);
void ScanlineEffect_Clear(void);
void ScanlineEffect_SetParams(struct ScanlineEffectParams);
void ScanlineEffect_InitHBlankDmaTransfer(void);
u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 a7);
#endif // GUARD_SCANLINE_EFFECT_H
include/text.h
+2
View File
@@ -250,5 +250,7 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
void sub_80062B0(struct Sprite *sprite);
u8 sub_8006300(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority);
void sub_8006398(u8 spriteId);
#endif // GUARD_TEXT_H
include/unknown_task.h
-24
View File
@@ -1,24 +0,0 @@
#ifndef GUARD_unknown_task_H
#define GUARD_unknown_task_H
#include "global.h"
// Exported type declarations
struct UnknownTaskStruct
{
volatile void *dest;
u32 control;
u8 unk8;
u8 unk9;
};
extern struct UnknownTaskStruct gUnknown_0831AC70;
// Exported RAM declarations
// Exported ROM declarations
void remove_some_task(void);
void sub_80BA038(struct UnknownTaskStruct arg0);
void sub_80BA0A8(void);
#endif // GUARD_unknown_task_H
include/wild_encounter.h
+1
View File
@@ -43,5 +43,6 @@ u16 GetLocalWildMon(bool8 *isWaterMon);
u16 GetLocalWaterMon(void);
bool8 UpdateRepelCounter(void);
void sub_8082740(u8);
u8 GetUnownLetterByPersonality(u32 personality);
#endif // GUARD_WILD_ENCOUNTER_H
ld_script.txt
+3 -2
View File
@@ -128,7 +128,7 @@ SECTIONS {
asm/trainer_see.o(.text);
asm/wild_encounter.o(.text);
asm/field_effect.o(.text);
asm/unknown_task.o(.text);
src/scanline_effect.o(.text);
asm/option_menu.o(.text);
asm/pokedex.o(.text);
asm/trainer_card.o(.text);
@@ -228,7 +228,7 @@ SECTIONS {
src/quest_log_battle.o(.text);
src/fame_checker.o(.text);
asm/menu2.o(.text);
asm/oak_speech.o(.text);
src/oak_speech.o(.text);
asm/tm_case.o(.text);
asm/menu_indicators.o(.text);
asm/pokedex_area_markers.o(.text);
@@ -382,6 +382,7 @@ SECTIONS {
src/quest_log.o(.rodata);
data/data_83FECCC.o(.rodata.8456C74);
src/fame_checker.o(.rodata);
src/oak_speech.o(.rodata);
data/data_845FD54.o(.rodata);
src/mevent.o(.rodata);
src/mevent_server_helpers.o(.rodata);
src/fame_checker.c
+1 -1
View File
@@ -1009,7 +1009,7 @@ static void FCSetup_ClearVideoRegisters(void)
static void FCSetup_ResetTasksAndSpriteResources(void)
{
remove_some_task();
ScanlineEffect_Stop();
ResetTasks();
ResetSpriteData();
dp13_810BB8C();
src/main.c
+2 -2
View File
@@ -29,7 +29,7 @@ extern void MapMusicMain(void);
extern void EnableInterrupts(u16);
extern void sub_800DD28(void);
extern u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
extern void remove_some_task(void);
extern void ScanlineEffect_Stop(void);
extern void sub_80F50F4(void);
extern bool32 sub_80F5118(void);
extern bool8 sub_813B870(void);
@@ -441,7 +441,7 @@ void DoSoftReset(void)
{
REG_IME = 0;
m4aSoundVSyncOff();
remove_some_task();
ScanlineEffect_Stop();
DmaStop(1);
DmaStop(2);
DmaStop(3);

Some files were not shown because too many files have changed in this diff Show More