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

Commit 82831d1

Browse files
StanHashStanHash
committed
major filename and structure rework + m4a refactor
1 parent a39f3e0 commit 82831d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+4706
-4714
lines changed

Diff for: ‎.gitignore

-6
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Temporary Items
5757
*.elf
5858
*.map
5959
*.o
60-
src/*.s
6160
src/*.asm
6261
*.dump
6362
tools/agbcc
@@ -930,8 +929,3 @@ MigrationBackup/
930929
*.rep
931930

932931
.vscode
933-
934-
!src/lib/
935-
!asm/lib/
936-
src/lib/*.s
937-
src/lib/*.asm

Diff for: ‎TODO

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
- flatten dir structure (include/gba -> include, src/lib -> src, asm/lib -> src)
1+
- flatten dir structure (include/gba -> include)
22
- name remaining ewram symbols
33
- decompile the rest of the game
44
- priorities: code_manim > other code (event, statscreen, prepscreen and save might be good to do next) > code_banim > code_sio
5+
- clean up hard asm (not decompilable) in asm/ and move them to src/
56
- dump data (lmao)

Diff for: ‎asm/code-banim.s

+6-6
Original file line numberDiff line numberDiff line change
@@ -50611,12 +50611,12 @@ func_fe6_0805BD64: @ 0x0805BD64
5061150611
thumb_func_start func_fe6_0805BD8C
5061250612
func_fe6_0805BD8C: @ 0x0805BD8C
5061350613
push {lr}
50614-
ldr r0, .L0805BD98 @ =gMpi_FightBgm
50614+
ldr r0, .L0805BD98 @ =gMusicPlayer_FightBgm
5061550615
bl m4aMPlayStop
5061650616
pop {r0}
5061750617
bx r0
5061850618
.align 2, 0
50619-
.L0805BD98: .4byte gMpi_FightBgm
50619+
.L0805BD98: .4byte gMusicPlayer_FightBgm
5062050620

5062150621
thumb_func_start func_fe6_0805BD9C
5062250622
func_fe6_0805BD9C: @ 0x0805BD9C
@@ -50679,7 +50679,7 @@ func_fe6_0805BDC0: @ 0x0805BDC0
5067950679
movs r1, #0x78
5068050680
subs r5, r1, r0
5068150681
.L0805BE04:
50682-
ldr r2, .L0805BE2C @ =gMPlayTable
50682+
ldr r2, .L0805BE2C @ =gMusicPlayerTable
5068350683
ldr r0, .L0805BE30 @ =gSongTable
5068450684
lsls r1, r4, #3
5068550685
adds r1, r1, r0
@@ -50698,11 +50698,11 @@ func_fe6_0805BDC0: @ 0x0805BDC0
5069850698
bl m4aMPlayPanpotControl
5069950699
b .L0805BE68
5070050700
.align 2, 0
50701-
.L0805BE2C: .4byte gMPlayTable
50701+
.L0805BE2C: .4byte gMusicPlayerTable
5070250702
.L0805BE30: .4byte gSongTable
5070350703
.L0805BE34: .4byte 0x0000FFFF
5070450704
.L0805BE38:
50705-
ldr r2, .L0805BE70 @ =gMPlayTable
50705+
ldr r2, .L0805BE70 @ =gMusicPlayerTable
5070650706
ldr r0, .L0805BE74 @ =gSongTable
5070750707
lsls r1, r4, #3
5070850708
adds r1, r1, r0
@@ -50728,7 +50728,7 @@ func_fe6_0805BDC0: @ 0x0805BDC0
5072850728
pop {r0}
5072950729
bx r0
5073050730
.align 2, 0
50731-
.L0805BE70: .4byte gMPlayTable
50731+
.L0805BE70: .4byte gMusicPlayerTable
5073250732
.L0805BE74: .4byte gSongTable
5073350733
.L0805BE78: .4byte 0x0000FFFF
5073450734

Diff for: ‎asm/code-sio.s

+4-4
Original file line numberDiff line numberDiff line change
@@ -8191,7 +8191,7 @@ func_fe6_0803912C: @ 0x0803912C
81918191
ands r0, r1
81928192
cmp r0, #0
81938193
beq .L08039162
8194-
ldr r2, .L0803916C @ =gMPlayTable
8194+
ldr r2, .L0803916C @ =gMusicPlayerTable
81958195
ldr r1, .L08039170 @ =gSongTable
81968196
ldr r0, .L08039174 @ =0x0000040C
81978197
adds r1, r1, r0
@@ -8211,7 +8211,7 @@ func_fe6_0803912C: @ 0x0803912C
82118211
bx r0
82128212
.align 2, 0
82138213
.L08039168: .4byte gKeySt
8214-
.L0803916C: .4byte gMPlayTable
8214+
.L0803916C: .4byte gMusicPlayerTable
82158215
.L08039170: .4byte gSongTable
82168216
.L08039174: .4byte 0x0000040C
82178217

@@ -23478,13 +23478,13 @@ func_fe6_08040C00: @ 0x08040C00
2347823478
thumb_func_start func_fe6_08040C7C
2347923479
func_fe6_08040C7C: @ 0x08040C7C
2348023480
push {lr}
23481-
ldr r1, .L08040C8C @ =gMpi_MainBgm
23481+
ldr r1, .L08040C8C @ =gMusicPlayer_MainBgm
2348223482
movs r0, #0x22
2348323483
bl StartBgm
2348423484
pop {r0}
2348523485
bx r0
2348623486
.align 2, 0
23487-
.L08040C8C: .4byte gMpi_MainBgm
23487+
.L08040C8C: .4byte gMusicPlayer_MainBgm
2348823488

2348923489
thumb_func_start func_fe6_08040C90
2349023490
func_fe6_08040C90: @ 0x08040C90

Diff for: ‎asm/code.s

+14-14
Original file line numberDiff line numberDiff line change
@@ -3010,49 +3010,49 @@ func_fe6_0806CF88: @ 0x0806CF88
30103010
thumb_func_start func_fe6_0806CFA0
30113011
func_fe6_0806CFA0: @ 0x0806CFA0
30123012
push {lr}
3013-
ldr r0, .L0806CFB0 @ =gMpi_MainBgm
3013+
ldr r0, .L0806CFB0 @ =gMusicPlayer_MainBgm
30143014
ldr r1, .L0806CFB4 @ =0x0857B774
3015-
bl MPlayStart
3015+
bl m4aMPlayStart
30163016
pop {r0}
30173017
bx r0
30183018
.align 2, 0
3019-
.L0806CFB0: .4byte gMpi_MainBgm
3019+
.L0806CFB0: .4byte gMusicPlayer_MainBgm
30203020
.L0806CFB4: .4byte 0x0857B774
30213021

30223022
thumb_func_start func_fe6_0806CFB8
30233023
func_fe6_0806CFB8: @ 0x0806CFB8
30243024
push {lr}
3025-
ldr r0, .L0806CFC8 @ =gMpi_MainBgm
3025+
ldr r0, .L0806CFC8 @ =gMusicPlayer_MainBgm
30263026
ldr r1, .L0806CFCC @ =0x0857C95C
3027-
bl MPlayStart
3027+
bl m4aMPlayStart
30283028
pop {r0}
30293029
bx r0
30303030
.align 2, 0
3031-
.L0806CFC8: .4byte gMpi_MainBgm
3031+
.L0806CFC8: .4byte gMusicPlayer_MainBgm
30323032
.L0806CFCC: .4byte 0x0857C95C
30333033

30343034
thumb_func_start func_fe6_0806CFD0
30353035
func_fe6_0806CFD0: @ 0x0806CFD0
30363036
push {lr}
3037-
ldr r0, .L0806CFE0 @ =gMpi_MainBgm
3037+
ldr r0, .L0806CFE0 @ =gMusicPlayer_MainBgm
30383038
ldr r1, .L0806CFE4 @ =0x0857C1E4
3039-
bl MPlayStart
3039+
bl m4aMPlayStart
30403040
pop {r0}
30413041
bx r0
30423042
.align 2, 0
3043-
.L0806CFE0: .4byte gMpi_MainBgm
3043+
.L0806CFE0: .4byte gMusicPlayer_MainBgm
30443044
.L0806CFE4: .4byte 0x0857C1E4
30453045

30463046
thumb_func_start func_fe6_0806CFE8
30473047
func_fe6_0806CFE8: @ 0x0806CFE8
30483048
push {lr}
3049-
ldr r0, .L0806CFF8 @ =gMpi_MainBgm
3049+
ldr r0, .L0806CFF8 @ =gMusicPlayer_MainBgm
30503050
ldr r1, .L0806CFFC @ =0x0857A61C
3051-
bl MPlayStart
3051+
bl m4aMPlayStart
30523052
pop {r0}
30533053
bx r0
30543054
.align 2, 0
3055-
.L0806CFF8: .4byte gMpi_MainBgm
3055+
.L0806CFF8: .4byte gMusicPlayer_MainBgm
30563056
.L0806CFFC: .4byte 0x0857A61C
30573057

30583058
thumb_func_start func_fe6_0806D000
@@ -89436,7 +89436,7 @@ func_fe6_08097E2C: @ 0x08097E2C
8943689436
sub sp, #8
8943789437
mov r7, sp
8943889438
str r0, [r7]
89439-
ldr r0, .L08097E6C @ =gMPlayTable
89439+
ldr r0, .L08097E6C @ =gMusicPlayerTable
8944089440
ldr r2, .L08097E70 @ =gSongTable
8944189441
adds r1, r2, #0
8944289442
movs r1, #0xe6
@@ -89465,7 +89465,7 @@ func_fe6_08097E2C: @ 0x08097E2C
8946589465
movs r0, #0
8946689466
b .L08097E7A
8946789467
.align 2, 0
89468-
.L08097E6C: .4byte gMPlayTable
89468+
.L08097E6C: .4byte gMusicPlayerTable
8946989469
.L08097E70: .4byte gSongTable
8947089470
.L08097E74:
8947189471
.byte 0x01, 0xE0

Diff for: ‎asm/lib/agb-syscall.s renamed to ‎asm/gbasyscall.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.include "macro.inc"
2-
.include "gba.inc"
2+
.include "asm_gbaio.inc"
33

44
.syntax unified
55

Diff for: ‎asm/include/m4a.inc

-199
This file was deleted.

0 commit comments

Comments
 (0)