Skip to content
This repository has been archived by the owner on Nov 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #12 from MokhaLeee/ekrbattle
Browse files Browse the repository at this point in the history 
decomp banim ekrbattle and ekrlvupfan
  • Loading branch information
@StanHash
StanHash authored Feb 19, 2024
2 parents 56f9c92 + 867d0eb commit 5430c7e
Show file tree
Hide file tree
Showing 27 changed files with 4,323 additions and 4,658 deletions.
4,508 changes: 1,201 additions & 3,307 deletions asm/code-banim.s
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions asm/code-sio.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19648,13 +19648,13 @@ func_fe6_0803EE7C: @ 0x0803EE7C
movs r0, #4
bl EnableBgSync
bl RenderMap
bl func_fe6_08047CB8
bl PrepareBattleGraphicsMaybe_
lsls r0, r0, #0x18
cmp r0, #0
beq .L0803EEAC
movs r0, #1
bl func_fe6_0804256C
bl func_fe6_08047CC8
bl SetBanimLinkArenaFlag
bl BeginAnimsOnBattleAnimations
b .L0803EEC2
.align 2, 0
.L0803EEA8: .4byte gBg2Tm
Expand Down
8 changes: 4 additions & 4 deletions asm/code.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6366,7 +6366,7 @@ func_fe6_0808DE04: @ 0x0808DE04
mov r1, r8
movs r2, #1
adds r3, r5, #0
bl func_fe6_0805B644
bl EfxPalWhiteInOut
bl EnablePalSync
add sp, #4
pop {r3}
Expand Down Expand Up @@ -12587,7 +12587,7 @@ func_fe6_0809104C: @ 0x0809104C
adds r1, r4, #0
movs r2, #1
adds r3, r4, #0
bl func_fe6_0805B5C8
bl EfxPalBlackInOut
adds r0, r7, #0
adds r0, #0x20
adds r1, r5, #0
Expand All @@ -12597,7 +12597,7 @@ func_fe6_0809104C: @ 0x0809104C
adds r1, r4, #0
movs r2, #1
adds r3, r4, #0
bl func_fe6_0805B5C8
bl EfxPalBlackInOut
adds r5, #0x20
adds r6, #0x20
adds r4, #1
Expand Down Expand Up @@ -19564,7 +19564,7 @@ func_fe6_0809480C: @ 0x0809480C
adds r0, r4, #0
movs r1, #0
movs r2, #0x20
bl func_fe6_0805B5C8
bl EfxPalBlackInOut
ldr r2, .L08094854 @ =gPal
movs r1, #0x80
lsls r1, r1, #2
Expand Down
8 changes: 7 additions & 1 deletion data/data-banim.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@
BEGIN = 0x6A0000
END = 0x7FF0A4

.incbin "fe6-base.gba", BEGIN, (END - BEGIN)
.global banim_number
banim_number:
.incbin "fe6-base.gba", BEGIN, 8

.global banim_data
banim_data:
.incbin "fe6-base.gba", BEGIN + 8, (END - BEGIN - 8)
24 changes: 4 additions & 20 deletions data/data-code-banim.s
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@

.data

.global gUnk_085CB504
gUnk_085CB504: @ 085CB504
.incbin "fe6-base.gba", 0x5CB504, (0x5CB508 - 0x5CB504) @ length: 0004

.global gUnk_085CB508
gUnk_085CB508: @ 085CB508
.incbin "fe6-base.gba", 0x5CB508, (0x5CB528 - 0x5CB508) @ length: 0020

.global gUnk_085CB528
gUnk_085CB528: @ 085CB528
.incbin "fe6-base.gba", 0x5CB528, (0x5CB550 - 0x5CB528) @ length: 0028

.global gUnk_085CB550
gUnk_085CB550: @ 085CB550
.incbin "fe6-base.gba", 0x5CB550, (0x5CB568 - 0x5CB550) @ length: 0018

