diff options
Diffstat (limited to 'asm/code_8012A18.s')
-rw-r--r-- | asm/code_8012A18.s | 244 |
1 files changed, 122 insertions, 122 deletions
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s index bf8e220..b1327f4 100644 --- a/asm/code_8012A18.s +++ b/asm/code_8012A18.s @@ -4698,7 +4698,7 @@ _08014E10: adds r4, r1, r0 b _08014F0C .align 2, 0 -_08014E20: .4byte gUnknown_202D3B8 +_08014E20: .4byte gFileCache + 0x110 _08014E24: adds r5, 0x1 movs r0, 0 @@ -86812,10 +86812,10 @@ _0803DB54: .align 2, 0 _0803DB84: .4byte gUnknown_80F60F8 _0803DB88: .4byte gUnknown_83B0000 -_0803DB8C: .4byte gUnknown_202EC88 +_0803DB8C: .4byte gDungeonNameBannerPalette _0803DB90: .4byte gUnknown_80F6100 -_0803DB94: .4byte gUnknown_202EC8C -_0803DB98: .4byte gUnknown_202EC90 +_0803DB94: .4byte gDungeonNameBannerFontFile +_0803DB98: .4byte gDungeonNameBannerFontFile + 4 _0803DB9C: .4byte 0x06000140 _0803DBA0: .4byte gUnknown_203B418 _0803DBA4: .4byte 0x00000645 @@ -86862,7 +86862,7 @@ _0803DBEA: .align 2, 0 _0803DC08: .4byte gUnknown_80F6118 _0803DC0C: .4byte gUnknown_20274A5 -_0803DC10: .4byte gUnknown_202EC8C +_0803DC10: .4byte gDungeonNameBannerFontFile thumb_func_end ShowDungeonNameBanner thumb_func_start sub_803DC14 @@ -87273,7 +87273,7 @@ sub_803DEC8: adds r1, r5, r0 b _0803DF56 .align 2, 0 -_0803DEFC: .4byte gUnknown_202EC8C +_0803DEFC: .4byte gDungeonNameBannerFontFile _0803DF00: .4byte 0xffff0800 _0803DF04: .4byte 0x000007fe _0803DF08: @@ -87287,7 +87287,7 @@ _0803DF08: adds r0, r2, r0 b _0803DF3A .align 2, 0 -_0803DF1C: .4byte gUnknown_202EC90 +_0803DF1C: .4byte gDungeonNameBannerFontFile + 4 _0803DF20: lsls r0, r1, 3 adds r0, r5 @@ -88555,7 +88555,7 @@ _0803E9B4: .4byte 0x00018215 _0803E9B8: .4byte 0x0001c06c _0803E9BC: .4byte gUnknown_202EE8C _0803E9C0: .4byte gUnknown_202ECA4 -_0803E9C4: .4byte gUnknown_202EC88 +_0803E9C4: .4byte gDungeonNameBannerPalette _0803E9C8: .4byte gUnknown_202D058 _0803E9CC: .4byte 0x000181e4 thumb_func_end sub_803E874 @@ -99078,7 +99078,7 @@ _08043984: .4byte 0xff00ffff _08043988: .4byte gUnknown_202EDC8 _0804398C: .4byte gUnknown_81006A4 _08043990: .4byte 0x00000222 -_08043994: .4byte gUnknown_202EC88 +_08043994: .4byte gDungeonNameBannerPalette _08043998: .4byte gUnknown_203B40C _0804399C: .4byte gUnknown_203B41C _080439A0: @@ -104471,7 +104471,7 @@ sub_8046298: ldrb r0, [r0, 0xD] bx lr .align 2, 0 -_080462A8: .4byte gUnknown_20389A4 +_080462A8: .4byte gItemParametersFile + 4 thumb_func_end sub_8046298 thumb_func_start sub_80462AC @@ -245668,8 +245668,8 @@ _0808CDE4: .4byte gUnknown_203B45C _0808CDE8: .4byte gUnknown_202F400 _0808CDEC: .4byte gUnknown_81075F4 _0808CDF0: .4byte gUnknown_8300500 -_0808CDF4: .4byte gUnknown_202F3E4 -_0808CDF8: .4byte gUnknown_202F3E0 +_0808CDF4: .4byte gMonsterParametersFile +_0808CDF8: .4byte gMonsterParameters _0808CDFC: .4byte gUnknown_20384E8 thumb_func_end LoadMonsterParameters @@ -245907,7 +245907,7 @@ _0808CFB8: pop {r0} bx r0 .align 2, 0 -_0808CFC8: .4byte gUnknown_202F3E0 +_0808CFC8: .4byte gMonsterParameters _0808CFCC: .4byte gUnknown_203B45C thumb_func_end sub_808CE74 @@ -246197,7 +246197,7 @@ sub_808D1DC: bne _0808D238 b _0808D268 .align 2, 0 -_0808D204: .4byte gUnknown_202F3E0 +_0808D204: .4byte gMonsterParameters _0808D208: .4byte gUnknown_203B468 _0808D20C: ldr r0, [r7] @@ -246278,7 +246278,7 @@ sub_808D278: bne _0808D2AA b _0808D2DA .align 2, 0 -_0808D29C: .4byte gUnknown_202F3E0 +_0808D29C: .4byte gMonsterParameters _0808D2A0: .4byte gUnknown_203B468 _0808D2A4: ldr r0, [r7] @@ -247194,7 +247194,7 @@ sub_808D8BC: pop {r0} bx r0 .align 2, 0 -_0808D8DC: .4byte gUnknown_202F3E0 +_0808D8DC: .4byte gMonsterParameters thumb_func_end sub_808D8BC thumb_func_start sub_808D8E0 @@ -247216,7 +247216,7 @@ sub_808D8E0: bx r0 .align 2, 0 _0808D900: .4byte gUnknown_8107600 -_0808D904: .4byte gUnknown_202F3E0 +_0808D904: .4byte gMonsterParameters thumb_func_end sub_808D8E0 thumb_func_start sub_808D908 @@ -247238,7 +247238,7 @@ sub_808D908: bx r0 .align 2, 0 _0808D928: .4byte gUnknown_8107608 -_0808D92C: .4byte gUnknown_202F3E0 +_0808D92C: .4byte gMonsterParameters thumb_func_end sub_808D908 thumb_func_start sub_808D930 @@ -247287,7 +247287,7 @@ _0808D986: bx r0 .align 2, 0 _0808D98C: .4byte gUnknown_8107638 -_0808D990: .4byte gUnknown_202F3E0 +_0808D990: .4byte gMonsterParameters thumb_func_end sub_808D930 thumb_func_start sub_808D994 @@ -247303,7 +247303,7 @@ sub_808D994: ldr r0, [r1] bx lr .align 2, 0 -_0808D9A8: .4byte gUnknown_202F3E0 +_0808D9A8: .4byte gMonsterParameters thumb_func_end sub_808D994 thumb_func_start sub_808D9AC @@ -247468,7 +247468,7 @@ sub_808DAB4: ldr r0, [r1, 0x4] bx lr .align 2, 0 -_0808DAC8: .4byte gUnknown_202F3E0 +_0808DAC8: .4byte gMonsterParameters thumb_func_end sub_808DAB4 thumb_func_start sub_808DACC @@ -247484,7 +247484,7 @@ sub_808DACC: ldrb r0, [r1, 0x9] bx lr .align 2, 0 -_0808DAE0: .4byte gUnknown_202F3E0 +_0808DAE0: .4byte gMonsterParameters thumb_func_end sub_808DACC thumb_func_start sub_808DAE4 @@ -247500,7 +247500,7 @@ sub_808DAE4: ldrb r0, [r1, 0x19] bx lr .align 2, 0 -_0808DAF8: .4byte gUnknown_202F3E0 +_0808DAF8: .4byte gMonsterParameters thumb_func_end sub_808DAE4 thumb_func_start sub_808DAFC @@ -247516,7 +247516,7 @@ sub_808DAFC: ldr r0, [r1, 0xC] bx lr .align 2, 0 -_0808DB10: .4byte gUnknown_202F3E0 +_0808DB10: .4byte gMonsterParameters thumb_func_end sub_808DAFC thumb_func_start sub_808DB14 @@ -247532,7 +247532,7 @@ sub_808DB14: ldrb r0, [r1, 0x15] bx lr .align 2, 0 -_0808DB28: .4byte gUnknown_202F3E0 +_0808DB28: .4byte gMonsterParameters thumb_func_end sub_808DB14 thumb_func_start sub_808DB2C @@ -247550,7 +247550,7 @@ sub_808DB2C: lsrs r0, 24 bx lr .align 2, 0 -_0808DB44: .4byte gUnknown_202F3E0 +_0808DB44: .4byte gMonsterParameters thumb_func_end sub_808DB2C thumb_func_start sub_808DB48 @@ -247566,7 +247566,7 @@ sub_808DB48: ldrb r0, [r1, 0x1C] bx lr .align 2, 0 -_0808DB5C: .4byte gUnknown_202F3E0 +_0808DB5C: .4byte gMonsterParameters thumb_func_end sub_808DB48 thumb_func_start sub_808DB60 @@ -247582,7 +247582,7 @@ sub_808DB60: ldrb r0, [r1, 0x1D] bx lr .align 2, 0 -_0808DB74: .4byte gUnknown_202F3E0 +_0808DB74: .4byte gMonsterParameters thumb_func_end sub_808DB60 thumb_func_start sub_808DB78 @@ -247598,7 +247598,7 @@ sub_808DB78: ldrh r0, [r1, 0x2C] bx lr .align 2, 0 -_0808DB8C: .4byte gUnknown_202F3E0 +_0808DB8C: .4byte gMonsterParameters thumb_func_end sub_808DB78 thumb_func_start sub_808DB90 @@ -247614,7 +247614,7 @@ sub_808DB90: ldrh r0, [r1, 0x2E] bx lr .align 2, 0 -_0808DBA4: .4byte gUnknown_202F3E0 +_0808DBA4: .4byte gMonsterParameters thumb_func_end sub_808DB90 thumb_func_start sub_808DBA8 @@ -247630,7 +247630,7 @@ sub_808DBA8: ldrb r0, [r1, 0x16] bx lr .align 2, 0 -_0808DBBC: .4byte gUnknown_202F3E0 +_0808DBBC: .4byte gMonsterParameters thumb_func_end sub_808DBA8 thumb_func_start sub_808DBC0 @@ -247646,7 +247646,7 @@ sub_808DBC0: ldrh r0, [r1, 0x1E] bx lr .align 2, 0 -_0808DBD4: .4byte gUnknown_202F3E0 +_0808DBD4: .4byte gMonsterParameters thumb_func_end sub_808DBC0 thumb_func_start sub_808DBD8 @@ -247663,7 +247663,7 @@ sub_808DBD8: ldrb r0, [r1] bx lr .align 2, 0 -_0808DBF0: .4byte gUnknown_202F3E0 +_0808DBF0: .4byte gMonsterParameters thumb_func_end sub_808DBD8 thumb_func_start sub_808DBF4 @@ -247679,7 +247679,7 @@ sub_808DBF4: ldrb r0, [r1, 0x12] bx lr .align 2, 0 -_0808DC08: .4byte gUnknown_202F3E0 +_0808DC08: .4byte gMonsterParameters thumb_func_end sub_808DBF4 thumb_func_start sub_808DC0C @@ -247696,7 +247696,7 @@ sub_808DC0C: ldrsh r0, [r1, r2] bx lr .align 2, 0 -_0808DC24: .4byte gUnknown_202F3E0 +_0808DC24: .4byte gMonsterParameters thumb_func_end sub_808DC0C thumb_func_start sub_808DC28 @@ -247715,7 +247715,7 @@ sub_808DC28: ldrh r0, [r2] bx lr .align 2, 0 -_0808DC44: .4byte gUnknown_202F3E0 +_0808DC44: .4byte gMonsterParameters thumb_func_end sub_808DC28 thumb_func_start sub_808DC48 @@ -247734,7 +247734,7 @@ sub_808DC48: ldrh r0, [r2] bx lr .align 2, 0 -_0808DC64: .4byte gUnknown_202F3E0 +_0808DC64: .4byte gMonsterParameters thumb_func_end sub_808DC48 thumb_func_start sub_808DC68 @@ -247752,7 +247752,7 @@ sub_808DC68: ldrb r0, [r2] bx lr .align 2, 0 -_0808DC80: .4byte gUnknown_202F3E0 +_0808DC80: .4byte gMonsterParameters thumb_func_end sub_808DC68 thumb_func_start sub_808DC84 @@ -247770,7 +247770,7 @@ sub_808DC84: ldrb r0, [r2] bx lr .align 2, 0 -_0808DC9C: .4byte gUnknown_202F3E0 +_0808DC9C: .4byte gMonsterParameters thumb_func_end sub_808DC84 thumb_func_start sub_808DCA0 @@ -247790,7 +247790,7 @@ sub_808DCA0: ldrsh r0, [r2, r1] bx lr .align 2, 0 -_0808DCBC: .4byte gUnknown_202F3E0 +_0808DCBC: .4byte gMonsterParameters thumb_func_end sub_808DCA0 thumb_func_start sub_808DCC0 @@ -247808,7 +247808,7 @@ sub_808DCC0: ldrsh r0, [r1, r2] bx lr .align 2, 0 -_0808DCD8: .4byte gUnknown_202F3E0 +_0808DCD8: .4byte gMonsterParameters thumb_func_end sub_808DCC0 thumb_func_start sub_808DCDC @@ -247828,7 +247828,7 @@ sub_808DCDC: ldrsh r0, [r2, r1] bx lr .align 2, 0 -_0808DCF8: .4byte gUnknown_202F3E0 +_0808DCF8: .4byte gMonsterParameters thumb_func_end sub_808DCDC thumb_func_start sub_808DCFC @@ -247845,7 +247845,7 @@ sub_808DCFC: ldrsh r0, [r1, r2] bx lr .align 2, 0 -_0808DD14: .4byte gUnknown_202F3E0 +_0808DD14: .4byte gMonsterParameters thumb_func_end sub_808DCFC thumb_func_start sub_808DD18 @@ -247871,7 +247871,7 @@ sub_808DD18: pop {r1} bx r1 .align 2, 0 -_0808DD44: .4byte gUnknown_202F3E0 +_0808DD44: .4byte gMonsterParameters thumb_func_end sub_808DD18 thumb_func_start sub_808DD48 @@ -247890,7 +247890,7 @@ sub_808DD48: str r3, [r1, 0x4] bx lr .align 2, 0 -_0808DD64: .4byte gUnknown_202F3E0 +_0808DD64: .4byte gMonsterParameters thumb_func_end sub_808DD48 thumb_func_start sub_808DD68 @@ -247909,7 +247909,7 @@ sub_808DD68: ldrb r0, [r0, 0x8] b _0808DD8A .align 2, 0 -_0808DD84: .4byte gUnknown_202F3E0 +_0808DD84: .4byte gMonsterParameters _0808DD88: movs r0, 0xA _0808DD8A: @@ -247940,7 +247940,7 @@ sub_808DD90: bl OpenFile b _0808DDCA .align 2, 0 -_0808DDBC: .4byte gUnknown_202F3E0 +_0808DDBC: .4byte gMonsterParameters _0808DDC0: .4byte gUnknown_8107684 _0808DDC4: .4byte gUnknown_8510000 _0808DDC8: @@ -247974,7 +247974,7 @@ sub_808DDD0: bl OpenFileAndGetFileDataPtr b _0808DE0A .align 2, 0 -_0808DDFC: .4byte gUnknown_202F3E0 +_0808DDFC: .4byte gMonsterParameters _0808DE00: .4byte gUnknown_8107684 _0808DE04: .4byte gUnknown_8510000 _0808DE08: @@ -248001,7 +248001,7 @@ sub_808DE10: ands r0, r1 bx lr .align 2, 0 -_0808DE2C: .4byte gUnknown_202F3E0 +_0808DE2C: .4byte gMonsterParameters thumb_func_end sub_808DE10 thumb_func_start sub_808DE30 @@ -253777,8 +253777,8 @@ _080909B8: .4byte gUnknown_203B460 _080909BC: .4byte gUnknown_20389A8 _080909C0: .4byte gUnknown_8109764 _080909C4: .4byte gUnknown_8300500 -_080909C8: .4byte gUnknown_20389A0 -_080909CC: .4byte gUnknown_20389A4 +_080909C8: .4byte gItemParametersFile +_080909CC: .4byte gItemParametersFile + 4 thumb_func_end sub_8090998 thumb_func_start sub_80909D0 @@ -254085,7 +254085,7 @@ sub_8090BD0: ldrb r0, [r0, 0xC] bx lr .align 2, 0 -_08090BE0: .4byte gUnknown_20389A4 +_08090BE0: .4byte gItemParametersFile + 4 thumb_func_end sub_8090BD0 thumb_func_start sub_8090BE4 @@ -254112,7 +254112,7 @@ _08090BF6: ldr r0, [r0, 0x4] b _08090C24 .align 2, 0 -_08090C10: .4byte gUnknown_20389A4 +_08090C10: .4byte gItemParametersFile + 4 _08090C14: ldrb r0, [r4, 0x2] ldr r1, _08090C2C @@ -254127,7 +254127,7 @@ _08090C24: pop {r1} bx r1 .align 2, 0 -_08090C2C: .4byte gUnknown_20389A4 +_08090C2C: .4byte gItemParametersFile + 4 thumb_func_end sub_8090BE4 thumb_func_start sub_8090C30 @@ -254154,7 +254154,7 @@ _08090C42: ldr r0, [r0, 0x8] b _08090C70 .align 2, 0 -_08090C5C: .4byte gUnknown_20389A4 +_08090C5C: .4byte gItemParametersFile + 4 _08090C60: ldrb r0, [r4, 0x2] ldr r1, _08090C78 @@ -254169,7 +254169,7 @@ _08090C70: pop {r1} bx r1 .align 2, 0 -_08090C78: .4byte gUnknown_20389A4 +_08090C78: .4byte gItemParametersFile + 4 thumb_func_end sub_8090C30 thumb_func_start sub_8090C7C @@ -254197,7 +254197,7 @@ _08090C90: ldr r0, [r0, 0x4] b _08090CC0 .align 2, 0 -_08090CAC: .4byte gUnknown_20389A4 +_08090CAC: .4byte gItemParametersFile + 4 _08090CB0: ldrb r0, [r4, 0x2] ldr r1, _08090CC8 @@ -254212,7 +254212,7 @@ _08090CC0: pop {r1} bx r1 .align 2, 0 -_08090CC8: .4byte gUnknown_20389A4 +_08090CC8: .4byte gItemParametersFile + 4 thumb_func_end sub_8090C7C thumb_func_start sub_8090CCC @@ -254240,7 +254240,7 @@ _08090CE0: ldr r0, [r0, 0x8] b _08090D10 .align 2, 0 -_08090CFC: .4byte gUnknown_20389A4 +_08090CFC: .4byte gItemParametersFile + 4 _08090D00: ldrb r0, [r4, 0x2] ldr r1, _08090D18 @@ -254255,7 +254255,7 @@ _08090D10: pop {r1} bx r1 .align 2, 0 -_08090D18: .4byte gUnknown_20389A4 +_08090D18: .4byte gItemParametersFile + 4 thumb_func_end sub_8090CCC thumb_func_start sub_8090D1C @@ -254268,7 +254268,7 @@ sub_8090D1C: ldr r0, [r0, 0x4] bx lr .align 2, 0 -_08090D2C: .4byte gUnknown_20389A4 +_08090D2C: .4byte gItemParametersFile + 4 thumb_func_end sub_8090D1C thumb_func_start sub_8090D30 @@ -254281,7 +254281,7 @@ sub_8090D30: ldr r0, [r0, 0x8] bx lr .align 2, 0 -_08090D40: .4byte gUnknown_20389A4 +_08090D40: .4byte gItemParametersFile + 4 thumb_func_end sub_8090D30 thumb_func_start sub_8090D44 @@ -254294,7 +254294,7 @@ sub_8090D44: ldrb r0, [r0, 0x1A] bx lr .align 2, 0 -_08090D54: .4byte gUnknown_20389A4 +_08090D54: .4byte gItemParametersFile + 4 thumb_func_end sub_8090D44 thumb_func_start sub_8090D58 @@ -254307,7 +254307,7 @@ sub_8090D58: ldrb r0, [r0, 0x1D] bx lr .align 2, 0 -_08090D68: .4byte gUnknown_20389A4 +_08090D68: .4byte gItemParametersFile + 4 thumb_func_end sub_8090D58 thumb_func_start sub_8090D6C @@ -254320,7 +254320,7 @@ sub_8090D6C: ldrb r0, [r0, 0x1E] bx lr .align 2, 0 -_08090D7C: .4byte gUnknown_20389A4 +_08090D7C: .4byte gItemParametersFile + 4 thumb_func_end sub_8090D6C thumb_func_start sub_8090D80 @@ -254335,7 +254335,7 @@ sub_8090D80: ldrb r0, [r0] bx lr .align 2, 0 -_08090D94: .4byte gUnknown_20389A4 +_08090D94: .4byte gItemParametersFile + 4 thumb_func_end sub_8090D80 thumb_func_start sub_8090D98 @@ -254348,7 +254348,7 @@ sub_8090D98: ldr r0, [r0, 0x10] bx lr .align 2, 0 -_08090DA8: .4byte gUnknown_20389A4 +_08090DA8: .4byte gItemParametersFile + 4 thumb_func_end sub_8090D98 thumb_func_start sub_8090DAC @@ -254363,7 +254363,7 @@ sub_8090DAC: ldrb r0, [r0] bx lr .align 2, 0 -_08090DC0: .4byte gUnknown_20389A4 +_08090DC0: .4byte gItemParametersFile + 4 thumb_func_end sub_8090DAC thumb_func_start sub_8090DC4 @@ -254404,7 +254404,7 @@ sub_8090DC4: pop {r0} bx r0 .align 2, 0 -_08090E10: .4byte gUnknown_20389A4 +_08090E10: .4byte gItemParametersFile + 4 thumb_func_end sub_8090DC4 thumb_func_start sub_8090E14 @@ -254453,7 +254453,7 @@ _08090E50: b _08090EC4 .align 2, 0 _08090E68: .4byte gUnknown_8109770 -_08090E6C: .4byte gUnknown_20389A4 +_08090E6C: .4byte gItemParametersFile + 4 _08090E70: ldr r1, _08090E88 ldrb r0, [r5, 0x2] @@ -254467,7 +254467,7 @@ _08090E70: b _08090EC4 .align 2, 0 _08090E88: .4byte gUnknown_8109778 -_08090E8C: .4byte gUnknown_20389A4 +_08090E8C: .4byte gItemParametersFile + 4 _08090E90: ldrb r0, [r5, 0x2] cmp r0, 0x69 @@ -254544,7 +254544,7 @@ _08090F14: bl sub_8090F58 b _08090F50 .align 2, 0 -_08090F2C: .4byte gUnknown_20389A4 +_08090F2C: .4byte gItemParametersFile + 4 _08090F30: .4byte gUnknown_8109784 _08090F34: .4byte gUnknown_810978C _08090F38: @@ -255209,7 +255209,7 @@ sub_80913CC: ldrh r0, [r0, 0x18] bx lr .align 2, 0 -_080913DC: .4byte gUnknown_20389A4 +_080913DC: .4byte gItemParametersFile + 4 thumb_func_end sub_80913CC thumb_func_start sub_80913E0 @@ -258154,7 +258154,7 @@ LoadWazaParameters: .align 2, 0 _08092868: .4byte gUnknown_81098D0 _0809286C: .4byte gUnknown_8300500 -_08092870: .4byte gUnknown_2038C64 +_08092870: .4byte gWazaParametersFile _08092874: .4byte gUnknown_2038C68 _08092878: .4byte gUnknown_2038C6C thumb_func_end LoadWazaParameters @@ -271490,7 +271490,7 @@ _080988F8: bl GroundEffect_Action bl nullsub_105 bl sub_809B474 - bl sub_80A2380 + bl GroundScript_Unlock bl sub_809D25C bl sub_80A59DC bl sub_809B614 @@ -271783,7 +271783,7 @@ _08098BD2: sub_8098BDC: push {lr} bl sub_809B57C - bl sub_80A2380 + bl GroundScript_Unlock bl sub_809D25C bl sub_80A59DC bl sub_809B614 @@ -279959,7 +279959,7 @@ sub_809CBBC: b _0809CC4A .align 2, 0 _0809CC0C: .4byte gUnknown_81163E4 -_0809CC10: .4byte gUnknown_20389A4 +_0809CC10: .4byte gItemParametersFile + 4 _0809CC14: .4byte gUnknown_203B460 _0809CC18: .4byte 0x0001869f _0809CC1C: @@ -284745,28 +284745,28 @@ _0809F3DC: .4byte gUnknown_2039A32 _0809F3E0: adds r0, r6, 0 adds r1, r5, 0 - bl sub_80A7988 + bl GroundLives_Cancel adds r0, r6, 0 adds r1, r5, 0 - bl sub_80ABC5C + bl GroundObject_Cancel adds r0, r6, 0 adds r1, r5, 0 - bl sub_80ACC98 + bl GroundEffect_Cancel b _0809F41E _0809F3FA: adds r0, r6, 0 adds r1, r5, 0 - bl sub_80A7988 + bl GroundLives_Cancel bl _0809EAE0 _0809F406: adds r0, r6, 0 adds r1, r5, 0 - bl sub_80ABC5C + bl GroundObject_Cancel bl _0809EAE0 _0809F412: adds r0, r6, 0 adds r1, r5, 0 - bl sub_80ACC98 + bl GroundEffect_Cancel bl _0809EAE0 _0809F41E: adds r0, r6, 0 @@ -284777,10 +284777,10 @@ _0809F42A: bl sub_80A79FC bl _0809EAE0 _0809F432: - bl sub_80ABCCC + bl GroundObject_CancelBlank bl _0809EAE0 _0809F43A: - bl sub_80ACD08 + bl GroundEffect_CancelBlank bl _0809EAE0 _0809F442: mov r2, r9 @@ -290448,7 +290448,7 @@ _080A233A: b _080A236A _080A2346: movs r0, 0 - bl sub_80A6C88 + bl GroundSprite_ExtendPaletteDelete b _080A236A _080A234E: movs r0, 0 @@ -290478,8 +290478,8 @@ _080A236C: bx r1 thumb_func_end sub_80A14E8 - thumb_func_start sub_80A2380 -sub_80A2380: + thumb_func_start GroundScript_Unlock +GroundScript_Unlock: push {r4-r7,lr} ldr r1, _080A241C ldrb r0, [r1] @@ -290557,7 +290557,7 @@ _080A241C: .4byte gUnknown_2039A36 _080A2420: .4byte gUnknown_2039A38 _080A2424: .4byte gUnknown_8116848 _080A2428: .4byte gUnknown_2039AC0 - thumb_func_end sub_80A2380 + thumb_func_end GroundScript_Unlock thumb_func_start sub_80A242C sub_80A242C: @@ -299986,7 +299986,7 @@ sub_80A69FC: cmp r4, 0 blt _080A6A7A adds r0, r6, 0 - bl sub_80A6C88 + bl GroundSprite_ExtendPaletteDelete movs r0, 0 str r0, [r5, 0x8] str r0, [r5] @@ -300303,8 +300303,8 @@ _080A6C78: bx r0 thumb_func_end GroundSprite_ExtendPaletteAdd - thumb_func_start sub_80A6C88 -sub_80A6C88: + thumb_func_start GroundSprite_ExtendPaletteDelete +GroundSprite_ExtendPaletteDelete: push {r4-r6,lr} adds r2, r0, 0 cmp r2, 0 @@ -300360,7 +300360,7 @@ _080A6CE6: .align 2, 0 _080A6CEC: .4byte gUnknown_3001B7C _080A6CF0: .4byte gUnknown_81178C0 - thumb_func_end sub_80A6C88 + thumb_func_end GroundSprite_ExtendPaletteDelete thumb_func_start sub_80A6CF4 sub_80A6CF4: @@ -301931,7 +301931,7 @@ _080A787C: cmp r0, r6 beq _080A788A adds r0, r1, 0 - bl sub_80A8684 + bl GroundLives_Delete _080A788A: adds r0, r5, 0 movs r1, 0x80 @@ -302062,8 +302062,8 @@ _080A7980: .4byte gUnknown_811808C _080A7984: .4byte gUnknown_8118098 thumb_func_end GroundLives_Select - thumb_func_start sub_80A7988 -sub_80A7988: + thumb_func_start GroundLives_Cancel +GroundLives_Cancel: push {r4-r7,lr} mov r7, r8 push {r7} @@ -302101,7 +302101,7 @@ _080A79B2: bne _080A79D4 _080A79CE: adds r0, r1, 0 - bl sub_80A8684 + bl GroundLives_Delete _080A79D4: adds r0, r6, 0 movs r1, 0x80 @@ -302121,7 +302121,7 @@ _080A79D4: .align 2, 0 _080A79F4: .4byte gUnknown_81180BC _080A79F8: .4byte gUnknown_3001B84 - thumb_func_end sub_80A7988 + thumb_func_end GroundLives_Cancel thumb_func_start sub_80A79FC sub_80A79FC: @@ -302164,7 +302164,7 @@ _080A7A20: cmp r0, 0 bne _080A7A50 adds r0, r6, 0 - bl sub_80A8684 + bl GroundLives_Delete _080A7A50: adds r0, r6, 0x1 lsls r0, 16 @@ -303749,8 +303749,8 @@ _080A8674: bx r1 thumb_func_end GroundLives_Add - thumb_func_start sub_80A8684 -sub_80A8684: + thumb_func_start GroundLives_Delete +GroundLives_Delete: push {r4,lr} adds r2, r0, 0 lsls r2, 16 @@ -303780,7 +303780,7 @@ sub_80A8684: _080A86BC: .4byte gUnknown_3001B84 _080A86C0: .4byte gUnknown_8118194 _080A86C4: .4byte 0x0000ffff - thumb_func_end sub_80A8684 + thumb_func_end GroundLives_Delete thumb_func_start sub_80A86C8 sub_80A86C8: @@ -309318,7 +309318,7 @@ _080AB278: b _080AB44C _080AB292: mov r0, r9 - bl sub_80A8684 + bl GroundLives_Delete b _080AB47C .align 2, 0 _080AB29C: .4byte gUnknown_3001B84 @@ -310631,8 +310631,8 @@ _080ABC54: .4byte gUnknown_81183E4 _080ABC58: .4byte gUnknown_81183F0 thumb_func_end GroundObject_Select - thumb_func_start sub_80ABC5C -sub_80ABC5C: + thumb_func_start GroundObject_Cancel +GroundObject_Cancel: push {r4-r7,lr} mov r7, r8 push {r7} @@ -310689,10 +310689,10 @@ _080ABCA6: .align 2, 0 _080ABCC4: .4byte gUnknown_8118414 _080ABCC8: .4byte gUnknown_3001B88 - thumb_func_end sub_80ABC5C + thumb_func_end GroundObject_Cancel - thumb_func_start sub_80ABCCC -sub_80ABCCC: + thumb_func_start GroundObject_CancelBlank +GroundObject_CancelBlank: push {r4-r7,lr} mov r7, r8 push {r7} @@ -310752,7 +310752,7 @@ _080ABD20: .align 2, 0 _080ABD40: .4byte gUnknown_811842C _080ABD44: .4byte gUnknown_3001B88 - thumb_func_end sub_80ABCCC + thumb_func_end GroundObject_CancelBlank thumb_func_start sub_80ABD48 sub_80ABD48: @@ -312792,7 +312792,7 @@ _080ACBE4: cmp r0, r6 beq _080ACBF2 adds r0, r1, 0 - bl sub_80AD080 + bl GroundEffect_Delete _080ACBF2: adds r0, r5, 0 movs r1, 0x80 @@ -312882,8 +312882,8 @@ _080ACC90: .4byte gUnknown_8118610 _080ACC94: .4byte gUnknown_811861C thumb_func_end GroundEffect_Select - thumb_func_start sub_80ACC98 -sub_80ACC98: + thumb_func_start GroundEffect_Cancel +GroundEffect_Cancel: push {r4-r7,lr} mov r7, r8 push {r7} @@ -312920,7 +312920,7 @@ _080ACCC0: bne _080ACCE2 _080ACCDC: adds r0, r1, 0 - bl sub_80AD080 + bl GroundEffect_Delete _080ACCE2: adds r0, r6, 0 movs r1, 0x80 @@ -312940,10 +312940,10 @@ _080ACCE2: .align 2, 0 _080ACD00: .4byte gUnknown_8118640 _080ACD04: .4byte gUnknown_3001B8C - thumb_func_end sub_80ACC98 + thumb_func_end GroundEffect_Cancel - thumb_func_start sub_80ACD08 -sub_80ACD08: + thumb_func_start GroundEffect_CancelBlank +GroundEffect_CancelBlank: push {r4-r7,lr} mov r7, r8 push {r7} @@ -312983,7 +312983,7 @@ _080ACD2C: cmp r0, 0 bne _080ACD5C adds r0, r6, 0 - bl sub_80AD080 + bl GroundEffect_Delete _080ACD5C: adds r0, r6, 0x1 lsls r0, 16 @@ -313003,7 +313003,7 @@ _080ACD5C: .align 2, 0 _080ACD7C: .4byte gUnknown_8118658 _080ACD80: .4byte gUnknown_3001B8C - thumb_func_end sub_80ACD08 + thumb_func_end GroundEffect_CancelBlank thumb_func_start sub_80ACD84 sub_80ACD84: @@ -313399,8 +313399,8 @@ _080AD078: .4byte gUnknown_812F1F8 _080AD07C: .4byte gUnknown_81186CC thumb_func_end GroundEffect_Add - thumb_func_start sub_80AD080 -sub_80AD080: + thumb_func_start GroundEffect_Delete +GroundEffect_Delete: push {r4,lr} adds r2, r0, 0 lsls r2, 16 @@ -313432,7 +313432,7 @@ sub_80AD080: _080AD0BC: .4byte gUnknown_3001B8C _080AD0C0: .4byte gUnknown_81186D8 _080AD0C4: .4byte 0x0000ffff - thumb_func_end sub_80AD080 + thumb_func_end GroundEffect_Delete thumb_func_start sub_80AD0C8 sub_80AD0C8: @@ -314398,7 +314398,7 @@ _080AD72C: cmp r0, 0x4 bne _080AD768 adds r0, r7, 0 - bl sub_80AD080 + bl GroundEffect_Delete b _080AD78A .align 2, 0 _080AD754: .4byte gUnknown_3001B8C |