Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-27 21:04:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

FreeAllSpriteTiles() to ClearSpriteTileRanges()

Browse Source
This commit is contained in:
YamaArashi
2016-05-21 15:15:29 -07:00
parent c0203de808
commit 5cbdc23e7e
10 changed files with 108 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asm/rom1.s
View File

@@ -78,8 +78,8 @@ sub_8002A1C: @ 8002A1C
_08002A30: .4byte gUnknown_081E66B2
thumb_func_end sub_8002A1C
thumb_func_start ShowBg
ShowBg: @ 8002A34
thumb_func_start sub_8002A34
sub_8002A34: @ 8002A34
push {r4,lr}
adds r4, r0, 0
bl SyncBgVisibilityAndMode
@@ -90,7 +90,7 @@ ShowBg: @ 8002A34
pop {r4}
pop {r0}
bx r0
thumb_func_end ShowBg
thumb_func_end sub_8002A34
thumb_func_start sub_8002A50
sub_8002A50: @ 8002A50

4
asm/rom2.s
View File

@@ -164,7 +164,7 @@ sub_80071A4: @ 80071A4
bl SetVBlankCallback
ldr r4, _0800724C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8007CEC
@@ -2849,7 +2849,7 @@ sub_80085BC: @ 80085BC
bl SetVBlankCallback
ldr r4, _0800863C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8071EF4

28
asm/rom3.s
View File

@@ -112,7 +112,7 @@ sub_8009708: @ 8009708
bl ResetSpriteData
bl FreeAllSpritePalettes
ldr r0, _080097D4
bl ShowBg
bl sub_8002A34
ldr r0, _080097D8
bl sub_8071C4C
cmp r4, 0
@@ -1398,7 +1398,7 @@ task_new_game_prof_birch_speech_1: @ 800A1F4
lsls r4, 24
lsrs r4, 24
ldr r0, _0800A2B0
bl ShowBg
bl sub_8002A34
ldr r0, _0800A2B4
bl sub_8071C4C
ldr r0, _0800A2B8
@@ -3312,7 +3312,7 @@ new_game_prof_birch_speech_part2_start: @ 800B060
adds r0, r5, 0
bl AddBirchSpeechObjects
ldr r0, _0800B168
bl ShowBg
bl sub_8002A34
ldr r0, _0800B16C
bl sub_8071C4C
ldr r0, _0800B170
@@ -10383,7 +10383,7 @@ _0800E868:
bl sub_80895F8
ldr r4, _0800E92C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
bl sub_8073B94
ldr r0, _0800E930
movs r1, 0
@@ -13369,7 +13369,7 @@ _08010084:
cmp r1, 0x9F
ble _08010084
adds r0, r5, 0
bl ShowBg
bl sub_8002A34
bl sub_8073B94
ldr r0, _08010164
movs r4, 0
@@ -114380,7 +114380,7 @@ _08042D8C: .4byte 0x0202e8ce
_08042D90:
ldr r5, _08042DBC
adds r0, r5, 0
bl ShowBg
bl sub_8002A34
ldr r4, _08042DC0
ldr r0, [r4]
adds r0, 0x8
@@ -124798,7 +124798,7 @@ _08047F48:
bl sub_8071C4C
ldr r4, _0804802C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, [r5]
adds r0, 0x4
adds r1, r4, 0
@@ -125493,7 +125493,7 @@ _0804857C:
bl sub_8071C4C
ldr r4, _08048644
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, [r5]
adds r0, 0x4
adds r1, r4, 0
@@ -131419,7 +131419,7 @@ _0804B47C:
bl sub_804B228
ldr r4, _0804B57C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, [r6]
adds r0, 0x4
adds r1, r4, 0
@@ -131821,7 +131821,7 @@ _0804B7F4:
bl sub_804B228
ldr r4, _0804B900
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, [r5]
adds r0, 0x4
adds r1, r4, 0
@@ -137006,7 +137006,7 @@ _0804E5AC:
bl SetVBlankCallback
ldr r4, _0804E60C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r3, _0804E610
@@ -137665,7 +137665,7 @@ _0804EBBC:
bl SetVBlankCallback
ldr r4, _0804EC64
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r1, _0804EC68
@@ -138314,7 +138314,7 @@ sub_804F0F4: @ 804F0F4
bl SetVBlankCallback
ldr r4, _0804F15C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r1, _0804F160
@@ -144906,7 +144906,7 @@ sub_80524BC: @ 80524BC
bl SetVBlankCallback
ldr r4, _08052520
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r0, _08052524