.global gUnk_085CB568
gUnk_085CB568: @ 085CB568
.global ProcScr_EkrGauge
ProcScr_EkrGauge: @ 085CB568
.incbin "fe6-base.gba", 0x5CB568, (0x5CB580 - 0x5CB568) @ length: 0018

.global gUnk_085CB580
Expand Down Expand Up @@ -257,8 +241,8 @@ gUnk_085CBDA0: @ 085CBDA0
gUnk_085CBDB0: @ 085CBDB0
.incbin "fe6-base.gba", 0x5CBDB0, (0x5CBDD8 - 0x5CBDB0) @ length: 0028

.global gUnk_085CBDD8
gUnk_085CBDD8: @ 085CBDD8
.global ProcScr_EkrChienCHR
ProcScr_EkrChienCHR: @ 085CBDD8
.incbin "fe6-base.gba", 0x5CBDD8, (0x5CBDF0 - 0x5CBDD8) @ length: 0018

.global gUnk_085CBDF0
Expand Down
14 changes: 11 additions & 3 deletions data/data.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,12 @@ gUnk_0869130C: @ 0869130C
gUnk_0869141C: @ 0869141C
.incbin "fe6-base.gba", 0x69141C, (0x691480 - 0x69141C) @ length: 0064

.global ProcScr_Unk_08691480
ProcScr_Unk_08691480: @ 08691480
/**
* PROC_START_CHILD_LOCKING(0x086921E8)
* PROC_END
*/
.global ProcScr_TitleScreenHandler
ProcScr_TitleScreenHandler: @ 08691480
.incbin "fe6-base.gba", 0x691480, (0x691494 - 0x691480) @ length: 0014

.global gUnk_08691494
Expand Down Expand Up @@ -820,7 +824,11 @@ gUnk_08692128: @ 08692128

.global gUnk_0869212C
gUnk_0869212C: @ 0869212C
.incbin "fe6-base.gba", 0x69212C, (0x692240 - 0x69212C) @ length: 0114
.incbin "fe6-base.gba", 0x69212C, (0x6921E8 - 0x69212C)

.global ProcScr_TitleScreen
ProcScr_TitleScreen: @ 086921E8
.incbin "fe6-base.gba", 0x6921E8, (0x692240 - 0x6921E8)

.global gUnk_08692240
gUnk_08692240: @ 08692240
Expand Down
20 changes: 10 additions & 10 deletions data/rodata_10F744.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,24 +257,24 @@ gUnk_081134C4: @ 081134C4
gUnk_08113564: @ 08113564
.incbin "fe6-base.gba", 0x113564, (0x113584 - 0x113564) @ length: 0020

.global gUnk_08113584
gUnk_08113584: @ 08113584
.global Img_EkrExpBar
Img_EkrExpBar: @ 08113584
.incbin "fe6-base.gba", 0x113584, (0x113884 - 0x113584) @ length: 0300

.global gUnk_08113884
gUnk_08113884: @ 08113884
.global Img_EkrExpBarChange
Img_EkrExpBarChange: @ 08113884
.incbin "fe6-base.gba", 0x113884, (0x113B84 - 0x113884) @ length: 0300

.global gUnk_08113B84
gUnk_08113B84: @ 08113B84
.global Img_BarNumfx
Img_BarNumfx: @ 08113B84
.incbin "fe6-base.gba", 0x113B84, (0x113CE4 - 0x113B84) @ length: 0160

.global gUnk_08113CE4
gUnk_08113CE4: @ 08113CE4
.global Tsa_EkrExpBar
Tsa_EkrExpBar: @ 08113CE4
.incbin "fe6-base.gba", 0x113CE4, (0x113D50 - 0x113CE4) @ length: 006C

.global gUnk_08113D50
gUnk_08113D50: @ 08113D50
.global Pal_EkrExpBar
Pal_EkrExpBar: @ 08113D50
.incbin "fe6-base.gba", 0x113D50, (0x113D70 - 0x113D50) @ length: 0020

