diff options
Diffstat (limited to 'asm/rom5.s')
-rw-r--r-- | asm/rom5.s | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 0e54e8c19..f12754638 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -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 |