Merge pull request #582 from MokhaLeee/ewramov

add ewram_overlay in lds
FireEmblemUniverse · Mar 3, 2024 · 4c0954d · 4c0954d
2 parents bf0175f + 01870d9
commit 4c0954d
Show file tree

Hide file tree

Showing 56 changed files with 1,302 additions and 1,298 deletions.
diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ ROM          := fireemblem8.gba
 ELF          := $(ROM:.gba=.elf)
 MAP          := $(ROM:.gba=.map)
 LDSCRIPT     := ldscript.txt
-SYM_FILES    := sym_iwram.txt sym_ewram.txt
+SYM_FILES    := sym_iwram.txt
 CFILES_GENERATED := $(C_SUBDIR)/msg_data.c
 CFILES       := $(wildcard $(C_SUBDIR)/*.c)
 ifeq (,$(findstring $(CFILES_GENERATED),$(CFILES)))

diff --git a/asm/banim-efxbattle.s b/asm/banim-efxbattle.s
@@ -318,7 +318,7 @@ sub_8053618: @ 0x08053618
 	movs r2, #0
 	bl BG_SetPosition
 	lsls r4, r4, #1
-	ldr r0, _08053670  @ gEfxBuf_0201C8D0 + 0x42
+	ldr r0, _08053670  @ gTmA_Banim + 0x42
 	adds r4, r4, r0
 	movs r0, #0x84
 	lsls r0, r0, #1
@@ -343,7 +343,7 @@ _08053668:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08053670: .4byte gEfxBuf_0201C8D0 + 0x42
+_08053670: .4byte gTmA_Banim + 0x42
 _08053674: .4byte gBG2TilemapBuffer
 
 	THUMB_FUNC_END sub_8053618
@@ -968,7 +968,7 @@ _08053B10:
 	lsls r0, r0, #2
 	adds r0, r0, r4
 	ldr r0, [r0]
-	ldr r1, _08053BAC  @ gUnknown_02016828
+	ldr r1, _08053BAC  @ gEfxTerrainPalette
 	movs r2, #8
 	bl CpuFastSet
 _08053B56:
@@ -1007,7 +1007,7 @@ _08053B9C: .4byte gUnknown_0200003C
 _08053BA0: .4byte 0x06011800
 _08053BA4: .4byte gEkrSpellAnimIndex
 _08053BA8: .4byte gBanimTerrainPaletteMaybe
-_08053BAC: .4byte gUnknown_02016828
+_08053BAC: .4byte gEfxTerrainPalette
 _08053BB0: .4byte gPaletteBuffer+0x260
 _08053BB4: .4byte gEkrDistanceType
 _08053BB8: .4byte gEkrBgPosition

diff --git a/asm/banim-ekrgauge.s b/asm/banim-ekrgauge.s
@@ -163,7 +163,7 @@ _080513BE:
 	movs r0, #1
 	bl BG_EnableSyncByMask
 _080513C4:
-	ldr r3, _08051424  @ gBanimSomeHp
+	ldr r3, _08051424  @ gEkrGaugeHpBak
 	ldr r0, _08051428  @ gEkrGaugeHp
 	movs r4, #0
 	ldrsh r2, [r3, r4]
@@ -212,7 +212,7 @@ _080513EE:
 	.align 2, 0
 _0805141C: .4byte gUnknown_08802428
 _08051420: .4byte gBG0TilemapBuffer
-_08051424: .4byte gBanimSomeHp
+_08051424: .4byte gEkrGaugeHpBak
 _08051428: .4byte gEkrGaugeHp
 _0805142C: .4byte gBanimMaxHP
 _08051430: .4byte gEkrDistanceType
@@ -353,7 +353,7 @@ _080514F4:
 	add r0, sp, #0xd0
 	movs r1, #0
 	str r1, [r0]
-	ldr r1, _080515BC  @ gUnknown_02016DC8
+	ldr r1, _080515BC  @ gUnk_Banim_02016DC8
 	ldr r2, _080515C0  @ 0x01000020
 	bl CpuFastSet
 	movs r0, #0
@@ -370,7 +370,7 @@ _0805154A:
 	lsls r0, r0, #5
 	ldr r1, _080515C4  @ gUnknown_088026E4
 	adds r0, r0, r1
-	ldr r7, _080515BC  @ gUnknown_02016DC8
+	ldr r7, _080515BC  @ gUnk_Banim_02016DC8
 	adds r1, r5, r7
 	movs r2, #0x10
 	bl CpuSet
@@ -420,7 +420,7 @@ _08051582:
 	str r4, [sp, #0x24]
 	b _08051602
 	.align 2, 0
-_080515BC: .4byte gUnknown_02016DC8
+_080515BC: .4byte gUnk_Banim_02016DC8
 _080515C0: .4byte 0x01000020
 _080515C4: .4byte gUnknown_088026E4
 _080515C8: .4byte 0x060139C0
@@ -594,7 +594,7 @@ _080516DA:
 	ldr r3, [sp, #0xd8]
 	cmp r3, #1
 	bne _08051726
-	ldr r1, _08051784  @ gUnknown_02016E48
+	ldr r1, _08051784  @ gUnk_Banim_02016E48
 	adds r0, r4, #0
 	bl sub_8050E40
 _08051726:
@@ -626,7 +626,7 @@ _0805174A:
 	ldr r1, [sp, #0xd8]
 	cmp r1, #1
 	bne _08051768
-	ldr r1, _08051788  @ gUnknown_02017248
+	ldr r1, _08051788  @ gUnk_Banim_02017248
 	adds r0, r4, #0
 	bl sub_8050E40
 _08051768:
@@ -641,8 +641,8 @@ _08051768:
 _08051778: .4byte gUnknown_085B940C
 _0805177C: .4byte 0xFFD80000
 _08051780: .4byte gUnknown_085B93D0
-_08051784: .4byte gUnknown_02016E48
-_08051788: .4byte gUnknown_02017248
+_08051784: .4byte gUnk_Banim_02016E48
+_08051788: .4byte gUnk_Banim_02017248
 _0805178C:
 	add r0, sp, #8
 	add r2, sp, #0xf4
@@ -748,7 +748,7 @@ _08051800:
 	ldr r3, [sp, #0xd8]
 	cmp r3, #1
 	bne _08051858
-	ldr r1, _080518B0  @ gUnknown_02017048
+	ldr r1, _080518B0  @ gUnk_Banim_02017048
 	adds r0, r4, #0
 	bl sub_8050E40
 _08051858:
@@ -780,7 +780,7 @@ _0805187C:
 	ldr r1, [sp, #0xd8]
 	cmp r1, #1
 	bne _0805189A
-	ldr r1, _080518B4  @ gUnknown_02017448
+	ldr r1, _080518B4  @ gUnk_Banim_02017448
 	adds r0, r4, #0
 	bl sub_8050E40
 _0805189A:
@@ -794,8 +794,8 @@ _0805189A:
 	.align 2, 0
 _080518A8: .4byte 0xFFD80000
 _080518AC: .4byte gUnknown_085B93D0
-_080518B0: .4byte gUnknown_02017048
-_080518B4: .4byte gUnknown_02017448
+_080518B0: .4byte gUnk_Banim_02017048
+_080518B4: .4byte gUnk_Banim_02017448
 _080518B8:
 	add r0, sp, #8
 	add r2, sp, #0xf4
@@ -819,7 +819,7 @@ _080518DC:
 	ldr r3, [sp, #0xd8]
 	cmp r3, #1
 	bne _080518EE
-	ldr r0, _08051A90  @ gUnknown_02016E48
+	ldr r0, _08051A90  @ gUnk_Banim_02016E48
 	ldr r1, _08051A94  @ 0x06013000
 	movs r2, #0x80
 	lsls r2, r2, #4
@@ -1030,7 +1030,7 @@ _08051A7E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08051A90: .4byte gUnknown_02016E48
+_08051A90: .4byte gUnk_Banim_02016E48
 _08051A94: .4byte 0x06013000
 _08051A98: .4byte gUnknown_085B9424
 _08051A9C: .4byte 0x0000B1D0

diff --git a/asm/code_battleanim.s b/asm/code_battleanim.s
@@ -104,7 +104,7 @@ _0805AF0E:
 	negs r1, r1
 	mov r9, r1
 	lsls r2, r4, #1
-	ldr r4, _0805AF94  @ gEfxBuf_0201C8D0 + 0x6B4
+	ldr r4, _0805AF94  @ gTmA_Banim + 0x6B4
 	adds r2, r2, r4
 	movs r0, #0xf
 	mov r8, r0
@@ -164,7 +164,7 @@ _0805AF0E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0805AF94: .4byte gEfxBuf_0201C8D0 + 0x6B4
+_0805AF94: .4byte gTmA_Banim + 0x6B4
 _0805AF98: .4byte 0xFFFFFA96
 _0805AF9C: .4byte gBG2TilemapBuffer
 
@@ -215,7 +215,7 @@ _0805AFF0:
 	movs r1, #1
 	negs r1, r1
 	lsls r2, r2, #1
-	ldr r3, _0805B018  @ gEfxBuf_0201C8D0 + 0x6B4
+	ldr r3, _0805B018  @ gTmA_Banim + 0x6B4
 	adds r2, r2, r3
 	movs r3, #0xf
 	str r3, [sp]
@@ -230,7 +230,7 @@ _0805AFF0:
 	bx r0
 	.align 2, 0
 _0805B014: .4byte gUnknown_080DAF60
-_0805B018: .4byte gEfxBuf_0201C8D0 + 0x6B4
+_0805B018: .4byte gTmA_Banim + 0x6B4
 
 	THUMB_FUNC_END sub_805AFA0