mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-07 19:30:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use more macros

Browse Source
This commit is contained in:
octorock
2021-11-01 16:38:19 +01:00
parent 9c3ac2ecbf
commit 1a0f416bac
31 changed files with 6134 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/code_080043E8.s
+1 -1635
View File
File diff suppressed because it is too large Load Diff
asm/code_08007CAC.s
+52
View File
@@ -0,0 +1,52 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
gUnk_08007CAC:: @ 08007CAC
.incbin "code_080043E8/gUnk_08007CAC.bin"
.ifdef DEMO_JP
@ TODO only one byte differs
.incbin "code_080043E8/gUnk_08007CAC_1_DEMO_JP.bin"
.else
.ifdef DEMO_USA
@ TODO only one byte differs
.incbin "code_080043E8/gUnk_08007CAC_2_DEMO_USA.bin"
.else
.ifdef JP
@ TODO only one byte differs
.incbin "code_080043E8/gUnk_08007CAC_3_JP.bin"
.else
.ifdef EU
@ TODO only two bytes differ
.incbin "code_080043E8/gUnk_08007CAC_4_EU.bin"
.else
.incbin "code_080043E8/gUnk_08007CAC_5_USA.bin"
.endif
.endif
.endif
.endif
non_word_aligned_thumb_func_start sub_08007DD6
sub_08007DD6: @ 0x08007DD6
push {lr}
bl sub_08007DE0
adds r0, r3, #0
pop {pc}
thumb_func_start sub_08007DE0
sub_08007DE0: @ 0x08007DE0
subs r1, #4
_08007DE2:
adds r1, #4
ldrh r3, [r1]
cmp r3, #0
beq _08007DF2
cmp r0, r3
bne _08007DE2
ldrh r3, [r1, #2]
movs r2, #1
_08007DF2:
bx lr
asm/code_0801C85C.s
+2 -2
View File
@@ -605,7 +605,7 @@ sub_0801CCB0: @ 0x0801CCB0
cmp r0, r1
beq _0801CCE0
strb r1, [r4, #8]
ldr r0, _0801CD1C @ =gSpriteAnimation_322
ldr r0, _0801CD1C @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
@@ -643,7 +643,7 @@ _0801CCF4:
strb r0, [r3]
b _0801CD4C
.align 2, 0
_0801CD1C: .4byte gSpriteAnimation_322
_0801CD1C: .4byte gSpriteAnimations_322
_0801CD20: .4byte gUnk_0200AF13
_0801CD24: .4byte gSave
_0801CD28:
asm/code_080A3BD0.s
+4 -4
View File
@@ -3424,7 +3424,7 @@ _080A4C42:
orrs r2, r0
ldr r0, _080A4D44 @ =gOamCmd
strh r2, [r0, #8]
ldr r1, _080A4D48 @ =gSpriteAnimation_322
ldr r1, _080A4D48 @ =gSpriteAnimations_322
lsls r0, r3, #2
adds r0, r0, r1
ldr r0, [r0]
@@ -3542,7 +3542,7 @@ _080A4D36:
.align 2, 0
_080A4D40: .4byte gQuiverSizes
_080A4D44: .4byte gOamCmd
_080A4D48: .4byte gSpriteAnimation_322
_080A4D48: .4byte gSpriteAnimations_322
_080A4D4C: .4byte 0x00000141
_080A4D50EU: .4byte gChooseFileState
_080A4D54EU: .4byte gUnk_08128B64
@@ -3646,7 +3646,7 @@ _080A542E:
orrs r2, r0
ldr r0, _080A5530 @ =gOamCmd
strh r2, [r0, #8]
ldr r1, _080A5534 @ =gSpriteAnimation_322
ldr r1, _080A5534 @ =gSpriteAnimations_322
lsls r0, r3, #2
adds r0, r0, r1
ldr r0, [r0]
@@ -3764,7 +3764,7 @@ _080A5522:
.align 2, 0
_080A552C: .4byte gQuiverSizes
_080A5530: .4byte gOamCmd
_080A5534: .4byte gSpriteAnimation_322
_080A5534: .4byte gSpriteAnimations_322
_080A5538: .4byte gMenu
_080A553C: .4byte gUnk_08128B64
_080A5540: .4byte gMain
asm/code_080A5574.s
+14 -14
View File
@@ -494,7 +494,7 @@ _080A50E4:
_080A50E8:
strh r0, [r4, #2]
_080A50EA:
ldr r0, _080A5190 @ =gSpriteAnimation_322
ldr r0, _080A5190 @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
@@ -578,7 +578,7 @@ _080A5188:
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5190: .4byte gSpriteAnimation_322
_080A5190: .4byte gSpriteAnimations_322
_080A5194: .4byte 0x00000141
_080A5198: .4byte gChooseFileState
_080A519C: .4byte gOamCmd
@@ -700,7 +700,7 @@ _080A58D0:
_080A58D4:
strh r0, [r4, #2]
_080A58D6:
ldr r0, _080A5980 @ =gSpriteAnimation_322
ldr r0, _080A5980 @ =gSpriteAnimations_322
lsls r1, r1, #2
adds r1, r1, r0
ldr r0, [r1]
@@ -785,7 +785,7 @@ _080A5976:
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A5980: .4byte gSpriteAnimation_322
_080A5980: .4byte gSpriteAnimations_322
_080A5984: .4byte gMenu
_080A5988: .4byte gOamCmd
_080A598C: .4byte gSave
@@ -1349,7 +1349,7 @@ _080A558C:
beq _080A55BE
movs r0, #0x18
strh r0, [r5]
ldr r0, _080A56A8 @ =gSpriteAnimation_322
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa0
lsls r1, r1, #1
adds r0, r0, r1
@@ -1364,7 +1364,7 @@ _080A55BE:
beq _080A55DE
movs r0, #0x2e
strh r0, [r5]
ldr r0, _080A56A8 @ =gSpriteAnimation_322
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa4
lsls r1, r1, #1
adds r0, r0, r1
@@ -1382,7 +1382,7 @@ _080A55DE:
movs r0, #0xe0
lsls r0, r0, #2
strh r0, [r5, #8]
ldr r0, _080A56A8 @ =gSpriteAnimation_322
ldr r0, _080A56A8 @ =gSpriteAnimations_322
movs r1, #0xa2
lsls r1, r1, #1
adds r0, r0, r1
@@ -1469,7 +1469,7 @@ _080A5698EU: .4byte gUnk_08128D3C
_080A569CEU: .4byte gOamCmd
_080A56A0: .4byte gChooseFileState
_080A56A4: .4byte gMain
_080A56A8: .4byte gSpriteAnimation_322
_080A56A8: .4byte gSpriteAnimations_322
_080A56ACEU: .4byte 0x00000143
_080A56B0: .4byte gUnk_02019EE0
_080A56B4: .4byte gScreen
@@ -1605,7 +1605,7 @@ _080A5D9A:
beq _080A5DCC
movs r0, #0x18
strh r0, [r5]
ldr r0, _080A5EB4 @ =gSpriteAnimation_322
ldr r0, _080A5EB4 @ =gSpriteAnimations_322
movs r1, #0xa0
lsls r1, r1, #1
adds r0, r0, r1
@@ -1621,7 +1621,7 @@ _080A5DCC:
beq _080A5DEE
movs r0, #0x2e
strh r0, [r5]
ldr r0, _080A5EB4 @ =gSpriteAnimation_322
ldr r0, _080A5EB4 @ =gSpriteAnimations_322
movs r1, #0xa4
lsls r1, r1, #1
adds r0, r0, r1
@@ -1640,7 +1640,7 @@ _080A5DEE:
movs r0, #0xe0
lsls r0, r0, #2
strh r0, [r5, #8]
ldr r1, _080A5EB4 @ =gSpriteAnimation_322
ldr r1, _080A5EB4 @ =gSpriteAnimations_322
movs r0, #0xa2
lsls r0, r0, #1
adds r1, r1, r0
@@ -1725,7 +1725,7 @@ _080A5EA4: .4byte gOamCmd
_080A5EA8: .4byte gMenu
_080A5EAC: .4byte gMain
_080A5EB0: .4byte 0x000001FB
_080A5EB4: .4byte gSpriteAnimation_322
_080A5EB4: .4byte gSpriteAnimations_322
_080A5EB8: .4byte gUnk_02019EE0
_080A5EBC: .4byte gScreen
_080A5EC0:
@@ -1822,7 +1822,7 @@ _080A5F5C:
lsls r0, r1, #5
ldr r1, _080A5FA0 @ =0x06010000
adds r5, r0, r1
ldr r1, _080A5FA4 @ =gSpriteAnimation_322
ldr r1, _080A5FA4 @ =gSpriteAnimations_322
lsls r0, r4, #2
adds r0, r0, r1
ldr r0, [r0]
@@ -1853,7 +1853,7 @@ _080A5F5C:
.align 2, 0
_080A5F9C: .4byte gSave
_080A5FA0: .4byte 0x06010000
_080A5FA4: .4byte gSpriteAnimation_322
_080A5FA4: .4byte gSpriteAnimations_322
_080A5FA8: .4byte gMoreSpritePtrs
_080A5FAC: .4byte 0x040000D4
_080A5FB0: .4byte 0x84000040
asm/macros.inc
+1
View File
@@ -4,3 +4,4 @@
.include "asm/macros/map.inc"
.include "asm/macros/entity.inc"
.include "asm/macros/music_voice.inc"
.include "asm/macros/gfx.inc"
asm/macros/gfx.inc
+17
View File
@@ -33,4 +33,21 @@
.2byte \first_tile_index
.endm
.macro keyframe frame_index:req, duration=0, bitfield=0, bitfield2=0
.byte \frame_index, \duration, \bitfield, \bitfield2
.endm
.macro fixed_gfx src:req, size=0, compressed=0
.4byte (\src - ptr_gGlobalGfxAndPalettes) + \compressed + (\size/0x200 << 24)
.endm
.macro extra_offset x:req, y:req
.byte \x, \y
.endm
.macro obj x:req, y:req, bitfield=0, bitfield2=0
.byte \x, \y, \bitfield
.2byte \bitfield2
.endm
.endif @ GUARD_ASM_MACROS_GFX_INC
asm/macros/map.inc
+11
View File
@@ -80,4 +80,15 @@
map_data \src_offset, gUnk_02019EE0, \size, \compressed, \terminator
.endm
.macro exit_list_end
.4byte 0xffff, 0,0,0,0
.endm
.macro exit transition:req, x=0, y=0, destX=0, destY=0, screenEdge=0, destArea=0, destRoom=0, unknown=0, unknown2=0, unknown3=0, unknown4=0, padding=0
.2byte \transition, \x, \y, \destX, \destY
.byte \screenEdge, \destArea, \destRoom, \unknown, \unknown2, \unknown3
.2byte \unknown4, \padding
.endm
.endif @ GUARD_ASM_MACROS_MAP_INC