14
asm/rom4.s
View File

@@ -3627,7 +3627,7 @@ _080548C4:
bl sub_8054814
bl sub_8054C54
ldr r0, _080548DC
bl ShowBg
bl sub_8002A34
ldr r0, _080548E0
bl sub_8071C4C
b _08054928
@@ -3735,7 +3735,7 @@ _080549B4:
bl sub_8054814
bl sub_8054C54
ldr r0, _080549CC
bl ShowBg
bl sub_8002A34
ldr r0, _080549D0
bl sub_8071C4C
b _08054A38
@@ -3897,7 +3897,7 @@ _08054B0C:
bl sub_8054814
bl sub_8054C54
ldr r0, _08054B24
bl ShowBg
bl sub_8002A34
ldr r0, _08054B28
bl sub_8071C4C
b _08054B70
@@ -4042,7 +4042,7 @@ sub_8054C2C: @ 8054C2C
bl sub_8054814
bl sub_8054C54
ldr r0, _08054C4C
bl ShowBg
bl sub_8002A34
ldr r0, _08054C50
bl sub_8071C4C
bl mapdata_load_assets_to_gpu_and_full_redraw
@@ -52984,7 +52984,7 @@ _0806AB16:
bl sub_8073B94
ldr r4, _0806ABA0
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
movs r1, 0x80
@@ -53879,7 +53879,7 @@ _0806B2B2:
_0806B2CC: .4byte 0x0201b000
_0806B2D0:
ldr r0, _0806B2E0
bl ShowBg
bl sub_8002A34
ldr r1, _0806B2E4
ldr r0, _0806B2E8
adds r1, r0
@@ -67054,7 +67054,7 @@ _08071AA4:
_08071AB6:
ldr r4, _08071AD4
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
movs r1, 0x80

126
asm/rom5.s
View File

