pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

match

Browse Source
This commit is contained in:
Alex Bates 2020-12-26 12:02:19 +00:00
parent dfcb98ec0b
commit 10e54d9070
2 changed files with 74 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/battle/battle.c
View File

@ -17,20 +17,74 @@ typedef struct BattleArea {
.dmaEnd = &code_##id##_ROM_END, \
.dmaDest = &code_##id##_VRAM
// help
const s32 lol[] = {
0x08080808, 0x08080808, 0x08080808, 0x08080808,
0x08080808, 0x08080808, 0x08080808, 0x08080808,
0x08080808, 0x08080808, 0x08080808, 0x08080808,
0x08080808, 0x08080808, 0x08080808, 0x08080808,
0x08080808, 0x08080808, 0x08080808, 0x08080808,
0x08080808, 0x08080808, 0x08080808, 0x08080808,
0x08080808, 0x08080808, 0x08080808, 0x08080808,
0x08080808, 0x08080808, 0x08080808, 0x08080808,
const s32 rodata_75240[] = {
/* 0x75240 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75250 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75260 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75270 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75280 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75290 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x752A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x752B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x752C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x752D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x752E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x752F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75300 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75310 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75320 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75330 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75340 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75350 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75360 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75370 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75380 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75390 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x753A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x753B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x753C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x753D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x753E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x753F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75400 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75410 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75420 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75430 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75440 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75450 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75460 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75470 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75480 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75490 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x754A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x754B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x754C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x754D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x754E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x754F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75500 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75510 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75520 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75530 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75540 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
/* 0x75550 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
/* 0x75560 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75570 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
/* 0x75580 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x75590 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x755A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x755B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
/* 0x755C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x755D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x755E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x755F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75600 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75610 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75620 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
/* 0x75630 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
};
BattleArea gBattleAreas[] = {
BattleArea gBattleAreas[0x30] = {
{
AREA(area_kmr_part_1),
.name = "エリア ＫＭＲ その１",
@ -299,3 +353,10 @@ BattleArea gBattleAreas[] = {
},
{},
};
const s32 rodata_75978[] = {
0x80072F38, 0x80072F4C,
0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000,
0x8007301C, 0x80073070, 0x80073094, 0x800730CC,
0x800730F8,
};

2
tools/splat.yaml
View File

@ -211,7 +211,7 @@ segments:
- [0x71430, bin]
- [0x73DA0, .rodata, world/world]
- [0x74EA0, bin]
- [0x75570, .rodata, battle/battle] # help
- [0x75240, .rodata, battle/battle] # ram 80099E40
- type: code
start: 0x759B0
vram: 0x800DC500