Merge branch 'main' of github.com:SAT-R/sa1

This commit is contained in:
JaceCear committed 2025-12-05 14:10:38 +01:00
commit 5604688d56
45 files changed
+729 -641

No files matched your search

+7
View File
@@ -0,0 +1,7 @@
{
"files.associations": {
"__locale": "c",
"global.h": "c",
"flash_internal.h": "c"
}
}
+1
View File
@@ -1,3 +1,4 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
mSectionRodata
+6 -3
View File
@@ -1,6 +1,9 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
mSectionRodata
.align 2 , 0
.global gMultiBootProgram_TinyChaoGarden
gMultiBootProgram_TinyChaoGarden:
.global C_DECL(gMultiBootProgram_TinyChaoGarden)
C_DECL(gMultiBootProgram_TinyChaoGarden):
.incbin "baserom_sa1.gba", 0x0009C170, 0x1EDD4
+14 -13
View File
@@ -1,25 +1,26 @@
.include "asm/macros/portable.inc"
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.section .rodata
mSectionRodata
.space 0x100
.global gDemoRecordings
gDemoRecordings:
.global C_DECL(gDemoRecordings)
C_DECL(gDemoRecordings):
mPtr demo1
mPtr demo2
mPtr demo3
mPtr demo4
.global gUnknown_087BF8DC
gUnknown_087BF8DC:
mPtr gUnknown_08487358
mPtr gUnknown_08487BBC
mPtr gUnknown_0848872C
mPtr gUnknown_08489308
mPtr gUnknown_08489F5C
mPtr gUnknown_0848ADB4
mPtr gUnknown_0848BA80
.global C_DECL(gUnknown_087BF8DC)
C_DECL(gUnknown_087BF8DC):
mPtr C_DECL(gUnknown_08487358)
mPtr C_DECL(gUnknown_08487BBC)
mPtr C_DECL(gUnknown_0848872C)
mPtr C_DECL(gUnknown_08489308)
mPtr C_DECL(gUnknown_08489F5C)
mPtr C_DECL(gUnknown_0848ADB4)
mPtr C_DECL(gUnknown_0848BA80)
.ascii "CODRED\0\0"
.ascii "NIMDA \0\0"
.ascii "CIRCAM\0\0"
+23 -22
View File
@@ -1,43 +1,44 @@
.include "asm/macros/portable.inc"
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.section .rodata
mSectionRodata
.global gMultiboot_087C0258
gMultiboot_087C0258:
.global C_DECL(gMultiboot_087C0258)
C_DECL(gMultiboot_087C0258):
.incbin "baserom_sa1.gba", 0x007C0258, 0x20A0
.global gMultiboot_087C22F8
gMultiboot_087C22F8:
.global C_DECL(gMultiboot_087C22F8)
C_DECL(gMultiboot_087C22F8):
.incbin "baserom_sa1.gba", 0x007C22F8, 0x8000
.global gUnknown_087CA2F8
gUnknown_087CA2F8:
.global C_DECL(gUnknown_087CA2F8)
C_DECL(gUnknown_087CA2F8):
.incbin "baserom_sa1.gba", 0x007CA2F8, 0x8000
.global gUnknown_087D22F8
gUnknown_087D22F8:
.global C_DECL(gUnknown_087D22F8)
C_DECL(gUnknown_087D22F8):
.incbin "baserom_sa1.gba", 0x007D22F8, 0x5B88
.global gUnknown_087D7E80
gUnknown_087D7E80:
.global C_DECL(gUnknown_087D7E80)
C_DECL(gUnknown_087D7E80):
.incbin "baserom_sa1.gba", 0x007D7E80, 0x8000
.global gUnknown_087DFE80
gUnknown_087DFE80:
.global C_DECL(gUnknown_087DFE80)
C_DECL(gUnknown_087DFE80):
.incbin "baserom_sa1.gba", 0x007DFE80, 0x3790
.global gUnknown_087E3610
gUnknown_087E3610:
.global C_DECL(gUnknown_087E3610)
C_DECL(gUnknown_087E3610):
.incbin "baserom_sa1.gba", 0x007E3610, 0x8000
.global gUnknown_087EB610
gUnknown_087EB610:
.global C_DECL(gUnknown_087EB610)
C_DECL(gUnknown_087EB610):
.incbin "baserom_sa1.gba", 0x007EB610, 0x6B18
.global gUnknown_087F2128
gUnknown_087F2128:
.global C_DECL(gUnknown_087F2128)
C_DECL(gUnknown_087F2128):
.incbin "baserom_sa1.gba", 0x007F2128, 0x67C8
.global gUnknown_087F88F0
gUnknown_087F88F0:
.global C_DECL(gUnknown_087F88F0)
C_DECL(gUnknown_087F88F0):
.incbin "baserom_sa1.gba", 0x007F88F0, 0x673C
+22 -21
View File
@@ -1,33 +1,34 @@
.include "asm/macros/portable.inc"
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.section .rodata
mSectionRodata
.align 2 , 0
.global gUnknown_080BB3F8
gUnknown_080BB3F8:
mPtr gMultiboot_087C22F8
mPtr gUnknown_087CA2F8
mPtr gUnknown_087D22F8
mPtr gUnknown_087E3610
mPtr gUnknown_087EB610
mPtr gUnknown_087F2128
mPtr gUnknown_087F88F0
mPtr gUnknown_087DFE80
mPtr gUnknown_087D7E80
.global C_DECL(gUnknown_080BB3F8)
C_DECL(gUnknown_080BB3F8):
mPtr C_DECL(gMultiboot_087C22F8)
mPtr C_DECL(gUnknown_087CA2F8)
mPtr C_DECL(gUnknown_087D22F8)
mPtr C_DECL(gUnknown_087E3610)
mPtr C_DECL(gUnknown_087EB610)
mPtr C_DECL(gUnknown_087F2128)
mPtr C_DECL(gUnknown_087F88F0)
mPtr C_DECL(gUnknown_087DFE80)
mPtr C_DECL(gUnknown_087D7E80)
.global gUnknown_080BB41C
gUnknown_080BB41C:
.global C_DECL(gUnknown_080BB41C)
C_DECL(gUnknown_080BB41C):
.short 697, 697, 695, 695, 696, 696, 697, 695
.global gUnknown_080BB42C
gUnknown_080BB42C:
.global C_DECL(gUnknown_080BB42C)
C_DECL(gUnknown_080BB42C):
.byte 0, 1, 0, 1, 0, 1, 0, 0
.global gUnknown_080BB434
gUnknown_080BB434:
.global C_DECL(gUnknown_080BB434)
C_DECL(gUnknown_080BB434):
.byte 1, 1, 4, 4, 16, 12, 1, 4
.global gUnknown_080BB43C
gUnknown_080BB43C:
.global C_DECL(gUnknown_080BB43C)
C_DECL(gUnknown_080BB43C):
.short 438, 449, 448, 438, 447, 448, 439, 446
.short 442, 443, 444, 448, 447, 449, 442, 0
+6 -3
View File
@@ -1,8 +1,11 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
mSectionRodata
.align 2 , 0
.global gUnknown_080BB544
gUnknown_080BB544:
.global C_DECL(gUnknown_080BB544)
C_DECL(gUnknown_080BB544):
.short 0x022F, 0x022F
.short 0x022F, 0x022F
.short 0x022F, 0x022F
+46 -43
View File
@@ -1,85 +1,88 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global gUnknown_08487134
gUnknown_08487134:
mSectionRodata
.global C_DECL(gUnknown_08487134)
C_DECL(gUnknown_08487134):
.incbin "baserom_sa1.gba", 0x00487134, 0xC
.global gUnknown_08487140
gUnknown_08487140:
.global C_DECL(gUnknown_08487140)
C_DECL(gUnknown_08487140):
.incbin "baserom_sa1.gba", 0x00487140, 0x1C
.global gUnknown_0848715C
gUnknown_0848715C:
.global C_DECL(gUnknown_0848715C)
C_DECL(gUnknown_0848715C):
.incbin "baserom_sa1.gba", 0x0048715C, 0x28
.global gUnknown_08487184
gUnknown_08487184:
.global C_DECL(gUnknown_08487184)
C_DECL(gUnknown_08487184):
.incbin "baserom_sa1.gba", 0x00487184, 0x40
.global gUnknown_084871C4
gUnknown_084871C4:
.global C_DECL(gUnknown_084871C4)
C_DECL(gUnknown_084871C4):
.incbin "baserom_sa1.gba", 0x004871C4, 0x40
.global gUnknown_08487204
gUnknown_08487204:
.global C_DECL(gUnknown_08487204)
C_DECL(gUnknown_08487204):
.incbin "baserom_sa1.gba", 0x00487204, 0x8
.global gUnknown_0848720C
gUnknown_0848720C:
.global C_DECL(gUnknown_0848720C)
C_DECL(gUnknown_0848720C):
.incbin "baserom_sa1.gba", 0x0048720C, 0x8
.global gUnknown_08487214
gUnknown_08487214:
.global C_DECL(gUnknown_08487214)
C_DECL(gUnknown_08487214):
.incbin "baserom_sa1.gba", 0x00487214, 0x18
.global gUnknown_0848722C
gUnknown_0848722C:
.global C_DECL(gUnknown_0848722C)
C_DECL(gUnknown_0848722C):
.incbin "baserom_sa1.gba", 0x0048722C, 0x60
.global gUnknown_0848728C
gUnknown_0848728C:
.global C_DECL(gUnknown_0848728C)
C_DECL(gUnknown_0848728C):
.incbin "baserom_sa1.gba", 0x0048728C, 0x38
.global gUnknown_084872C4
gUnknown_084872C4:
.global C_DECL(gUnknown_084872C4)
C_DECL(gUnknown_084872C4):
.incbin "baserom_sa1.gba", 0x004872C4, 0x1C
.global gUnknown_084872E0
gUnknown_084872E0:
.global C_DECL(gUnknown_084872E0)
C_DECL(gUnknown_084872E0):
.incbin "baserom_sa1.gba", 0x004872E0, 0x30
.global gUnknown_08487310
gUnknown_08487310:
.global C_DECL(gUnknown_08487310)
C_DECL(gUnknown_08487310):
.incbin "baserom_sa1.gba", 0x00487310, 0x20
.global gUnknown_08487330
gUnknown_08487330:
.global C_DECL(gUnknown_08487330)
C_DECL(gUnknown_08487330):
.incbin "baserom_sa1.gba", 0x00487330, 0x28
.global gUnknown_08487358
gUnknown_08487358:
.global C_DECL(gUnknown_08487358)
C_DECL(gUnknown_08487358):
.incbin "baserom_sa1.gba", 0x00487358, 0x864
.global gUnknown_08487BBC
gUnknown_08487BBC:
.global C_DECL(gUnknown_08487BBC)
C_DECL(gUnknown_08487BBC):
.incbin "baserom_sa1.gba", 0x00487BBC, 0xB70
.global gUnknown_0848872C
gUnknown_0848872C:
.global C_DECL(gUnknown_0848872C)
C_DECL(gUnknown_0848872C):
.incbin "baserom_sa1.gba", 0x0048872C, 0xBDC
.global gUnknown_08489308
gUnknown_08489308:
.global C_DECL(gUnknown_08489308)
C_DECL(gUnknown_08489308):
.incbin "baserom_sa1.gba", 0x00489308, 0xC54
.global gUnknown_08489F5C
gUnknown_08489F5C:
.global C_DECL(gUnknown_08489F5C)
C_DECL(gUnknown_08489F5C):
.incbin "baserom_sa1.gba", 0x00489F5C, 0xE58
.global gUnknown_0848ADB4
gUnknown_0848ADB4:
.global C_DECL(gUnknown_0848ADB4)
C_DECL(gUnknown_0848ADB4):
.incbin "baserom_sa1.gba", 0x0048ADB4, 0xCCC
.global gUnknown_0848BA80
gUnknown_0848BA80:
.global C_DECL(gUnknown_0848BA80)
C_DECL(gUnknown_0848BA80):
.incbin "baserom_sa1.gba", 0x0048BA80, 0xF24
+42 -39
View File
@@ -1,78 +1,81 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
mSectionRodata
.global gUnknown_084ACDA0
gUnknown_084ACDA0:
.global C_DECL(gUnknown_084ACDA0)
C_DECL(gUnknown_084ACDA0):
.incbin "baserom_sa1.gba", 0x004ACDA0, 0xC
.global gUnknown_084ACDAC
gUnknown_084ACDAC:
.global C_DECL(gUnknown_084ACDAC)
C_DECL(gUnknown_084ACDAC):
.incbin "baserom_sa1.gba", 0x004ACDAC, 0x14
.global gUnknown_084ACDC0
gUnknown_084ACDC0:
.global C_DECL(gUnknown_084ACDC0)
C_DECL(gUnknown_084ACDC0):
.incbin "baserom_sa1.gba", 0x004ACDC0, 0x12
.global gUnknown_084ACDD2
gUnknown_084ACDD2:
.global C_DECL(gUnknown_084ACDD2)
C_DECL(gUnknown_084ACDD2):
.incbin "baserom_sa1.gba", 0x004ACDD2, 0x2
.global gUnknown_084ACDD4
gUnknown_084ACDD4:
.global C_DECL(gUnknown_084ACDD4)
C_DECL(gUnknown_084ACDD4):
.incbin "baserom_sa1.gba", 0x004ACDD4, 0x4
.global gUnknown_084ACDD8
gUnknown_084ACDD8:
.global C_DECL(gUnknown_084ACDD8)
C_DECL(gUnknown_084ACDD8):
.incbin "baserom_sa1.gba", 0x004ACDD8, 0x3A
.global gUnknown_084ACE12
gUnknown_084ACE12:
.global C_DECL(gUnknown_084ACE12)
C_DECL(gUnknown_084ACE12):
.incbin "baserom_sa1.gba", 0x004ACE12, 0x12
.global gUnknown_084ACE24
gUnknown_084ACE24:
.global C_DECL(gUnknown_084ACE24)
C_DECL(gUnknown_084ACE24):
.incbin "baserom_sa1.gba", 0x004ACE24, 0x80
.global gUnknown_084ACEA4
gUnknown_084ACEA4:
.global C_DECL(gUnknown_084ACEA4)
C_DECL(gUnknown_084ACEA4):
.incbin "baserom_sa1.gba", 0x004ACEA4, 0x10
.global gUnknown_084ACEB4
gUnknown_084ACEB4:
.global C_DECL(gUnknown_084ACEB4)
C_DECL(gUnknown_084ACEB4):
.incbin "baserom_sa1.gba", 0x004ACEB4, 0x12
.global gUnknown_084ACEC6
gUnknown_084ACEC6:
.global C_DECL(gUnknown_084ACEC6)
C_DECL(gUnknown_084ACEC6):
.incbin "baserom_sa1.gba", 0x004ACEC6, 0x12
.global gUnknown_084ACED8
gUnknown_084ACED8:
.global C_DECL(gUnknown_084ACED8)
C_DECL(gUnknown_084ACED8):
.incbin "baserom_sa1.gba", 0x004ACED8, 0xC
.global gUnknown_084ACEE4
gUnknown_084ACEE4:
.global C_DECL(gUnknown_084ACEE4)
C_DECL(gUnknown_084ACEE4):
.incbin "baserom_sa1.gba", 0x004ACEE4, 0x12
.global gUnknown_084ACEF6
gUnknown_084ACEF6:
.global C_DECL(gUnknown_084ACEF6)
C_DECL(gUnknown_084ACEF6):
.incbin "baserom_sa1.gba", 0x004ACEF6, 0x12
.global gUnknown_084ACF08
gUnknown_084ACF08:
.global C_DECL(gUnknown_084ACF08)
C_DECL(gUnknown_084ACF08):
.incbin "baserom_sa1.gba", 0x004ACF08, 0x14
.global gUnknown_084ACF1C
gUnknown_084ACF1C:
.global C_DECL(gUnknown_084ACF1C)
C_DECL(gUnknown_084ACF1C):
.incbin "baserom_sa1.gba", 0x004ACF1C, 0x8
.global gUnknown_084ACF24
gUnknown_084ACF24:
.global C_DECL(gUnknown_084ACF24)
C_DECL(gUnknown_084ACF24):
.incbin "baserom_sa1.gba", 0x004ACF24, 0x8
.global gUnknown_084ACF2C
gUnknown_084ACF2C:
.global C_DECL(gUnknown_084ACF2C)
C_DECL(gUnknown_084ACF2C):
.incbin "baserom_sa1.gba", 0x004ACF2C, 0x8
.global gUnknown_084ACF34
gUnknown_084ACF34:
.global C_DECL(gUnknown_084ACF34)
C_DECL(gUnknown_084ACF34):
.incbin "baserom_sa1.gba", 0x004ACF34, 0x8
+12 -9
View File
@@ -1,19 +1,22 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
mSectionRodata
@ "graphics/tilemaps/mp_multipak_player_overview/header.c"
.global gUnknown_084ADA08
gUnknown_084ADA08:
.global C_DECL(gUnknown_084ADA08)
C_DECL(gUnknown_084ADA08):
.incbin "baserom_sa1.gba", 0x004ADA08, 0x2
.global gUnknown_084ADA0A
gUnknown_084ADA0A:
.global C_DECL(gUnknown_084ADA0A)
C_DECL(gUnknown_084ADA0A):
.incbin "baserom_sa1.gba", 0x004ADA0A, 0x4
.global gUnknown_084ADA0E
gUnknown_084ADA0E:
.global C_DECL(gUnknown_084ADA0E)
C_DECL(gUnknown_084ADA0E):
.incbin "baserom_sa1.gba", 0x004ADA0E, 0x2
.global gUnknown_084ADA10
gUnknown_084ADA10:
.global C_DECL(gUnknown_084ADA10)
C_DECL(gUnknown_084ADA10):
.incbin "baserom_sa1.gba", 0x004ADA10, 0xA
+24 -22
View File
@@ -1,43 +1,45 @@
.include "asm/macros/portable.inc"
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global gSpawnPositions
gSpawnPositions:
mSectionRodata
.global C_DECL(gSpawnPositions)
C_DECL(gSpawnPositions):
.incbin "baserom_sa1.gba", 0x004ADEF0, 0x48
.global gSpawnPositions_Modes_4_and_5
gSpawnPositions_Modes_4_and_5:
.global C_DECL(gSpawnPositions_Modes_4_and_5)
C_DECL(gSpawnPositions_Modes_4_and_5):
.incbin "baserom_sa1.gba", 0x004ADF38, 0x40
.global gUnknown_084ADF78
gUnknown_084ADF78:
.global C_DECL(gUnknown_084ADF78)
C_DECL(gUnknown_084ADF78):
.incbin "baserom_sa1.gba", 0x004ADF78, 0x48
.global gUnknown_084ADFC0
gUnknown_084ADFC0:
.global C_DECL(gUnknown_084ADFC0)
C_DECL(gUnknown_084ADFC0):
.incbin "baserom_sa1.gba", 0x004ADFC0, 0x48
.global gPlayerCharacterIdleAnims
gPlayerCharacterIdleAnims:
.global C_DECL(gPlayerCharacterIdleAnims)
C_DECL(gPlayerCharacterIdleAnims):
.short 0, 99, 199, 298
.global sCharStateAnimInfo
sCharStateAnimInfo:
.global C_DECL(sCharStateAnimInfo)
C_DECL(sCharStateAnimInfo):
.incbin "baserom_sa1.gba", 0x004AE010, 0x178
.global gUnknown_084AE188
gUnknown_084AE188:
.global C_DECL(gUnknown_084AE188)
C_DECL(gUnknown_084AE188):
.incbin "baserom_sa1.gba", 0x004AE188, 0x12
.global gUnknown_084AE19A
gUnknown_084AE19A:
.global C_DECL(gUnknown_084AE19A)
C_DECL(gUnknown_084AE19A):
.incbin "baserom_sa1.gba", 0x004AE19A, 0x12
.global gCharStatesKnucklesGlideTurn
gCharStatesKnucklesGlideTurn:
.global C_DECL(gCharStatesKnucklesGlideTurn)
C_DECL(gCharStatesKnucklesGlideTurn):
.byte 0x42, 0x43, 0x44, 0x45
.global gUnknown_084AE1B0
gUnknown_084AE1B0:
.global C_DECL(gUnknown_084AE1B0)
C_DECL(gUnknown_084AE1B0):
.byte 0x8E, 0x01, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x8F, 0x01, 0x00, 0x00, 0x8F, 0x01, 0x01, 0x00, 0x8F, 0x01, 0x02, 0x00
+14 -11
View File
@@ -1,21 +1,24 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global gUnknown_0868403C
gUnknown_0868403C:
mSectionRodata
.global C_DECL(gUnknown_0868403C)
C_DECL(gUnknown_0868403C):
.incbin "baserom_sa1.gba", 0x0068403C, 0x800
.global gUnknown_0868483C
gUnknown_0868483C:
.global C_DECL(gUnknown_0868483C)
C_DECL(gUnknown_0868483C):
.incbin "baserom_sa1.gba", 0x0068483C, 0x500
.global gUnknown_08684D3C
gUnknown_08684D3C:
.global C_DECL(gUnknown_08684D3C)
C_DECL(gUnknown_08684D3C):
.incbin "baserom_sa1.gba", 0x00684D3C, 0x1000
.global gUnknown_08685D3C
gUnknown_08685D3C:
.global C_DECL(gUnknown_08685D3C)
C_DECL(gUnknown_08685D3C):
.incbin "baserom_sa1.gba", 0x00685D3C, 0x800
.global gUnknown_0868653C
gUnknown_0868653C:
.global C_DECL(gUnknown_0868653C)
C_DECL(gUnknown_0868653C):
.incbin "baserom_sa1.gba", 0x0068653C, 0x1600
+16 -13
View File
@@ -1,25 +1,28 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global gMillisUnpackTable
gMillisUnpackTable:
mSectionRodata
.global C_DECL(gMillisUnpackTable)
C_DECL(gMillisUnpackTable):
.incbin "baserom_sa1.gba", 0x0065EFF4, 0x78
.global gSecondsTable
gSecondsTable:
.global C_DECL(gSecondsTable)
C_DECL(gSecondsTable):
.incbin "baserom_sa1.gba", 0x0065F06C, 0x78
.global sZoneTimeSecondsTable
sZoneTimeSecondsTable:
.global C_DECL(sZoneTimeSecondsTable)
C_DECL(sZoneTimeSecondsTable):
.incbin "baserom_sa1.gba", 0x0065F0E4, 0x7A
.global sZoneTimeMinutesTable
sZoneTimeMinutesTable:
.global C_DECL(sZoneTimeMinutesTable)
C_DECL(sZoneTimeMinutesTable):
.incbin "baserom_sa1.gba", 0x0065F15E, 0x16
.global gUnknown_0865F174
gUnknown_0865F174:
.global C_DECL(gUnknown_0865F174)
C_DECL(gUnknown_0865F174):
.incbin "baserom_sa1.gba", 0x0065F174, 0x4
.global gUnknown_0865F178
gUnknown_0865F178:
.global C_DECL(gUnknown_0865F178)
C_DECL(gUnknown_0865F178):
.incbin "baserom_sa1.gba", 0x0065F178, 0x4
+43 -40
View File
@@ -1,77 +1,80 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global gUnknown_08688378
gUnknown_08688378:
mSectionRodata
.global C_DECL(gUnknown_08688378)
C_DECL(gUnknown_08688378):
.incbin "baserom_sa1.gba", 0x00688378, 0xE
.global gUnknown_08688386
gUnknown_08688386:
.global C_DECL(gUnknown_08688386)
C_DECL(gUnknown_08688386):
.incbin "baserom_sa1.gba", 0x00688386, 0xE
.global gUnknown_08688394
gUnknown_08688394:
.global C_DECL(gUnknown_08688394)
C_DECL(gUnknown_08688394):
.incbin "baserom_sa1.gba", 0x00688394, 0x4
.global gUnknown_08688398
gUnknown_08688398:
.global C_DECL(gUnknown_08688398)
C_DECL(gUnknown_08688398):
.incbin "baserom_sa1.gba", 0x00688398, 0x14
.global gUnknown_086883AC
gUnknown_086883AC:
.global C_DECL(gUnknown_086883AC)
C_DECL(gUnknown_086883AC):
.incbin "baserom_sa1.gba", 0x006883AC, 0x4
.global gUnknown_086883B0
gUnknown_086883B0:
.global C_DECL(gUnknown_086883B0)
C_DECL(gUnknown_086883B0):
.incbin "baserom_sa1.gba", 0x006883B0, 0x8
.global gUnknown_086883B8
gUnknown_086883B8:
.global C_DECL(gUnknown_086883B8)
C_DECL(gUnknown_086883B8):
.incbin "baserom_sa1.gba", 0x006883B8, 0xC
.global gUnknown_086883C4
gUnknown_086883C4:
.global C_DECL(gUnknown_086883C4)
C_DECL(gUnknown_086883C4):
.incbin "baserom_sa1.gba", 0x006883C4, 0x8
.global gUnknown_086883CC
gUnknown_086883CC:
.global C_DECL(gUnknown_086883CC)
C_DECL(gUnknown_086883CC):
.incbin "baserom_sa1.gba", 0x006883CC, 0x18
.global gUnknown_086883E4
gUnknown_086883E4:
.global C_DECL(gUnknown_086883E4)
C_DECL(gUnknown_086883E4):
.incbin "baserom_sa1.gba", 0x006883E4, 0x14
.global gUnknown_086883F8
gUnknown_086883F8:
.global C_DECL(gUnknown_086883F8)
C_DECL(gUnknown_086883F8):
.incbin "baserom_sa1.gba", 0x006883F8, 0xC
.global gUnknown_08688404
gUnknown_08688404:
.global C_DECL(gUnknown_08688404)
C_DECL(gUnknown_08688404):
.incbin "baserom_sa1.gba", 0x00688404, 0xB
.global gUnknown_0868840F
gUnknown_0868840F:
.global C_DECL(gUnknown_0868840F)
C_DECL(gUnknown_0868840F):
.incbin "baserom_sa1.gba", 0x0068840F, 0xD
.global gUnknown_0868841C
gUnknown_0868841C:
.global C_DECL(gUnknown_0868841C)
C_DECL(gUnknown_0868841C):
.incbin "baserom_sa1.gba", 0x0068841C, 0xC
.global gUnknown_08688428
gUnknown_08688428:
.global C_DECL(gUnknown_08688428)
C_DECL(gUnknown_08688428):
.incbin "baserom_sa1.gba", 0x00688428, 0x1C
.global gUnknown_08688444
gUnknown_08688444:
.ascii "ABCDEFGHIJKLMNOPQRSTUVWXYZ.,j-pqrstuvwxyz{|}~\x7F€\x81‚ƒ„…†‡ˆ‰?!& 0123456789abcdef@\0"
.global C_DECL(gUnknown_08688444)
C_DECL(gUnknown_08688444):
.ascii "ABCDEFGHIJKLMNOPQRSTUVWXYZ.,j-pqrstuvwxyz{|}~\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89?!& 0123456789abcdef@\0"
.global gUnknown_08688492
gUnknown_08688492:
.global C_DECL(gUnknown_08688492)
C_DECL(gUnknown_08688492):
.incbin "baserom_sa1.gba", 0x00688492, 0xD6
.global gUnknown_08688568
gUnknown_08688568:
.global C_DECL(gUnknown_08688568)
C_DECL(gUnknown_08688568):
.incbin "baserom_sa1.gba", 0x00688568, 0x4
.global gUnknown_0868856C
gUnknown_0868856C:
.global C_DECL(gUnknown_0868856C)
C_DECL(gUnknown_0868856C):
.incbin "baserom_sa1.gba", 0x0068856C, 0x4
+10 -9
View File
@@ -1,19 +1,20 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc" @; for mPtr / mAlignWord
.section .rodata
mSectionRodata
.global gUnknown_0868B0D4
gUnknown_0868B0D4:
.global C_DECL(gUnknown_0868B0D4)
C_DECL(gUnknown_0868B0D4):
.incbin "baserom_sa1.gba", 0x0068B0D4, 0x18
.global gUnknown_0868B0EC
gUnknown_0868B0EC:
.global C_DECL(gUnknown_0868B0EC)
C_DECL(gUnknown_0868B0EC):
.incbin "baserom_sa1.gba", 0x0068B0EC, 0x8
.global gUnknown_0868B0F4
gUnknown_0868B0F4:
.global C_DECL(gUnknown_0868B0F4)
C_DECL(gUnknown_0868B0F4):
.incbin "baserom_sa1.gba", 0x0068B0F4, 0x8
.global gUnknown_0868B0FC
gUnknown_0868B0FC:
.global C_DECL(gUnknown_0868B0FC)
C_DECL(gUnknown_0868B0FC):
.incbin "baserom_sa1.gba", 0x0068B0FC, 0x10
+52 -51
View File
@@ -1,103 +1,104 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc" @; for mPtr / mAlignWord
.section .rodata
mSectionRodata
.global gUnknown_0868B3D8
gUnknown_0868B3D8:
.global C_DECL(gUnknown_0868B3D8)
C_DECL(gUnknown_0868B3D8):
.incbin "baserom_sa1.gba", 0x0068B3D8, 0x10
.global gUnknown_0868B3E8
gUnknown_0868B3E8:
.global C_DECL(gUnknown_0868B3E8)
C_DECL(gUnknown_0868B3E8):
.incbin "baserom_sa1.gba", 0x0068B3E8, 0x10
.global gUnknown_0868B3F8
gUnknown_0868B3F8:
.global C_DECL(gUnknown_0868B3F8)
C_DECL(gUnknown_0868B3F8):
.incbin "baserom_sa1.gba", 0x0068B3F8, 0x10
.global gUnknown_0868B408
gUnknown_0868B408:
.global C_DECL(gUnknown_0868B408)
C_DECL(gUnknown_0868B408):
.incbin "baserom_sa1.gba", 0x0068B408, 0x10
.global gUnknown_0868B418
gUnknown_0868B418:
.global C_DECL(gUnknown_0868B418)
C_DECL(gUnknown_0868B418):
.incbin "baserom_sa1.gba", 0x0068B418, 0x10
.global gUnknown_0868B428
gUnknown_0868B428:
.global C_DECL(gUnknown_0868B428)
C_DECL(gUnknown_0868B428):
.incbin "baserom_sa1.gba", 0x0068B428, 0x10
.global gUnknown_0868B438
gUnknown_0868B438:
.global C_DECL(gUnknown_0868B438)
C_DECL(gUnknown_0868B438):
.incbin "baserom_sa1.gba", 0x0068B438, 0x10
.global gUnknown_0868B448
gUnknown_0868B448:
.global C_DECL(gUnknown_0868B448)
C_DECL(gUnknown_0868B448):
.incbin "baserom_sa1.gba", 0x0068B448, 0x10
.global gUnknown_0868B458
gUnknown_0868B458:
.global C_DECL(gUnknown_0868B458)
C_DECL(gUnknown_0868B458):
.incbin "baserom_sa1.gba", 0x0068B458, 0x10
.global gUnknown_0868B468
gUnknown_0868B468:
.global C_DECL(gUnknown_0868B468)
C_DECL(gUnknown_0868B468):
.incbin "baserom_sa1.gba", 0x0068B468, 0x10
.global gUnknown_0868B478
gUnknown_0868B478:
.global C_DECL(gUnknown_0868B478)
C_DECL(gUnknown_0868B478):
.incbin "baserom_sa1.gba", 0x0068B478, 0x10
.global gUnknown_0868B488
gUnknown_0868B488:
.global C_DECL(gUnknown_0868B488)
C_DECL(gUnknown_0868B488):
.incbin "baserom_sa1.gba", 0x0068B488, 0x10
.global gUnknown_0868B498
gUnknown_0868B498:
.global C_DECL(gUnknown_0868B498)
C_DECL(gUnknown_0868B498):
.incbin "baserom_sa1.gba", 0x0068B498, 0x10
.global gUnknown_0868B4A8
gUnknown_0868B4A8:
.global C_DECL(gUnknown_0868B4A8)
C_DECL(gUnknown_0868B4A8):
.incbin "baserom_sa1.gba", 0x0068B4A8, 0x10
.global gUnknown_0868B4B8
gUnknown_0868B4B8:
.global C_DECL(gUnknown_0868B4B8)
C_DECL(gUnknown_0868B4B8):
.incbin "baserom_sa1.gba", 0x0068B4B8, 0x6
.global gUnknown_0868B4BE
gUnknown_0868B4BE:
.global C_DECL(gUnknown_0868B4BE)
C_DECL(gUnknown_0868B4BE):
.incbin "baserom_sa1.gba", 0x0068B4BE, 0xC6
.global gUnknown_0868B584
gUnknown_0868B584:
.global C_DECL(gUnknown_0868B584)
C_DECL(gUnknown_0868B584):
.incbin "baserom_sa1.gba", 0x0068B584, 0x10
.global gUnknown_0868B594
gUnknown_0868B594:
.global C_DECL(gUnknown_0868B594)
C_DECL(gUnknown_0868B594):
.incbin "baserom_sa1.gba", 0x0068B594, 0x10
.global gUnknown_0868B5A4
gUnknown_0868B5A4:
.global C_DECL(gUnknown_0868B5A4)
C_DECL(gUnknown_0868B5A4):
.incbin "baserom_sa1.gba", 0x0068B5A4, 0x10
.global gUnknown_0868B5B4
gUnknown_0868B5B4:
.global C_DECL(gUnknown_0868B5B4)
C_DECL(gUnknown_0868B5B4):
.incbin "baserom_sa1.gba", 0x0068B5B4, 0x10
.global gUnknown_0868B5C4
gUnknown_0868B5C4:
.global C_DECL(gUnknown_0868B5C4)
C_DECL(gUnknown_0868B5C4):
.incbin "baserom_sa1.gba", 0x0068B5C4, 0x70
.global gUnknown_0868B634
gUnknown_0868B634:
.global C_DECL(gUnknown_0868B634)
C_DECL(gUnknown_0868B634):
.incbin "baserom_sa1.gba", 0x0068B634, 0x10
.global gUnknown_0868B644
gUnknown_0868B644:
.global C_DECL(gUnknown_0868B644)
C_DECL(gUnknown_0868B644):
.incbin "baserom_sa1.gba", 0x0068B644, 0x10
.global gUnknown_0868B654
gUnknown_0868B654:
.global C_DECL(gUnknown_0868B654)
C_DECL(gUnknown_0868B654):
.incbin "baserom_sa1.gba", 0x0068B654, 0x4
.global gUnknown_0868B658
gUnknown_0868B658:
.global C_DECL(gUnknown_0868B658)
C_DECL(gUnknown_0868B658):
.incbin "baserom_sa1.gba", 0x0068B658, 0x4
+58 -57
View File
@@ -1,112 +1,113 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc" @; for mPtr / mAlignWord
.section .rodata
mSectionRodata
.align 2, 0
.global gUnknown_0868B684
gUnknown_0868B684:
.global C_DECL(gUnknown_0868B684)
C_DECL(gUnknown_0868B684):
.incbin "baserom_sa1.gba", 0x0068B684, 0x10
.global gUnknown_0868B694
gUnknown_0868B694:
.global C_DECL(gUnknown_0868B694)
C_DECL(gUnknown_0868B694):
.incbin "baserom_sa1.gba", 0x0068B694, 0x8
.global gUnknown_0868B69C
gUnknown_0868B69C:
.global C_DECL(gUnknown_0868B69C)
C_DECL(gUnknown_0868B69C):
.incbin "baserom_sa1.gba", 0x0068B69C, 0x4
.global gUnknown_0868B6A0
gUnknown_0868B6A0:
.global C_DECL(gUnknown_0868B6A0)
C_DECL(gUnknown_0868B6A0):
.incbin "baserom_sa1.gba", 0x0068B6A0, 0x18
.global gUnknown_0868B6B8
gUnknown_0868B6B8:
.global C_DECL(gUnknown_0868B6B8)
C_DECL(gUnknown_0868B6B8):
.incbin "baserom_sa1.gba", 0x0068B6B8, 0xC
.global gUnknown_0868B6C4
gUnknown_0868B6C4:
mPtr ApplyGameStageSettings
mPtr sub_806A66C
mPtr sub_806A680
mPtr sub_806A68C
.global C_DECL(gUnknown_0868B6C4)
C_DECL(gUnknown_0868B6C4):
mPtr C_DECL(ApplyGameStageSettings)
mPtr C_DECL(sub_806A66C)
mPtr C_DECL(sub_806A680)
mPtr C_DECL(sub_806A68C)
@ Edit Language Screen - Data Start
.global gUnknown_0868B6D4
gUnknown_0868B6D4:
.global C_DECL(gUnknown_0868B6D4)
C_DECL(gUnknown_0868B6D4):
.incbin "baserom_sa1.gba", 0x0068B6D4, 0x18
.global gUnknown_0868B6EC
gUnknown_0868B6EC:
.global C_DECL(gUnknown_0868B6EC)
C_DECL(gUnknown_0868B6EC):
.incbin "baserom_sa1.gba", 0x0068B6EC, 0x18
.global gUnknown_0868B704
gUnknown_0868B704:
.global C_DECL(gUnknown_0868B704)
C_DECL(gUnknown_0868B704):
.incbin "baserom_sa1.gba", 0x0068B704, 0xC
.global gUnknown_0868B710
gUnknown_0868B710:
.global C_DECL(gUnknown_0868B710)
C_DECL(gUnknown_0868B710):
.incbin "baserom_sa1.gba", 0x0068B710, 0xC
.global gUnknown_0868B71C
gUnknown_0868B71C:
.global C_DECL(gUnknown_0868B71C)
C_DECL(gUnknown_0868B71C):
.incbin "baserom_sa1.gba", 0x0068B71C, 0x6
.global gUnknown_0868B722
gUnknown_0868B722:
.global C_DECL(gUnknown_0868B722)
C_DECL(gUnknown_0868B722):
.incbin "baserom_sa1.gba", 0x0068B722, 0x6
.global gUnknown_0868B728
gUnknown_0868B728:
.global C_DECL(gUnknown_0868B728)
C_DECL(gUnknown_0868B728):
.incbin "baserom_sa1.gba", 0x0068B728, 0x1
.global gUnknown_0868B729
gUnknown_0868B729:
.global C_DECL(gUnknown_0868B729)
C_DECL(gUnknown_0868B729):
.incbin "baserom_sa1.gba", 0x0068B729, 0xB
.global gUnknown_0868B734
gUnknown_0868B734:
.global C_DECL(gUnknown_0868B734)
C_DECL(gUnknown_0868B734):
.incbin "baserom_sa1.gba", 0x0068B734, 0x24
mAlignWord
.global sLangScreenReturnProcs
sLangScreenReturnProcs:
mPtr CreateOptionsMenu
mPtr CreateSegaLogo
.global C_DECL(sLangScreenReturnProcs)
C_DECL(sLangScreenReturnProcs):
mPtr C_DECL(CreateOptionsMenu)
mPtr C_DECL(CreateSegaLogo)
.global gUnknown_0868B760
gUnknown_0868B760:
.global C_DECL(gUnknown_0868B760)
C_DECL(gUnknown_0868B760):
.incbin "baserom_sa1.gba", 0x0068B760, 0xC
@ Edit Language Screen - Data End
.global gUnknown_0868B76C
gUnknown_0868B76C:
.global C_DECL(gUnknown_0868B76C)
C_DECL(gUnknown_0868B76C):
.incbin "baserom_sa1.gba", 0x0068B76C, 0xC
.global gUnknown_0868B778
gUnknown_0868B778:
.global C_DECL(gUnknown_0868B778)
C_DECL(gUnknown_0868B778):
.incbin "baserom_sa1.gba", 0x0068B778, 0x6
.global gUnknown_0868B77E
gUnknown_0868B77E:
.global C_DECL(gUnknown_0868B77E)
C_DECL(gUnknown_0868B77E):
.incbin "baserom_sa1.gba", 0x0068B77E, 0x4
.global gUnknown_0868B782
gUnknown_0868B782:
.global C_DECL(gUnknown_0868B782)
C_DECL(gUnknown_0868B782):
.incbin "baserom_sa1.gba", 0x0068B782, 0x4
.global gUnknown_0868B786
gUnknown_0868B786:
.global C_DECL(gUnknown_0868B786)
C_DECL(gUnknown_0868B786):
.incbin "baserom_sa1.gba", 0x0068B786, 0x4
.global gUnknown_0868B78A
gUnknown_0868B78A:
.global C_DECL(gUnknown_0868B78A)
C_DECL(gUnknown_0868B78A):
.incbin "baserom_sa1.gba", 0x0068B78A, 0x1
.global gUnknown_0868B78B
gUnknown_0868B78B:
.global C_DECL(gUnknown_0868B78B)
C_DECL(gUnknown_0868B78B):
.incbin "baserom_sa1.gba", 0x0068B78B, 0x5
.global gUnknown_0868B790
gUnknown_0868B790:
.global C_DECL(gUnknown_0868B790)
C_DECL(gUnknown_0868B790):
.incbin "baserom_sa1.gba", 0x0068B790, 0x4
+222 -221
View File
@@ -1,443 +1,444 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc" @; for mPtr / mAlignWord
.section .rodata
mSectionRodata
.global gUnknown_0868B814
gUnknown_0868B814:
.global C_DECL(gUnknown_0868B814)
C_DECL(gUnknown_0868B814):
.incbin "baserom_sa1.gba", 0x0068B814, 0x24
.global gUnknown_0868B838
gUnknown_0868B838:
.global C_DECL(gUnknown_0868B838)
C_DECL(gUnknown_0868B838):
.incbin "baserom_sa1.gba", 0x0068B838, 0xC
.global gUnknown_0868B844
gUnknown_0868B844:
.global C_DECL(gUnknown_0868B844)
C_DECL(gUnknown_0868B844):
.incbin "baserom_sa1.gba", 0x0068B844, 0x90
.global gUnknown_0868B8D4
gUnknown_0868B8D4:
.global C_DECL(gUnknown_0868B8D4)
C_DECL(gUnknown_0868B8D4):
.incbin "baserom_sa1.gba", 0x0068B8D4, 0x20
.global gUnknown_0868B8F4
gUnknown_0868B8F4:
.global C_DECL(gUnknown_0868B8F4)
C_DECL(gUnknown_0868B8F4):
.incbin "baserom_sa1.gba", 0x0068B8F4, 0x7C0
.global gUnknown_0868C0B4
gUnknown_0868C0B4:
.global C_DECL(gUnknown_0868C0B4)
C_DECL(gUnknown_0868C0B4):
.incbin "baserom_sa1.gba", 0x0068C0B4, 0x500
.global gUnknown_0868C5B4
gUnknown_0868C5B4:
.global C_DECL(gUnknown_0868C5B4)
C_DECL(gUnknown_0868C5B4):
.incbin "baserom_sa1.gba", 0x0068C5B4, 0x20
.global gUnknown_0868C5D4
gUnknown_0868C5D4:
.global C_DECL(gUnknown_0868C5D4)
C_DECL(gUnknown_0868C5D4):
.incbin "baserom_sa1.gba", 0x0068C5D4, 0x940
.global gUnknown_0868CF14
gUnknown_0868CF14:
.global C_DECL(gUnknown_0868CF14)
C_DECL(gUnknown_0868CF14):
.incbin "baserom_sa1.gba", 0x0068CF14, 0x500
.global gUnknown_0868D414
gUnknown_0868D414:
.global C_DECL(gUnknown_0868D414)
C_DECL(gUnknown_0868D414):
.incbin "baserom_sa1.gba", 0x0068D414, 0x20
.global gUnknown_0868D434
gUnknown_0868D434:
.global C_DECL(gUnknown_0868D434)
C_DECL(gUnknown_0868D434):
.incbin "baserom_sa1.gba", 0x0068D434, 0x620
.global gUnknown_0868DA54
gUnknown_0868DA54:
.global C_DECL(gUnknown_0868DA54)
C_DECL(gUnknown_0868DA54):
.incbin "baserom_sa1.gba", 0x0068DA54, 0x580
.global gUnknown_0868DFD4
gUnknown_0868DFD4:
.global C_DECL(gUnknown_0868DFD4)
C_DECL(gUnknown_0868DFD4):
.incbin "baserom_sa1.gba", 0x0068DFD4, 0x20
.global gUnknown_0868DFF4
gUnknown_0868DFF4:
.global C_DECL(gUnknown_0868DFF4)
C_DECL(gUnknown_0868DFF4):
.incbin "baserom_sa1.gba", 0x0068DFF4, 0x600
.global gUnknown_0868E5F4
gUnknown_0868E5F4:
.global C_DECL(gUnknown_0868E5F4)
C_DECL(gUnknown_0868E5F4):
.incbin "baserom_sa1.gba", 0x0068E5F4, 0x580
.global gCharacterCards_Knuckles_Palette
gCharacterCards_Knuckles_Palette:
.global C_DECL(gCharacterCards_Knuckles_Palette)
C_DECL(gCharacterCards_Knuckles_Palette):
.incbin "baserom_sa1.gba", 0x0068EB74, 0x200
.global gCharacterCards_Knuckles_Tiles
gCharacterCards_Knuckles_Tiles:
.global C_DECL(gCharacterCards_Knuckles_Tiles)
C_DECL(gCharacterCards_Knuckles_Tiles):
.incbin "baserom_sa1.gba", 0x0068ED74, 0x7C0
.global gCharacterCards_Knuckles_Layout
gCharacterCards_Knuckles_Layout:
.global C_DECL(gCharacterCards_Knuckles_Layout)
C_DECL(gCharacterCards_Knuckles_Layout):
.incbin "baserom_sa1.gba", 0x0068F534, 0x500
.global gUnknown_0868FA34
gUnknown_0868FA34:
.global C_DECL(gUnknown_0868FA34)
C_DECL(gUnknown_0868FA34):
.incbin "baserom_sa1.gba", 0x0068FA34, 0x200
.global gUnknown_0868FC34
gUnknown_0868FC34:
.global C_DECL(gUnknown_0868FC34)
C_DECL(gUnknown_0868FC34):
.incbin "baserom_sa1.gba", 0x0068FC34, 0x240
.global gUnknown_0868FE74
gUnknown_0868FE74:
.global C_DECL(gUnknown_0868FE74)
C_DECL(gUnknown_0868FE74):
.incbin "baserom_sa1.gba", 0x0068FE74, 0x700
.global gUnknown_08690574
gUnknown_08690574:
.global C_DECL(gUnknown_08690574)
C_DECL(gUnknown_08690574):
.incbin "baserom_sa1.gba", 0x00690574, 0x1800
.global gUnknown_08691D74
gUnknown_08691D74:
.global C_DECL(gUnknown_08691D74)
C_DECL(gUnknown_08691D74):
.incbin "baserom_sa1.gba", 0x00691D74, 0x500
.global gCharacterCards_Amy_Palette
gCharacterCards_Amy_Palette:
.global C_DECL(gCharacterCards_Amy_Palette)
C_DECL(gCharacterCards_Amy_Palette):
.incbin "baserom_sa1.gba", 0x00692274, 0x200
.global gCharacterCards_Amy_Tiles
gCharacterCards_Amy_Tiles:
.global C_DECL(gCharacterCards_Amy_Tiles)
C_DECL(gCharacterCards_Amy_Tiles):
.incbin "baserom_sa1.gba", 0x00692474, 0x4C0
.global gCharacterCards_Amy_Layout
gCharacterCards_Amy_Layout:
.global C_DECL(gCharacterCards_Amy_Layout)
C_DECL(gCharacterCards_Amy_Layout):
.incbin "baserom_sa1.gba", 0x00692934, 0x500
.global gUnknown_08692E34
gUnknown_08692E34:
.global C_DECL(gUnknown_08692E34)
C_DECL(gUnknown_08692E34):
.incbin "baserom_sa1.gba", 0x00692E34, 0x200
.global gUnknown_08693034
gUnknown_08693034:
.global C_DECL(gUnknown_08693034)
C_DECL(gUnknown_08693034):
.incbin "baserom_sa1.gba", 0x00693034, 0x240
.global gUnknown_08693274
gUnknown_08693274:
.global C_DECL(gUnknown_08693274)
C_DECL(gUnknown_08693274):
.incbin "baserom_sa1.gba", 0x00693274, 0x700
.global gUnknown_08693974
gUnknown_08693974:
.global C_DECL(gUnknown_08693974)
C_DECL(gUnknown_08693974):
.incbin "baserom_sa1.gba", 0x00693974, 0x1880
.global gUnknown_086951F4
gUnknown_086951F4:
.global C_DECL(gUnknown_086951F4)
C_DECL(gUnknown_086951F4):
.incbin "baserom_sa1.gba", 0x006951F4, 0x500
.global gCharacterCards_Sonic_Palette
gCharacterCards_Sonic_Palette:
.global C_DECL(gCharacterCards_Sonic_Palette)
C_DECL(gCharacterCards_Sonic_Palette):
.incbin "baserom_sa1.gba", 0x006956F4, 0x200
.global gCharacterCards_Sonic_Tiles
gCharacterCards_Sonic_Tiles:
.global C_DECL(gCharacterCards_Sonic_Tiles)
C_DECL(gCharacterCards_Sonic_Tiles):
.incbin "baserom_sa1.gba", 0x006958F4, 0x9C0
.global gCharacterCards_Sonic_Layout
gCharacterCards_Sonic_Layout:
.global C_DECL(gCharacterCards_Sonic_Layout)
C_DECL(gCharacterCards_Sonic_Layout):
.incbin "baserom_sa1.gba", 0x006962B4, 0x500
.global gUnknown_086967B4
gUnknown_086967B4:
.global C_DECL(gUnknown_086967B4)
C_DECL(gUnknown_086967B4):
.incbin "baserom_sa1.gba", 0x006967B4, 0x200
.global gUnknown_086969B4
gUnknown_086969B4:
.global C_DECL(gUnknown_086969B4)
C_DECL(gUnknown_086969B4):
.incbin "baserom_sa1.gba", 0x006969B4, 0x240
.global gUnknown_08696BF4
gUnknown_08696BF4:
.global C_DECL(gUnknown_08696BF4)
C_DECL(gUnknown_08696BF4):
.incbin "baserom_sa1.gba", 0x00696BF4, 0x700
.global gUnknown_086972F4
gUnknown_086972F4:
.global C_DECL(gUnknown_086972F4)
C_DECL(gUnknown_086972F4):
.incbin "baserom_sa1.gba", 0x006972F4, 0x1900
.global gUnknown_08698BF4
gUnknown_08698BF4:
.global C_DECL(gUnknown_08698BF4)
C_DECL(gUnknown_08698BF4):
.incbin "baserom_sa1.gba", 0x00698BF4, 0x500
.global gCharacterCards_Tails_Palette
gCharacterCards_Tails_Palette:
.global C_DECL(gCharacterCards_Tails_Palette)
C_DECL(gCharacterCards_Tails_Palette):
.incbin "baserom_sa1.gba", 0x006990F4, 0x200
.global gCharacterCards_Tails_Tiles
gCharacterCards_Tails_Tiles:
.global C_DECL(gCharacterCards_Tails_Tiles)
C_DECL(gCharacterCards_Tails_Tiles):
.incbin "baserom_sa1.gba", 0x006992F4, 0x680
.global gCharacterCards_Tails_Layout
gCharacterCards_Tails_Layout:
.global C_DECL(gCharacterCards_Tails_Layout)
C_DECL(gCharacterCards_Tails_Layout):
.incbin "baserom_sa1.gba", 0x00699974, 0x500
.global gUnknown_08699E74
gUnknown_08699E74:
.global C_DECL(gUnknown_08699E74)
C_DECL(gUnknown_08699E74):
.incbin "baserom_sa1.gba", 0x00699E74, 0x200
.global gUnknown_0869A074
gUnknown_0869A074:
.global C_DECL(gUnknown_0869A074)
C_DECL(gUnknown_0869A074):
.incbin "baserom_sa1.gba", 0x0069A074, 0x240
.global gUnknown_0869A2B4
gUnknown_0869A2B4:
.global C_DECL(gUnknown_0869A2B4)
C_DECL(gUnknown_0869A2B4):
.incbin "baserom_sa1.gba", 0x0069A2B4, 0x700
.global gUnknown_0869A9B4
gUnknown_0869A9B4:
.global C_DECL(gUnknown_0869A9B4)
C_DECL(gUnknown_0869A9B4):
.incbin "baserom_sa1.gba", 0x0069A9B4, 0x1C40
.global gUnknown_0869C5F4
gUnknown_0869C5F4:
.global C_DECL(gUnknown_0869C5F4)
C_DECL(gUnknown_0869C5F4):
.incbin "baserom_sa1.gba", 0x0069C5F4, 0x500
.global gUnknown_0869CAF4
gUnknown_0869CAF4:
.global C_DECL(gUnknown_0869CAF4)
C_DECL(gUnknown_0869CAF4):
.incbin "baserom_sa1.gba", 0x0069CAF4, 0x200
.global gUnknown_0869CCF4
gUnknown_0869CCF4:
.global C_DECL(gUnknown_0869CCF4)
C_DECL(gUnknown_0869CCF4):
.incbin "baserom_sa1.gba", 0x0069CCF4, 0x1C40
.global gUnknown_0869E934
gUnknown_0869E934:
.global C_DECL(gUnknown_0869E934)
C_DECL(gUnknown_0869E934):
.incbin "baserom_sa1.gba", 0x0069E934, 0x500
.global gUnknown_0869EE34
gUnknown_0869EE34:
.global C_DECL(gUnknown_0869EE34)
C_DECL(gUnknown_0869EE34):
.incbin "baserom_sa1.gba", 0x0069EE34, 0x200
.global gUnknown_0869F034
gUnknown_0869F034:
.global C_DECL(gUnknown_0869F034)
C_DECL(gUnknown_0869F034):
.incbin "baserom_sa1.gba", 0x0069F034, 0x20C0
.global gUnknown_086A10F4
gUnknown_086A10F4:
.global C_DECL(gUnknown_086A10F4)
C_DECL(gUnknown_086A10F4):
.incbin "baserom_sa1.gba", 0x006A10F4, 0x700
.global gUnknown_086A17F4
gUnknown_086A17F4:
.global C_DECL(gUnknown_086A17F4)
C_DECL(gUnknown_086A17F4):
.incbin "baserom_sa1.gba", 0x006A17F4, 0xD40
.global gUnknown_086A2534
gUnknown_086A2534:
.global C_DECL(gUnknown_086A2534)
C_DECL(gUnknown_086A2534):
.incbin "baserom_sa1.gba", 0x006A2534, 0x500
.global gUnknown_086A2A34
gUnknown_086A2A34:
.global C_DECL(gUnknown_086A2A34)
C_DECL(gUnknown_086A2A34):
.incbin "baserom_sa1.gba", 0x006A2A34, 0x200
.global gUnknown_086A2C34
gUnknown_086A2C34:
.global C_DECL(gUnknown_086A2C34)
C_DECL(gUnknown_086A2C34):
.incbin "baserom_sa1.gba", 0x006A2C34, 0x1180
.global gUnknown_086A3DB4
gUnknown_086A3DB4:
.global C_DECL(gUnknown_086A3DB4)
C_DECL(gUnknown_086A3DB4):
.incbin "baserom_sa1.gba", 0x006A3DB4, 0x1000
.global gUnknown_086A4DB4
gUnknown_086A4DB4:
.global C_DECL(gUnknown_086A4DB4)
C_DECL(gUnknown_086A4DB4):
.incbin "baserom_sa1.gba", 0x006A4DB4, 0x200
.global gUnknown_086A4FB4
gUnknown_086A4FB4:
.global C_DECL(gUnknown_086A4FB4)
C_DECL(gUnknown_086A4FB4):
.incbin "baserom_sa1.gba", 0x006A4FB4, 0x880
.global gUnknown_086A5834
gUnknown_086A5834:
.global C_DECL(gUnknown_086A5834)
C_DECL(gUnknown_086A5834):
.incbin "baserom_sa1.gba", 0x006A5834, 0x500
.global gUnknown_086A5D34
gUnknown_086A5D34:
.global C_DECL(gUnknown_086A5D34)
C_DECL(gUnknown_086A5D34):
.incbin "baserom_sa1.gba", 0x006A5D34, 0x200
.global gUnknown_086A5F34
gUnknown_086A5F34:
.global C_DECL(gUnknown_086A5F34)
C_DECL(gUnknown_086A5F34):
.incbin "baserom_sa1.gba", 0x006A5F34, 0x2F00
.global gUnknown_086A8E34
gUnknown_086A8E34:
.global C_DECL(gUnknown_086A8E34)
C_DECL(gUnknown_086A8E34):
.incbin "baserom_sa1.gba", 0x006A8E34, 0xA00
.global gUnknown_086A9834
gUnknown_086A9834:
.global C_DECL(gUnknown_086A9834)
C_DECL(gUnknown_086A9834):
.incbin "baserom_sa1.gba", 0x006A9834, 0x2840
.global gUnknown_086AC074
gUnknown_086AC074:
.global C_DECL(gUnknown_086AC074)
C_DECL(gUnknown_086AC074):
.incbin "baserom_sa1.gba", 0x006AC074, 0xAC0
.global gUnknown_086ACB34
gUnknown_086ACB34:
.global C_DECL(gUnknown_086ACB34)
C_DECL(gUnknown_086ACB34):
.incbin "baserom_sa1.gba", 0x006ACB34, 0x29C0
.global gUnknown_086AF4F4
gUnknown_086AF4F4:
.global C_DECL(gUnknown_086AF4F4)
C_DECL(gUnknown_086AF4F4):
.incbin "baserom_sa1.gba", 0x006AF4F4, 0xAC0
.global gUnknown_086AFFB4
gUnknown_086AFFB4:
.global C_DECL(gUnknown_086AFFB4)
C_DECL(gUnknown_086AFFB4):
.incbin "baserom_sa1.gba", 0x006AFFB4, 0x1440
.global gUnknown_086B13F4
gUnknown_086B13F4:
.global C_DECL(gUnknown_086B13F4)
C_DECL(gUnknown_086B13F4):
.incbin "baserom_sa1.gba", 0x006B13F4, 0x6C0
.global gUnknown_086B1AB4
gUnknown_086B1AB4:
.global C_DECL(gUnknown_086B1AB4)
C_DECL(gUnknown_086B1AB4):
.incbin "baserom_sa1.gba", 0x006B1AB4, 0x20
.global gUnknown_086B1AD4
gUnknown_086B1AD4:
.global C_DECL(gUnknown_086B1AD4)
C_DECL(gUnknown_086B1AD4):
.incbin "baserom_sa1.gba", 0x006B1AD4, 0x20
.global gUnknown_086B1AF4
gUnknown_086B1AF4:
.global C_DECL(gUnknown_086B1AF4)
C_DECL(gUnknown_086B1AF4):
.incbin "baserom_sa1.gba", 0x006B1AF4, 0x20
.global gUnknown_086B1B14
gUnknown_086B1B14:
.global C_DECL(gUnknown_086B1B14)
C_DECL(gUnknown_086B1B14):
.incbin "baserom_sa1.gba", 0x006B1B14, 0x1A0
.global gUnknown_086B1CB4
gUnknown_086B1CB4:
.global C_DECL(gUnknown_086B1CB4)
C_DECL(gUnknown_086B1CB4):
.incbin "baserom_sa1.gba", 0x006B1CB4, 0x540
.global gUnknown_086B21F4
gUnknown_086B21F4:
.global C_DECL(gUnknown_086B21F4)
C_DECL(gUnknown_086B21F4):
.incbin "baserom_sa1.gba", 0x006B21F4, 0x800
.global gUnknown_086B29F4
gUnknown_086B29F4:
.global C_DECL(gUnknown_086B29F4)
C_DECL(gUnknown_086B29F4):
.incbin "baserom_sa1.gba", 0x006B29F4, 0x200
.global gUnknown_086B2BF4
gUnknown_086B2BF4:
.global C_DECL(gUnknown_086B2BF4)
C_DECL(gUnknown_086B2BF4):
.incbin "baserom_sa1.gba", 0x006B2BF4, 0x1E00
.global gUnknown_086B49F4
gUnknown_086B49F4:
.global C_DECL(gUnknown_086B49F4)
C_DECL(gUnknown_086B49F4):
.incbin "baserom_sa1.gba", 0x006B49F4, 0x800
.global gUnknown_086B51F4
gUnknown_086B51F4:
.global C_DECL(gUnknown_086B51F4)
C_DECL(gUnknown_086B51F4):
.incbin "baserom_sa1.gba", 0x006B51F4, 0x200
.global gUnknown_086B53F4
gUnknown_086B53F4:
.global C_DECL(gUnknown_086B53F4)
C_DECL(gUnknown_086B53F4):
.incbin "baserom_sa1.gba", 0x006B53F4, 0x1B80
.global gUnknown_086B6F74
gUnknown_086B6F74:
.global C_DECL(gUnknown_086B6F74)
C_DECL(gUnknown_086B6F74):
.incbin "baserom_sa1.gba", 0x006B6F74, 0x800
.global gUnknown_086B7774
gUnknown_086B7774:
.global C_DECL(gUnknown_086B7774)
C_DECL(gUnknown_086B7774):
.incbin "baserom_sa1.gba", 0x006B7774, 0x200
.global gUnknown_086B7974
gUnknown_086B7974:
.global C_DECL(gUnknown_086B7974)
C_DECL(gUnknown_086B7974):
.incbin "baserom_sa1.gba", 0x006B7974, 0x1880
.global gUnknown_086B91F4
gUnknown_086B91F4:
.global C_DECL(gUnknown_086B91F4)
C_DECL(gUnknown_086B91F4):
.incbin "baserom_sa1.gba", 0x006B91F4, 0x800
.global gUnknown_086B99F4
gUnknown_086B99F4:
.global C_DECL(gUnknown_086B99F4)
C_DECL(gUnknown_086B99F4):
.incbin "baserom_sa1.gba", 0x006B99F4, 0x200
.global gUnknown_086B9BF4
gUnknown_086B9BF4:
.global C_DECL(gUnknown_086B9BF4)
C_DECL(gUnknown_086B9BF4):
.incbin "baserom_sa1.gba", 0x006B9BF4, 0x1840
.global gUnknown_086BB434
gUnknown_086BB434:
.global C_DECL(gUnknown_086BB434)
C_DECL(gUnknown_086BB434):
.incbin "baserom_sa1.gba", 0x006BB434, 0x800
.global gUnknown_086BBC34
gUnknown_086BBC34:
.global C_DECL(gUnknown_086BBC34)
C_DECL(gUnknown_086BBC34):
.incbin "baserom_sa1.gba", 0x006BBC34, 0x200
.global gUnknown_086BBE34
gUnknown_086BBE34:
.global C_DECL(gUnknown_086BBE34)
C_DECL(gUnknown_086BBE34):
.incbin "baserom_sa1.gba", 0x006BBE34, 0x2980
.global gUnknown_086BE7B4
gUnknown_086BE7B4:
.global C_DECL(gUnknown_086BE7B4)
C_DECL(gUnknown_086BE7B4):
.incbin "baserom_sa1.gba", 0x006BE7B4, 0x1000
.global gUnknown_086BF7B4
gUnknown_086BF7B4:
.global C_DECL(gUnknown_086BF7B4)
C_DECL(gUnknown_086BF7B4):
.incbin "baserom_sa1.gba", 0x006BF7B4, 0x200
.global gUnknown_086BF9B4
gUnknown_086BF9B4:
.global C_DECL(gUnknown_086BF9B4)
C_DECL(gUnknown_086BF9B4):
.incbin "baserom_sa1.gba", 0x006BF9B4, 0x57C0
.global gUnknown_086C5174
gUnknown_086C5174:
.global C_DECL(gUnknown_086C5174)
C_DECL(gUnknown_086C5174):
.incbin "baserom_sa1.gba", 0x006C5174, 0xA00
.global gUnknown_086C5B74
gUnknown_086C5B74:
.global C_DECL(gUnknown_086C5B74)
C_DECL(gUnknown_086C5B74):
.incbin "baserom_sa1.gba", 0x006C5B74, 0x200
.global gUnknown_086C5D74
gUnknown_086C5D74:
.global C_DECL(gUnknown_086C5D74)
C_DECL(gUnknown_086C5D74):
.incbin "baserom_sa1.gba", 0x006C5D74, 0x1EC0
.global gUnknown_086C7C34
gUnknown_086C7C34:
.global C_DECL(gUnknown_086C7C34)
C_DECL(gUnknown_086C7C34):
.incbin "baserom_sa1.gba", 0x006C7C34, 0xA00
.global gUnknown_086C8634
gUnknown_086C8634:
.global C_DECL(gUnknown_086C8634)
C_DECL(gUnknown_086C8634):
.incbin "baserom_sa1.gba", 0x006C8634, 0x200
.global gUnknown_086C8834
gUnknown_086C8834:
.global C_DECL(gUnknown_086C8834)
C_DECL(gUnknown_086C8834):
.incbin "baserom_sa1.gba", 0x006C8834, 0x3540
.global gUnknown_086CBD74
gUnknown_086CBD74:
.global C_DECL(gUnknown_086CBD74)
C_DECL(gUnknown_086CBD74):
.incbin "baserom_sa1.gba", 0x006CBD74, 0xA00
.global gUnknown_086CC774
gUnknown_086CC774:
.global C_DECL(gUnknown_086CC774)
C_DECL(gUnknown_086CC774):
.incbin "baserom_sa1.gba", 0x006CC774, 0x20
.global gUnknown_086CC794
gUnknown_086CC794:
.global C_DECL(gUnknown_086CC794)
C_DECL(gUnknown_086CC794):
.incbin "baserom_sa1.gba", 0x006CC794, 0xA0
.global gUnknown_086CC834
gUnknown_086CC834:
.global C_DECL(gUnknown_086CC834)
C_DECL(gUnknown_086CC834):
.incbin "baserom_sa1.gba", 0x006CC834, 0x500
.global gPalette_086CCD34
gPalette_086CCD34:
.global C_DECL(gPalette_086CCD34)
C_DECL(gPalette_086CCD34):
.incbin "baserom_sa1.gba", 0x006CCD34, 0x20
.global gTiles_086CCD54
gTiles_086CCD54:
.global C_DECL(gTiles_086CCD54)
C_DECL(gTiles_086CCD54):
.incbin "baserom_sa1.gba", 0x006CCD54, 0xBA0
.global gLayout_086CD8F4
gLayout_086CD8F4:
.global C_DECL(gLayout_086CD8F4)
C_DECL(gLayout_086CD8F4):
.incbin "baserom_sa1.gba", 0x006CD8F4, 0x500
.global gLayout_086CDDF4
gLayout_086CDDF4:
.global C_DECL(gLayout_086CDDF4)
C_DECL(gLayout_086CDDF4):
.incbin "baserom_sa1.gba", 0x006CDDF4, 0x500
.global gUnknown_086CE2F4
gUnknown_086CE2F4:
.global C_DECL(gUnknown_086CE2F4)
C_DECL(gUnknown_086CE2F4):
.incbin "baserom_sa1.gba", 0x006CE2F4, 0x200
.global gUnknown_086CE4F4
gUnknown_086CE4F4:
.global C_DECL(gUnknown_086CE4F4)
C_DECL(gUnknown_086CE4F4):
.incbin "baserom_sa1.gba", 0x006CE4F4, 0x300
.global gUnknown_086CE7F4
gUnknown_086CE7F4:
.global C_DECL(gUnknown_086CE7F4)
C_DECL(gUnknown_086CE7F4):
.incbin "baserom_sa1.gba", 0x006CE7F4, 0x500
+8 -5
View File
@@ -1,7 +1,10 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global sBounceBlockAnims
sBounceBlockAnims:
mSectionRodata
.global C_DECL(sBounceBlockAnims)
C_DECL(sBounceBlockAnims):
.short 0x01CE @ SA1_ANIM_BOUNCE_BLOCK_1 @ Neo Green Hill 1
.short 0x01CE @ SA1_ANIM_BOUNCE_BLOCK_1 @ Neo Green Hill 2
.short 0x01F3 @ SA1_ANIM_BOUNCE_BLOCK_2 @ Secret Base 1
@@ -21,8 +24,8 @@ sBounceBlockAnims:
.short 0x021F @ SA1_ANIM_BOUNCE_BLOCK_5 @ 2-Player Casino Paradise
.short 0x0259 @ SA1_ANIM_BOUNCE_BLOCK_6_2 @ 2-Player Cosmic Angel
.global gUnknown_086CED28
gUnknown_086CED28:
.global C_DECL(gUnknown_086CED28)
C_DECL(gUnknown_086CED28):
.short 0x01D0 @ SA1_ANIM_WATER_SPLASH_1 @ Neo Green Hill 1
.short 0x01D0 @ SA1_ANIM_WATER_SPLASH_1 @ Neo Green Hill 2
.short 0x01D0 @ SA1_ANIM_WATER_SPLASH_1 @ Secret Base 1
+6 -3
View File
@@ -1,5 +1,8 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global sSoundTestSongIds
sSoundTestSongIds: @ 0x0868B078
mSectionRodata
.global C_DECL(sSoundTestSongIds)
C_DECL(sSoundTestSongIds): @ 0x0868B078
.incbin "baserom_sa1.gba", 0x0068B078, 0x54
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_chao_hunt_act_vs_zone_a_fg0 =
.animFrameCount = 4,
.animDelay = 10,
.tiles = Tileset_zone_chao_hunt_act_vs_zone_a_fg,
.tilesSize = sizeof(Tileset_zone_chao_hunt_act_vs_zone_a_fg) - (4 * 0x1C0),
.tilesSize = (u32)sizeof(Tileset_zone_chao_hunt_act_vs_zone_a_fg) - (4 * 0x1C0),
.palette = Palette_zone_chao_hunt_act_vs_zone_a_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_chao_hunt_act_vs_zone_a_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_chao_hunt_act_vs_zone_a_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_chao_hunt_act_vs_zone_a_fg,
.tilesSize = sizeof(Tileset_zone_chao_hunt_act_vs_zone_a_fg) - (4 * 0x1C0),
.tilesSize = (u32)sizeof(Tileset_zone_chao_hunt_act_vs_zone_a_fg) - (4 * 0x1C0),
.palette = Palette_zone_chao_hunt_act_vs_zone_a_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_chao_hunt_act_vs_zone_a_fg) / sizeof(u16),
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_chao_hunt_act_vs_zone_b_fg0 =
.animFrameCount = 8,
.animDelay = 8,
.tiles = Tileset_zone_chao_hunt_act_vs_zone_b_fg,
.tilesSize = sizeof(Tileset_zone_chao_hunt_act_vs_zone_b_fg) - (8 * 0x340),
.tilesSize = (u32)sizeof(Tileset_zone_chao_hunt_act_vs_zone_b_fg) - (8 * 0x340),
.palette = Palette_zone_chao_hunt_act_vs_zone_b_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_chao_hunt_act_vs_zone_b_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_chao_hunt_act_vs_zone_b_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_chao_hunt_act_vs_zone_b_fg,
.tilesSize = sizeof(Tileset_zone_chao_hunt_act_vs_zone_b_fg) - (8 * 0x340),
.tilesSize = (u32)sizeof(Tileset_zone_chao_hunt_act_vs_zone_b_fg) - (8 * 0x340),
.palette = Palette_zone_chao_hunt_act_vs_zone_b_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_chao_hunt_act_vs_zone_b_fg) / sizeof(u16),
+2 -2
View File
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_1_act_1_fg0 =
.animFrameCount = 4,
.animDelay = 10,
.tiles = Tileset_zone_1_act_1_fg,
.tilesSize = sizeof(Tileset_zone_1_act_1_fg) - (4 * 0x1C0),
.tilesSize = (u32)sizeof(Tileset_zone_1_act_1_fg) - (4 * 0x1C0),
.palette = Palette_zone_1_act_1_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_1_act_1_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_1_act_1_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_1_act_1_fg,
.tilesSize = sizeof(Tileset_zone_1_act_1_fg) - (4 * 0x1C0),
.tilesSize = (u32)sizeof(Tileset_zone_1_act_1_fg) - (4 * 0x1C0),
.palette = Palette_zone_1_act_1_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_1_act_1_fg) / sizeof(u16),
+2 -2
View File
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_1_act_2_fg0 =
.animFrameCount = 4,
.animDelay = 10,
.tiles = Tileset_zone_1_act_2_fg,
.tilesSize = sizeof(Tileset_zone_1_act_2_fg) - (4 * 0x1C0),
.tilesSize = (u32)sizeof(Tileset_zone_1_act_2_fg) - (4 * 0x1C0),
.palette = Palette_zone_1_act_2_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_1_act_2_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_1_act_2_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_1_act_2_fg,
.tilesSize = sizeof(Tileset_zone_1_act_2_fg) - (4 * 0x1C0),
.tilesSize = (u32)sizeof(Tileset_zone_1_act_2_fg) - (4 * 0x1C0),
.palette = Palette_zone_1_act_2_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_1_act_2_fg) / sizeof(u16),
+2 -2
View File
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_2_act_1_fg0 =
.animFrameCount = 8,
.animDelay = 4,
.tiles = Tileset_zone_2_act_1_fg,
.tilesSize = sizeof(Tileset_zone_2_act_1_fg) - (8 * 0x340),
.tilesSize = (u32)sizeof(Tileset_zone_2_act_1_fg) - (8 * 0x340),
.palette = Palette_zone_2_act_1_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_2_act_1_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_2_act_1_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_2_act_1_fg,
.tilesSize = sizeof(Tileset_zone_2_act_1_fg) - (8 * 0x340),
.tilesSize = (u32)sizeof(Tileset_zone_2_act_1_fg) - (8 * 0x340),
.palette = Palette_zone_2_act_1_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_2_act_1_fg) / sizeof(u16),
+2 -2
View File
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_2_act_2_fg0 =
.animFrameCount = 8,
.animDelay = 4,
.tiles = Tileset_zone_2_act_2_fg,
.tilesSize = sizeof(Tileset_zone_2_act_2_fg) - (8 * 0x340),
.tilesSize = (u32)sizeof(Tileset_zone_2_act_2_fg) - (8 * 0x340),
.palette = Palette_zone_2_act_2_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_2_act_2_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_2_act_2_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_2_act_2_fg,
.tilesSize = sizeof(Tileset_zone_2_act_2_fg) - (8 * 0x340),
.tilesSize = (u32)sizeof(Tileset_zone_2_act_2_fg) - (8 * 0x340),
.palette = Palette_zone_2_act_2_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_2_act_2_fg) / sizeof(u16),
+2 -2
View File
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_3_act_1_fg0 =
.animFrameCount = 4,
.animDelay = 4,
.tiles = Tileset_zone_3_act_1_fg,
.tilesSize = sizeof(Tileset_zone_3_act_1_fg) - (4 * 0x100),
.tilesSize = (u32)sizeof(Tileset_zone_3_act_1_fg) - (4 * 0x100),
.palette = Palette_zone_3_act_1_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_3_act_1_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_3_act_1_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_3_act_1_fg,
.tilesSize = sizeof(Tileset_zone_3_act_1_fg) - (4 * 0x100),
.tilesSize = (u32)sizeof(Tileset_zone_3_act_1_fg) - (4 * 0x100),
.palette = Palette_zone_3_act_1_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_3_act_1_fg) / sizeof(u16),
+2 -2
View File
@@ -21,7 +21,7 @@ ALIGNED(4) const struct MapHeader zone_3_act_2_fg0 =
.animFrameCount = 4,
.animDelay = 4,
.tiles = Tileset_zone_3_act_2_fg,
.tilesSize = sizeof(Tileset_zone_3_act_2_fg) - (4 * 0x100),
.tilesSize = (u32)sizeof(Tileset_zone_3_act_2_fg) - (4 * 0x100),
.palette = Palette_zone_3_act_2_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_3_act_2_fg) / sizeof(u16),
@@ -41,7 +41,7 @@ ALIGNED(4) const struct MapHeader zone_3_act_2_fg1 =
.animFrameCount = 0,
.animDelay = 0,
.tiles = Tileset_zone_3_act_2_fg,
.tilesSize = sizeof(Tileset_zone_3_act_2_fg) - (4 * 0x100),
.tilesSize = (u32)sizeof(Tileset_zone_3_act_2_fg) - (4 * 0x100),
.palette = Palette_zone_3_act_2_fg,
.palOffset = 0,
.palLength = sizeof(Palette_zone_3_act_2_fg) / sizeof(u16),
+8 -5
View File
@@ -1,9 +1,12 @@
.section .rodata
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.global gObjTiles_4bpp
gObjTiles_4bpp:
mSectionRodata
.global C_DECL(gObjTiles_4bpp)
C_DECL(gObjTiles_4bpp):
.include "graphics/obj_tiles_4bpp.inc"
.global gObjTiles_8bpp
gObjTiles_8bpp:
.global C_DECL(gObjTiles_8bpp)
C_DECL(gObjTiles_8bpp):
.include "graphics/obj_tiles_8bpp.inc"
+2 -1
View File
@@ -1,4 +1,5 @@
.include "asm/macros/portable.inc"
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.include "asm/macros/m4a.inc"
.include "asm/macros/music_voice.inc"
.include "asm/macros/c_decl.inc"
+1 -1
View File
@@ -12,7 +12,7 @@ const Tilemap ice_paradise_snow = {
.animFrameCount = 8,
.animDelay = 12,
.tiles = Tiles_ice_paradise_snow,
.tilesSize = sizeof(Tiles_ice_paradise_snow) - (9 * 0x140),
.tilesSize = (u32)sizeof(Tiles_ice_paradise_snow) - (9 * 0x140),
.palette = Palette_ice_paradise_snow,
.palOffset = 0,
.palLength = sizeof(Palette_ice_paradise_snow) / sizeof(u16),
+4 -3
View File
@@ -1,7 +1,8 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.include "sound/MPlayDef.s"
.section .rodata
mSectionRodata
@********************** Track 1 **********************@
@@ -3421,8 +3422,8 @@ song001_12: @ 0x0879D2DF
.byte FINE
mAlignWord
.global song001
song001: @ 0x0879D400
.global C_DECL(song001)
C_DECL(song001): @ 0x0879D400
.byte 12 @ trackCount
.byte 0 @ blockCount
.byte 0 @ priority
+4 -3
View File
@@ -1,7 +1,8 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.include "sound/MPlayDef.s"
.section .rodata
mSectionRodata
@********************** Track 1 **********************@
@@ -2352,8 +2353,8 @@ song017_8_2:
.byte FINE
mAlignWord
.global song017
song017: @ 0x087A7BF4
.global C_DECL(song017)
C_DECL(song017): @ 0x087A7BF4
.byte 8 @ trackCount
.byte 0 @ blockCount
.byte 0 @ priority
+4 -3
View File
@@ -1,7 +1,8 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.include "sound/MPlayDef.s"
.section .rodata
mSectionRodata
@********************** Track 1 **********************@
@@ -1922,8 +1923,8 @@ song020_9_4:
.byte FINE
mAlignWord
.global song020
song020: @ 0x087AA03C
.global C_DECL(song020)
C_DECL(song020): @ 0x087AA03C
.byte 9 @ trackCount
.byte 0 @ blockCount
.byte 0 @ priority
+4 -3
View File
@@ -1,7 +1,8 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.include "sound/MPlayDef.s"
.section .rodata
mSectionRodata
@********************** Track 1 **********************@
@@ -3889,8 +3890,8 @@ song030_8_1:
.byte FINE
mAlignWord
.global song030
song030: @ 0x087B1B9C
.global C_DECL(song030)
C_DECL(song030): @ 0x087B1B9C
.byte 8 @ trackCount
.byte 0 @ blockCount
.byte 0 @ priority
+4 -3
View File
@@ -1,7 +1,8 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.include "sound/MPlayDef.s"
.section .rodata
mSectionRodata
@********************** Track 1 **********************@
@@ -3680,8 +3681,8 @@ song039_14: @ 0x087B5E6E
.byte FINE
mAlignWord
.global song039
song039: @ 0x087B5ED0
.global C_DECL(song039)
C_DECL(song039): @ 0x087B5ED0
.byte 14 @ trackCount
.byte 0 @ blockCount
.byte 0 @ priority
+4 -3
View File
@@ -1,7 +1,8 @@
.include "asm/macros/c_decl.inc"
.include "asm/macros/portable.inc"
.include "sound/MPlayDef.s"
.section .rodata
mSectionRodata
@********************** Track 1 **********************@
@@ -5738,8 +5739,8 @@ song040_12: @ 0x087B7F59
.byte FINE
mAlignWord
.global song040
song040: @ 0x087B8084
.global C_DECL(song040)
C_DECL(song040): @ 0x087B8084
.byte 12 @ trackCount
.byte 0 @ blockCount
.byte 0 @ priority
+8 -4
View File
@@ -1038,7 +1038,7 @@ void Task_805AE84()
strc44->unk34++;
strc44->overB.qUnkA = 0;
sub_805321C(" ", &strc44->overB);
sub_805321C((u8 *)" ", &strc44->overB);
strc44->overB2.unkC = 6;
strc44->unk3C -= strc44->unk40;
@@ -1177,8 +1177,8 @@ void Task_805B11C()
void Task_805B1E0()
{
s32 *temp_r1;
s32 *temp_r1_2;
u32 *temp_r1;
u32 *temp_r1_2;
s32 temp_r0;
s32 temp_r0_2;
s32 temp_r4;
@@ -1230,7 +1230,11 @@ void Task_805B1E0()
// TEMP - Remove this once sub_805B324() matches!
#ifndef NON_MATCHING
#if !CPU_ARCH_X86 && defined(__APPLE__)
asm(" .section __DATA,__data");
#else
asm(" .section .rodata");
#endif
asm(" .global gUnknown_08688602");
asm("gUnknown_08688602:");
#endif
@@ -1512,7 +1516,7 @@ void Task_805B880(void)
strc20->unk18++;
sub_805321C(" !\"#$%&\'", &strc20->overB);
sub_805321C((u8 *)" !\"#$%&\'", &strc20->overB);
strc20->overB.qUnkA = gUnknown_08688570[(strc20->unk1C & 0x300) >> 8];
}
+8 -4
View File
@@ -2091,10 +2091,12 @@ NONMATCH("asm/non_matching/game/enemies/boss_x3__Task_8039A64.inc", void Task_80
}
worldX = COS(var_r6);
worldX >>= 6;
worldX = I((worldX *= sparkle->unk40) >> 8); // NOTE: Technically I(Q_MUL())!
worldX *= sparkle->unk40;
worldX = I((worldX) >> 8); // NOTE: Technically I(Q_MUL())!
worldY = SIN(var_r6);
worldY >>= 6;
worldY = I((worldY *= sparkle->unk40) >> 8);
worldY *= sparkle->unk40;
worldY = I((worldY) >> 8);
worldX += sparkle->unk50;
worldY += sparkle->unk52;
tf->x = worldX - gCamera.x;
@@ -2437,10 +2439,12 @@ void Task_803A2F8()
sparkle->unk40 = sparkleParent->unk40 + (Q((sparkle->unk60 * 0x10) + 8));
worldX = COS(var_r4);
worldX >>= 6;
worldX = I((worldX *= sparkle->unk40) >> 8);
worldX *= sparkle->unk40;
worldX = I((worldX) >> 8);
worldY = SIN(var_r4);
worldY >>= 6;
worldY = I((worldY *= sparkle->unk40) >> 8);
worldY *= sparkle->unk40;
worldY = I((worldY) >> 8);
worldX += sparkle->unk50;
worldY += sparkle->unk52;
+5
View File
@@ -1495,8 +1495,13 @@ void CreateExtraStageResults(void)
s->graphics.dest = OBJ_VRAM0 + 0x2560;
s->graphics.anim = SA1_ANIM_FINAL_CUTSCENE_SPARKLE_B;
s->variant = 0;
#ifdef BUG_FIX
s->x = 160;
s->y = -32;
#else
s->x = Q(160); // NOTE: These shouldn't be Q()!
s->y = -Q(32); // NOTE: These shouldn't be Q()!
#endif
s->oamFlags = SPRITE_OAM_ORDER(3);
s->graphics.size = 0;
s->animCursor = 0;
+7 -2
View File
@@ -816,7 +816,12 @@ void sub_803BE0C()
for (var_r6 = 0; var_r6 < message->unk54; var_r6++) {
u32 mask = 0x1FF;
#ifndef NON_MATCHING
SA2_LABEL(sub_80078D4)(0U, var_r4, var_r4 += 0x28, ~message->unk48[var_r6] & mask, (-message->unk50));
#else
SA2_LABEL(sub_80078D4)(0U, var_r4, var_r4 + 0x28, ~message->unk48[var_r6] & mask, (-message->unk50));
var_r4 += 0x28;
#endif
}
if (var_r4 < DISPLAY_HEIGHT) {
@@ -880,12 +885,12 @@ void sub_803BFE8()
if ((u8)(LOADED_SAVE->playerName[charIndex] - 0x70) < 26) {
overB->unkC += 8;
}
sub_8052F78(&LOADED_SAVE->playerName[charIndex], overB);
sub_8052F78((const char *)&LOADED_SAVE->playerName[charIndex], overB);
} else {
if ((u8)(LOADED_SAVE->multiplayerScores[gUnknown_03005008[i]].data.split.playerName[charIndex] - 0x70) < 26) {
overB->unkC += 8;
}
sub_8052F78(&LOADED_SAVE->multiplayerScores[gUnknown_03005008[i]].data.split.playerName[charIndex], overB);
sub_8052F78((const char *)&LOADED_SAVE->multiplayerScores[gUnknown_03005008[i]].data.split.playerName[charIndex], overB);
}
}
}
+5 -1
View File
@@ -22,7 +22,11 @@
#if (GAME == GAME_SA1) && !(defined NON_MATCHING)
// Once CreateMultiplayerFinishHandler matches in SA1,
// this can go away.
asm(".section .rodata");
#if !CPU_ARCH_X86 && defined(__APPLE__)
asm(" .section __DATA,__data");
#else
asm(" .section .rodata");
#endif
asm(".align 2, 0");
asm(".global gUnknown_080BB490");
asm("gUnknown_080BB490:");
+7 -2
View File
@@ -29,7 +29,11 @@ typedef struct MPStrc1 {
/* 0x40 */ u8 filler40[0x40];
/* 0x80 */ SpriteStrc sprites[4];
/* 0x120 */ u8 filler160[0x2D0];
#if WIDESCREEN_HACK
/* 0x430 */ u32 qUnk430;
#else
/* 0x430 */ u16 qUnk430;
#endif
/* 0x432 */ s16 unk432;
} MPStrc1; /* 0x434 */
@@ -402,13 +406,14 @@ NONMATCH("asm/non_matching/game/multiplayer/unk_1__Task_801D200.inc", void Task_
if (character >= 0x70 && character < 0x8A) {
overB->unkC += 8;
}
sub_8052F78(&LOADED_SAVE->playerName[nameChar], overB);
sub_8052F78((const char *)&LOADED_SAVE->playerName[nameChar], overB);
} else {
u8 character = LOADED_SAVE->multiplayerScores[gUnknown_03005008[var_r6]].data.split.playerName[nameChar];
if (character >= 0x70 && character < 0x8A) {
overB->unkC += 8;
}
sub_8052F78(&LOADED_SAVE->multiplayerScores[gUnknown_03005008[var_r6]].data.split.playerName[nameChar], overB);
sub_8052F78((const char *)&LOADED_SAVE->multiplayerScores[gUnknown_03005008[var_r6]].data.split.playerName[nameChar],
overB);
}
}
}
+1 -1
View File
@@ -339,7 +339,7 @@ NONMATCH("asm/non_matching/game/stage/ui__sub_8053BAC.inc", void sub_8053BAC(voi
TASK_SET_MEMBER(StageUI, gCurTask, u16, unk48, r4);
} else {
sub_80530CC((const u8 *)&ui->digitsRings[2], &overB);
sub_80530CC((const char *)&ui->digitsRings[2], &overB);
}
} else if (gRingCount <= 99) {
overB.qUnkA = 5;
+5 -1
View File
@@ -126,8 +126,12 @@ u16 ProgramFlashSector_LE(u16 sectorNum, void *src)
if (sectorNum > 15)
return 0x80FF;
#if AGBFLASH_USE_V126
#if !AGBFLASH_USE_V126
#ifdef BUG_FIX
if (gFlash->romSize == FLASH_ROM_SIZE_1M) {
#else
if (gFlash->sector.count == FLASH_ROM_SIZE_1M) {
#endif
SwitchFlashBank(sectorNum / SECTORS_PER_BANK);
sectorNum %= SECTORS_PER_BANK;
}