@@ -91,7 +91,7 @@ _0807AE20:
bl dp12_8087EA4
ldr r4, _0807AE5C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
bl sub_8073B94
ldr r0, _0807AE60
adds r1, r4, 0
@@ -27821,7 +27821,7 @@ sub_8088380: @ 8088380
bl SetVBlankCallback
ldr r4, _080883D0
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
movs r0, 0x26
@@ -28177,7 +28177,7 @@ sub_808862C: @ 808862C
bl SetVBlankCallback
ldr r4, _080886A4
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
movs r0, 0x26
@@ -34356,7 +34356,7 @@ _0808B758:
b _0808B95C
_0808B76A:
ldr r0, _0808B778
bl ShowBg
bl sub_8002A34
ldr r1, _0808B77C
ldr r2, _0808B780
adds r1, r2
@@ -35878,7 +35878,7 @@ _0808C344:
strb r0, [r1]
ldr r4, _0808C378
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldrb r0, [r5]
@@ -37933,7 +37933,7 @@ _0808D4D4: .4byte 0x0000043c
_0808D4D8:
ldr r4, _0808D4F8
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r0, _0808D4FC
@@ -41851,7 +41851,7 @@ _0808F3F0: .4byte 0x0000064d
_0808F3F4:
ldr r4, _0808F40C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r1, _0808F410
@@ -42760,7 +42760,7 @@ _0808FB98: .4byte 0x0000043c
_0808FB9C:
ldr r4, _0808FBB8
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8073B94
@@ -43427,7 +43427,7 @@ _08090170: .4byte 0x0000043c
_08090174:
ldr r4, _080901AC
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
add r1, sp, 0x4
@@ -44271,7 +44271,7 @@ _08090858: .4byte gUnknown_08E87AF6
_0809085C:
ldr r4, _0809088C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r2, _08090890
@@ -47216,7 +47216,7 @@ _08091F4C: .4byte 0x0000043c
_08091F50:
ldr r4, _08091FA8
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r0, _08091FAC
@@ -50303,7 +50303,7 @@ sub_80937BC: @ 80937BC
push {r4,lr}
ldr r4, _080937D4
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C58
pop {r4}
@@ -56587,7 +56587,7 @@ sub_8096804: @ 8096804
push {lr}
bl sub_8073B94
bl ResetSpriteData
bl FreeAllSpriteTiles
bl ClearSpriteTileRanges
bl FreeAllSpritePalettes
bl ResetTasks
ldr r1, _0809683C
@@ -56689,7 +56689,7 @@ _080968D4:
b _0809697A
_080968E8:
ldr r0, _080968F0
bl ShowBg
bl sub_8002A34
b _0809697A
.align 2, 0
_080968F0: .4byte gUnknown_081E6D00
@@ -56828,7 +56828,7 @@ _08096A2C: .4byte 0x0203847d
_08096A30: .4byte 0x0203847f
_08096A34:
ldr r0, _08096A3C
bl ShowBg
bl sub_8002A34
b _08096AD8
.align 2, 0
_08096A3C: .4byte gUnknown_081E6D00
@@ -71189,7 +71189,7 @@ _0809DB8C: .4byte 0x03001770
_0809DB90: .4byte 0x0000043c
_0809DB94:
ldr r0, _0809DB9C
bl ShowBg
bl sub_8002A34
b _0809DDE8
.align 2, 0
_0809DB9C: .4byte gUnknown_081E6E6C
@@ -82224,7 +82224,7 @@ _080A3268: .4byte 0x03001770
_080A326C: .4byte 0x0000043c
_080A3270:
ldr r0, _080A3278
bl ShowBg
bl sub_8002A34
b _080A3464
.align 2, 0
_080A3278: .4byte gUnknown_081E6DFC
@@ -96385,7 +96385,7 @@ sub_80A9F50: @ 80A9F50
strh r0, [r2]
ldr r4, _080A9FB8
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, _080A9FBC
adds r1, r4, 0
bl sub_8002D54
@@ -98630,7 +98630,7 @@ _080AB108:
ldr r0, [r1, 0x8]
ldr r4, _080AB17C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r5, _080AB180
adds r0, r5, 0
adds r1, r4, 0
@@ -98860,7 +98860,7 @@ sub_80AB320: @ 80AB320
push {r4,lr}
ldr r4, _080AB340
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, _080AB344
adds r1, r4, 0
bl sub_8002D54
@@ -114940,7 +114940,7 @@ BuyMenuDrawGraphics: @ 80B3108
bl ResetTasks
ldr r4, _080B3228
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl BuyMenuDrawMapGraphics
@@ -120638,7 +120638,7 @@ sub_80B5DC8: @ 80B5DC8
push {r4,lr}
ldr r4, _080B5DE0
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
pop {r4}
@@ -129722,7 +129722,7 @@ sub_80BA0EC: @ 80BA0EC
bl ResetTasks
bl ResetSpriteData
ldr r0, _080BA220
bl ShowBg
bl sub_8002A34
ldr r0, _080BA224
bl sub_8071C4C
movs r0, 0x1
@@ -131795,7 +131795,7 @@ sub_80BB25C: @ 80BB25C
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _080BB374
bl ShowBg
bl sub_8002A34
ldr r0, _080BB378
bl sub_8071C4C
ldr r1, _080BB37C
@@ -145619,7 +145619,7 @@ sub_80C2020: @ 80C2020
strh r0, [r5]
ldr r4, _080C20F0
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, _080C20F4
adds r1, r4, 0
bl sub_8002D54
@@ -220524,14 +220524,14 @@ _080E6344:
ldr r1, [r2, 0x4]
ldr r2, [r2, 0x8]
bl sub_80895F8
bl FreeAllSpriteTiles
bl ClearSpriteTileRanges
bl FreeAllSpritePalettes
b _080E6402
.align 2, 0
_080E637C: .4byte gUnknown_083DB698
_080E6380:
ldr r0, _080E6388
bl ShowBg
bl sub_8002A34
b _080E6402
.align 2, 0
_080E6388: .4byte gUnknown_081E6DA8
@@ -238729,7 +238729,7 @@ _080EF2E4:
b _080EF40C
_080EF2EA:
ldr r0, _080EF2F4
bl ShowBg
bl sub_8002A34
b _080EF40C
.align 2, 0
_080EF2F4: .4byte gUnknown_081E7224
@@ -239483,7 +239483,7 @@ _080EF8CC:
b _080EF9DC
_080EF8D2:
ldr r0, _080EF8DC
bl ShowBg
bl sub_8002A34
b _080EF9DC
.align 2, 0
_080EF8DC: .4byte gUnknown_081E7224
@@ -240373,7 +240373,7 @@ _080EFFE0: .4byte gUnknown_083DFEC4
_080EFFE4: .4byte 0x0000d162
_080EFFE8:
ldr r0, _080EFFF0
bl ShowBg
bl sub_8002A34
b _080F0154
.align 2, 0
_080EFFF0: .4byte gUnknown_081E7080
@@ -240774,7 +240774,7 @@ _080F033C: .4byte 0x000087c8
_080F0340: .4byte 0x0000d162
_080F0344:
ldr r0, _080F034C
bl ShowBg
bl sub_8002A34
b _080F0618
.align 2, 0
_080F034C: .4byte gUnknown_081E70D4
@@ -242465,7 +242465,7 @@ _080F10FC: .4byte gUnknown_083DFEC4
_080F1100: .4byte 0x0000d162
_080F1104:
ldr r0, _080F110C
bl ShowBg
bl sub_8002A34
b _080F1218
.align 2, 0
_080F110C: .4byte gUnknown_081E70B8
@@ -258243,7 +258243,7 @@ _080F8ADA:
_080F8B0C: .4byte 0x04000010
_080F8B10:
ldr r0, _080F8B18
bl ShowBg
bl sub_8002A34
b _080F8D30
.align 2, 0
_080F8B18: .4byte gUnknown_081E6DFC
@@ -265315,12 +265315,12 @@ _080FC0C4:
strh r1, [r0]
bl sub_8073B94
bl ResetSpriteData
bl FreeAllSpriteTiles
bl ClearSpriteTileRanges
bl FreeAllSpritePalettes
b _080FC1E6
_080FC104:
ldr r0, _080FC10C
bl ShowBg
bl sub_8002A34
b _080FC1E6
.align 2, 0
_080FC10C: .4byte gUnknown_081E7224
@@ -277198,7 +277198,7 @@ sub_8101C84: @ 8101C84
push {r4,lr}
ldr r4, _08101C9C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
pop {r4}
@@ -287513,7 +287513,7 @@ sub_81068FC: @ 81068FC
adds r0, r4, 0
bl sub_8071C4C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
pop {r4}
pop {r0}
bx r0
@@ -294715,7 +294715,7 @@ sub_8109E80: @ 8109E80
ldr r0, _0810A0C8
bl LoadSpritePalettes
ldr r0, _0810A0CC
bl ShowBg
bl sub_8002A34
ldr r0, _0810A0D0
bl sub_8071C4C
movs r0, 0x1
@@ -295792,7 +295792,7 @@ _0810A816:
ldr r0, _0810A858
bl LoadSpritePalettes
ldr r0, _0810A85C
bl ShowBg
bl sub_8002A34
ldr r0, _0810A860
bl sub_8071C4C
add sp, 0x8
@@ -297777,13 +297777,13 @@ _0810B7AC: .4byte 0x03001770
_0810B7B0: .4byte 0x0000043c
_0810B7B4:
ldr r0, _0810B7BC
bl ShowBg
bl sub_8002A34
b _0810B91C
.align 2, 0
_0810B7BC: .4byte gUnknown_081E6E34
_0810B7C0:
ldr r0, _0810B7D0
bl ShowBg
bl sub_8002A34
ldr r1, _0810B7D4
ldr r0, _0810B7D8
adds r1, r0
@@ -307991,7 +307991,7 @@ _081106C8:
bl sub_8073B94
bl ResetSpriteData
bl ResetTasks
bl FreeAllSpriteTiles
bl ClearSpriteTileRanges
bl FreeAllSpritePalettes
ldr r0, _08110710
movs r1, 0
@@ -310457,7 +310457,7 @@ evolution_cutscene: @ 8111984
strh r5, [r0]
ldr r4, _08111C18
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
bl sub_8073B94
ldr r0, _08111C1C
strh r5, [r0]
@@ -310796,7 +310796,7 @@ sub_8111C90: @ 8111C90
strh r5, [r0]
ldr r4, _08111E28
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
bl sub_8073B94
ldr r0, _08111E2C
strh r5, [r0]
@@ -311040,7 +311040,7 @@ _08111F64: .4byte 0x0000043c
_08111F68:
ldr r4, _08111F80
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
ldr r0, _08111F84
ldr r0, [r0]
adds r0, 0x4
@@ -317387,7 +317387,7 @@ _08115458: .4byte 0x03001770
_0811545C: .4byte 0x0000043c
_08115460:
ldr r0, _08115480
bl ShowBg
bl sub_8002A34
ldr r0, _08115484
bl sub_8071C4C
ldr r0, _08115488
@@ -377547,13 +377547,13 @@ sub_81326D8: @ 81326D8
bl SetVBlankCallback
ldr r4, _0813278C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8071EF4
ldr r4, _08132790
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8071EF4
@@ -377616,13 +377616,13 @@ sub_81327A4: @ 81327A4
bl SetVBlankCallback
ldr r4, _08132858
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8071EF4
ldr r4, _0813285C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8071EF4
@@ -385173,7 +385173,7 @@ _0813635E:
b _08136524
_08136366:
ldr r0, _08136370
bl ShowBg
bl sub_8002A34
b _08136524
.align 2, 0
_08136370: .4byte gUnknown_081E7080
@@ -402689,7 +402689,7 @@ sub_813EEE4: @ 813EEE4
bl sub_80FBB3C
ldr r4, _0813EF9C
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8071EF4
@@ -409222,7 +409222,7 @@ sub_81422E8: @ 81422E8
lsrs r4, 24
ldr r5, _08142314
adds r0, r5, 0
bl ShowBg
bl sub_8002A34
adds r0, r5, 0
bl sub_8071C4C
ldr r1, _08142318
@@ -409777,7 +409777,7 @@ sub_8142738: @ 8142738
strh r0, [r1]
ldr r4, _08142784
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r0, _08142788
@@ -410205,7 +410205,7 @@ _08142AB8:
bls _08142AB8
ldr r4, _08142AFC
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r1, _08142AF0
@@ -411542,7 +411542,7 @@ sub_8143570: @ 8143570
bl LoadCompressedObjectPalette
ldr r4, _081435B4
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
pop {r4}
@@ -412130,7 +412130,7 @@ _08143A0E:
strh r1, [r0, 0x8]
ldr r4, _08143AF8
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
ldr r0, _08143AFC
@@ -416662,7 +416662,7 @@ sub_8145D88: @ 8145D88
movs r2, 0x40
bl gpu_pal_apply
ldr r0, _08145ED4
bl ShowBg
bl sub_8002A34
ldr r0, _08145ED8
bl sub_8071C4C
bl pokedex_diploma_something
@@ -416972,7 +416972,7 @@ _081460F0:
b _0814620C
_081460F6:
ldr r0, _08146104
bl ShowBg
bl sub_8002A34
ldr r1, _08146108
ldr r0, _0814610C
adds r1, r0
@@ -418019,7 +418019,7 @@ sub_8146930: @ 8146930
bl SetVBlankCallback
ldr r4, _081469A0
adds r0, r4, 0
bl ShowBg
bl sub_8002A34
adds r0, r4, 0
bl sub_8071C4C
bl sub_8071EF4
@@ -418687,7 +418687,7 @@ _08146E6C:
movs r2, 0x20
bl gpu_pal_apply
ldr r0, _08146FF4
bl ShowBg
bl sub_8002A34
ldr r0, _08146FF8
bl sub_8071C4C
movs r0, 0xD
@@ -419920,7 +419920,7 @@ _08147960:
b _08147A44
_08147966:
ldr r0, _08147974
bl ShowBg
bl sub_8002A34
ldr r1, _08147978
ldr r2, _0814797C
adds r1, r2
@@ -421942,7 +421942,7 @@ _08148A2C:
bl ResetTasks
bl ResetSpriteData
ldr r0, _08148AE0
bl ShowBg
bl sub_8002A34
ldr r0, _08148AE4
bl sub_8071C4C
movs r0, 0x1