.global gUnk_08113D70
Expand Down
56 changes: 39 additions & 17 deletions fe6.lds
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,24 @@ SECTIONS
. = __ewram_overlay_beg;
ewram_overlay_banim (NOLOAD) : ALIGN(4)
{
. = 0x000000; gUnk_Banim_02000000 = .;
. = 0x000010; gUnk_Banim_02000010 = .;
. = 0x000014; gUnk_Banim_02000014 = .;
. = 0x000018; gUnk_Banim_02000018 = .;
. = 0x00001C; gUnk_Banim_0200001C = .;
. = 0x000000; gAnims = .;
. = 0x000010; gEkrDebugTimer = .;
. = 0x000014; gEkrDebugFlag1 = .;
. = 0x000018; gEkrDebugFlag2 = .;
. = 0x00001C; gAnimC01Blocking = .;
. = 0x000020; gUnk_Banim_02000020 = .;
. = 0x000024; gUnk_Banim_02000024 = .;
. = 0x000028; gUnk_Banim_02000028 = .;
. = 0x00002C; gUnk_Banim_0200002C = .;
. = 0x000030; gUnk_Banim_02000030 = .;
. = 0x000030; gEkrBg0QuakeVec = .;
. = 0x000034; gUnk_Banim_02000034 = .;
. = 0x00003C; gUnk_Banim_0200003C = .;
. = 0x000044; gUnk_Banim_02000044 = .;
. = 0x00004C; gUnk_Banim_0200004C = .;
. = 0x000054; gUnk_Banim_02000054 = .;
. = 0x000058; gUnk_Banim_02000058 = .;
. = 0x00005C; gUnk_Banim_0200005C = .;
. = 0x000060; gUnk_Banim_02000060 = .;
. = 0x00005C; gpProcEkrBattle = .;
. = 0x000060; gpProcEkrGauge = .;
. = 0x000064; gUnk_Banim_02000064 = .;
. = 0x000080; gUnk_Banim_02000080 = .;
. = 0x001080; gUnk_Banim_02001080 = .;
Expand Down Expand Up @@ -139,15 +139,15 @@ SECTIONS
. = 0x0176D8; gUnk_Banim_020176D8 = .;
. = 0x0176E8; gUnk_Banim_020176E8 = .;
. = 0x0176F8; gUnk_Banim_020176F8 = .;
. = 0x01771C; gUnk_Banim_0201771C = .;
. = 0x017720; gUnk_Banim_02017720 = .;
. = 0x01771C; gEkrBattleEndFlag = .;
. = 0x017720; gEkrHPBarCount = .;
. = 0x017724; gUnk_Banim_02017724 = .;
. = 0x017728; gUnk_Banim_02017728 = .;
. = 0x01772C; gUnk_Banim_0201772C = .;
. = 0x017730; gUnk_Banim_02017730 = .;
. = 0x017730; gEkrDeadEventExist = .;
. = 0x017734; gUnk_Banim_02017734 = .;
. = 0x017738; gUnk_Banim_02017738 = .;
. = 0x01773C; gUnk_Banim_0201773C = .;
. = 0x01773C; gEkrInitPosReal = .;
. = 0x017740; gUnk_Banim_02017740 = .;
. = 0x017744; gUnk_Banim_02017744 = .;
. = 0x017748; gUnk_Banim_02017748 = .;
Expand All @@ -163,7 +163,7 @@ SECTIONS
. = 0x017774; gUnk_Banim_02017774 = .;
. = 0x017778; gUnk_Banim_02017778 = .;
. = 0x01777C; gUnk_Banim_0201777C = .;
. = 0x01947C; gUnk_Banim_0201947C = .;
. = 0x01947C; gEkrBarfxBuf = .;
. = 0x01977C; gUnk_Banim_0201977C = .;
. = 0x019F7C; gUnk_Banim_02019F7C = .;
. = 0x01A77C; gUnk_Banim_0201A77C = .;
Expand All @@ -184,10 +184,10 @@ SECTIONS
. = 0x01E0F4; gUnk_Banim_0201E0F4 = .;
. = 0x01E0F8; gUnk_Banim_0201E0F8 = .;
. = 0x01E0FC; gUnk_Banim_0201E0FC = .;
. = 0x01E124; gUnk_Banim_0201E124 = .;
. = 0x01E12C; gUnk_Banim_0201E12C = .;
. = 0x01E124; gBanimDoneFlag = .;
. = 0x01E12C; gEkrBgPosition = .;
. = 0x01E138; gUnk_Banim_0201E138 = .;
. = 0x01E13C; gUnk_Banim_0201E13C = .;
. = 0x01E13C; gpImgSheet = .;
. = 0x01E144; gUnk_Banim_0201E144 = .;
. = 0x01E14C; gUnk_Banim_0201E14C = .;
. = 0x01E150; gUnk_Banim_0201E150 = .;
Expand Down Expand Up @@ -270,7 +270,25 @@ SECTIONS
. = 0x0203C9D4 - __ewram_overlay_end;
. = ALIGN(4); src/ui.o(ewram_data);
. = ALIGN(4); src/mapselect.o(ewram_data);
. = ALIGN(4); . = . + 0x100; /* TODO */

. = 0x0203CCE4 - __ewram_overlay_end;
. = ALIGN(4); src/banim_ekrbattle.o(ewram_data);

. = 0x0203CCF2 - __ewram_overlay_end; gBanimBackgroundIndex = .;
. = 0x0203CCF4 - __ewram_overlay_end; gEkrInitialHitSide = .;
. = 0x0203CCF6 - __ewram_overlay_end; gEkrSnowWeather = .;
. = 0x0203CCF8 - __ewram_overlay_end; gEkrPairSideVaild = .;
. = 0x0203CD14 - __ewram_overlay_end; gEkrDistanceType = .;
. = 0x0203CD7C - __ewram_overlay_end; gpEkrBattleUnitLeft = .;
. = 0x0203CD80 - __ewram_overlay_end; gpEkrBattleUnitRight = .;
. = 0x0203CD84 - __ewram_overlay_end; gEkrPids = .;
. = 0x0203CD88 - __ewram_overlay_end; gpEkrTriangleUnits = .;
. = 0x0203CDA0 - __ewram_overlay_end; gEkrGaugeHp = .;
. = 0x0203CDB8 - __ewram_overlay_end; gEkrPairExpPrevious = .;
. = 0x0203CDBC - __ewram_overlay_end; gEkrPairExpGain = .;
. = 0x0203CDCC - __ewram_overlay_end; gEkrPairEffectiveAgainst = .;

. = 0x0203CDE4 - __ewram_overlay_end;
. = ALIGN(4); src/manim.o(ewram_data);
. = ALIGN(4); gUnk_0203D354 = .; . = . + 4;
. = ALIGN(4); gUnk_0203D358 = .; . = . + 4;
Expand Down Expand Up @@ -497,6 +515,8 @@ SECTIONS
src/ui.o(.text);
src/menu.o(.text);
src/mapselect.o(.text);
src/banim_ekrbattle.o(.text);
src/banim_ekrlvupfan.o(.text);
asm/code-banim.o(.text);
src/mu.o(.text);
src/manim.o(.text);
Expand Down Expand Up @@ -672,6 +692,8 @@ SECTIONS
. = ALIGN(4); src/ui.o(.data);
. = ALIGN(4); src/menu.o(.data);
. = ALIGN(4); src/mapselect.o(.data);
. = ALIGN(4); src/banim_ekrbattle.o(.data);
. = ALIGN(4); src/banim_ekrlvupfan.o(.data);
. = ALIGN(4); data/data-code-banim.o(.data);
. = ALIGN(4); src/gamedata.o(.data);
. = ALIGN(4), data/data-game-info.o(.data);
Expand Down
Loading

0 comments on commit 5430c7e

Please sign in to comment.