Merge branch 'master' into data_dump

This commit is contained in:
ultima-soul
2019-12-04 11:44:52 -08:00
135 changed files with 3960 additions and 6923 deletions
+4 -4
View File
@@ -1219,7 +1219,7 @@ sub_80EF5AC: @ 80EF5AC
lsls r0, r1, 1
adds r0, r1
lsls r0, 3
ldr r1, _080EF678 @ =gUnknown_82606F4
ldr r1, _080EF678 @ =gBallSpriteTemplates
adds r0, r1
movs r1, 0x20
movs r2, 0x50
@@ -1298,7 +1298,7 @@ sub_80EF5AC: @ 80EF5AC
bx r0
.align 2, 0
_080EF674: .4byte gLastUsedItem
_080EF678: .4byte gUnknown_82606F4
_080EF678: .4byte gBallSpriteTemplates
_080EF67C: .4byte gSprites
_080EF680: .4byte gBattleAnimTarget
_080EF684: .4byte sub_80EF8C0
@@ -1387,7 +1387,7 @@ _080EF708:
lsls r0, r4, 1
adds r0, r4
lsls r0, 3
ldr r1, _080EF7CC @ =gUnknown_82606F4
ldr r1, _080EF7CC @ =gBallSpriteTemplates
adds r0, r1
movs r1, 0x20
orrs r5, r1
@@ -1458,7 +1458,7 @@ _080EF708:
.align 2, 0
_080EF7C4: .4byte gSaveBlock2Ptr
_080EF7C8: .4byte gLastUsedItem
_080EF7CC: .4byte gUnknown_82606F4
_080EF7CC: .4byte gBallSpriteTemplates
_080EF7D0: .4byte gSprites
_080EF7D4: .4byte gBattleAnimTarget
_080EF7D8: .4byte SpriteCallbackDummy
+2 -2
View File
@@ -709,11 +709,11 @@ _080480A4: .4byte sub_8048128
GetHealthboxElementGfxPtr: @ 80480A8
lsls r0, 24
lsrs r0, 19
ldr r1, _080480B4 @ =gUnknown_8D11BC4
ldr r1, _080480B4 @ =gHealthboxElementsGfxTable
adds r0, r1
bx lr
.align 2, 0
_080480B4: .4byte gUnknown_8D11BC4
_080480B4: .4byte gHealthboxElementsGfxTable
thumb_func_end GetHealthboxElementGfxPtr
thumb_func_start sub_80480B8
+1 -1
View File
@@ -5484,7 +5484,7 @@ sub_810A9D4: @ 810A9D4
mov r2, r8
ldrh r1, [r2, 0x10]
movs r2, 0x2
bl sub_809C09C
bl RecordItemPurchase
mov r3, r8
ldrb r0, [r3]
ldr r4, _0810AAE4 @ =gUnknown_203ACFC
-2896
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -10638,7 +10638,7 @@ _08139CDA:
lsls r0, r4, 1
adds r0, r4
lsls r0, 3
ldr r1, _08139D40 @ =gUnknown_82606F4
ldr r1, _08139D40 @ =gBallSpriteTemplates
adds r0, r1
movs r1, 0x6A
movs r2, 0x58
@@ -10677,7 +10677,7 @@ _08139CDA:
pop {r0}
bx r0
.align 2, 0
_08139D40: .4byte gUnknown_82606F4
_08139D40: .4byte gBallSpriteTemplates
_08139D44: .4byte gUnknown_203B140
_08139D48: .4byte 0x0000300c
_08139D4C: .4byte gSprites
-3563
View File
File diff suppressed because it is too large Load Diff