3
include/gba/defines.h
View File

@@ -27,13 +27,14 @@
// alignment would be if the variable were uninitialized.
#define COMM(decl, n) IWRAM_DATA ALIGNED(1 << n) decl = {0};
#define COMM_2(decl) COMM(decl, 2)
#define COMM_3(decl) COMM(decl, 3)
#define COMM_4(decl) COMM(decl, 4)
#define SOUND_INFO_PTR (*(struct SoundInfo **)0x3007FF0)
#define INTR_CHECK (*(u16 *)0x3007FF8)
#define INTR_VECTOR (*(void **)0x3007FFC)
#define OBJ_VRAM0 0x6010000 // when BG is in tilemap mode
#define OBJ_VRAM0 0x6010000 // when BG is in tiled mode
#define OBJ_VRAM1 0x6014000 // when BG is in bitmap mode
#define OAM 0x7000000

10
include/gba/macro.h
View File

@@ -17,6 +17,16 @@
#define CpuCopy16(src, dest, size) CPU_COPY(src, dest, size, 16)
#define CpuCopy32(src, dest, size) CPU_COPY(src, dest, size, 32)
#define CpuFastFill(dest, value, size) \
{ \
vu32 tmp = (vu32)(value); \
CpuFastSet((void *)&tmp, \
dest, \
CPU_FAST_SET_SRC_FIXED | ((size)/(32/8) & 0x1FFFFF)); \
}
#define CpuFastCopy(src, dest, size) CpuFastSet(src, dest, ((size)/(32/8) & 0x1FFFFF))
#define DmaSet(dmaNum, src, dest, control) \
{ \
vu32 *dmaRegs = (vu32 *)REG_ADDR_DMA##dmaNum; \

4
include/gba/syscall.h
View File

@@ -23,6 +23,10 @@ void VBlankIntrWait(void);
void CpuSet(void *src, void *dest, u32 control);
#define CPU_FAST_SET_SRC_FIXED 0x01000000
void CpuFastSet(void *src, void *dest, u32 control);
void ObjAffineSet(struct ObjAffineSrcData *src, void *dest, s32 count, s32 offset);
#endif // GUARD_GBA_SYSCALL_H

2
include/sprite.h
View File

@@ -223,7 +223,7 @@ void AllocTilesForSpriteSheets(struct SpriteSheet *sheets);
void LoadTilesForSpriteSheet(struct SpriteSheet *sheet);
void LoadTilesForSpriteSheets(struct SpriteSheet *sheets);
void FreeSpriteTilesByTag(u16 tag);
void FreeAllSpriteTiles(void);
void ClearSpriteTileRanges(void);
u16 GetSpriteTileStartByTag(u16 tag);
u16 GetSpriteTileTagByTileStart(u16 start);
void RequestSpriteSheetCopy(struct SpriteSheet *sheet);

4
src/sprite.c
View File

@@ -322,7 +322,7 @@ void ResetSpriteData(void)
ResetAllSprites();
ClearSpriteCopyRequests();
ResetAffineAnimData();
FreeAllSpriteTiles();
ClearSpriteTileRanges();
gOamLimit = 64;
gReservedSpriteTileCount = 0;
AllocSpriteTiles(0);
@@ -1541,7 +1541,7 @@ void FreeSpriteTilesByTag(u16 tag)
}
}
void FreeAllSpriteTiles(void)
void ClearSpriteTileRanges(void)
{
u8 i;