Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-11 18:45:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #155 from Kermalis/kermalis-code800558C

Browse Source 
Match all of code_800558C.s
This commit is contained in:
AnonymousRandomPerson
2023-08-31 17:45:20 -04:00
committed by GitHub
parent 34e14bacef 37d1723b66
commit 4b1a27433b
29 changed files with 1945 additions and 1745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

276
asm/code_800558C.s
View File

@@ -1,276 +0,0 @@
#include "asm/constants/gba_constants.inc"
#include "asm/macros.inc"
.syntax unified
.text
thumb_func_start DoAxFrame_800558C
DoAxFrame_800558C:
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
adds r4, r1, 0
adds r6, r2, 0
adds r7, r3, 0
ldrh r0, [r5]
lsrs r0, 15
cmp r0, 0
beq _08005602
movs r1, 0x20
ldrsh r0, [r5, r1]
cmp r0, 0
bge _080055AE
adds r0, r5, 0
bl sub_80054BC
_080055AE:
ldrh r0, [r5]
lsrs r0, 15
cmp r0, 0
beq _08005602
ldrh r0, [r5, 0xC]
adds r0, r4
strh r0, [r5, 0x8]
ldrh r0, [r5, 0xE]
adds r0, r6
strh r0, [r5, 0xA]
adds r1, r5, 0
adds r1, 0x26
ldr r0, [sp, 0x18]
strb r0, [r1]
strh r7, [r5, 0x1E]
ldr r0, [r5, 0x34]
ldr r1, [r5, 0x38]
adds r2, r5, 0
adds r2, 0x8
movs r3, 0x22
ldrsh r4, [r5, r3]
movs r6, 0x20
ldrsh r3, [r5, r6]
eors r4, r3
negs r3, r4
orrs r3, r4
lsrs r3, 31
str r3, [sp]
ldr r3, [sp, 0x1C]
bl sub_800533C
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x22]
ldrh r1, [r5]
movs r0, 0x80
lsls r0, 4
ands r0, r1
cmp r0, 0
beq _08005602
ldr r0, _0800560C
ands r0, r1
strh r0, [r5]
_08005602:
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0800560C: .4byte 0x0000f7ff
thumb_func_end DoAxFrame_800558C
thumb_func_start sub_8005610
sub_8005610:
push {lr}
ldr r0, [r0, 0x4]
bl sub_800561C
pop {r0}
bx r0
thumb_func_end sub_8005610
thumb_func_start sub_800561C
sub_800561C:
push {r4-r7,lr}
adds r5, r0, 0
adds r0, r1, 0
adds r7, r2, 0
adds r6, r3, 0
ldr r1, [r5, 0x14]
cmp r1, 0
beq _0800563A
lsls r0, 5
ldr r2, _08005664
adds r0, r2
ldr r2, [r5, 0x1C]
lsls r2, 5
bl CpuCopy
_0800563A:
ldr r0, [r5, 0x18]
cmp r0, 0
beq _0800565C
movs r4, 0
_08005642:
movs r1, 0xF0
lsls r1, 1
adds r0, r4, r1
lsls r2, r4, 2
ldr r1, [r5, 0x18]
adds r1, r2
adds r2, r7, 0
adds r3, r6, 0
bl SetBGPaletteBufferColorRGB
adds r4, 0x1
cmp r4, 0xF
ble _08005642
_0800565C:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08005664: .4byte 0x06010000
thumb_func_end sub_800561C
thumb_func_start sub_8005668
sub_8005668:
push {lr}
ldr r0, [r0, 0x4]
bl sub_8005674
pop {r1}
bx r1
thumb_func_end sub_8005668
thumb_func_start sub_8005674
sub_8005674:
push {r4,lr}
adds r4, r0, 0
ldr r3, [r4, 0x14]
cmp r3, 0
beq _0800568E
lsls r0, r1, 5
ldr r1, _08005698
adds r0, r1
ldr r2, [r4, 0x1C]
lsls r2, 5
adds r1, r3, 0
bl CpuCopy
_0800568E:
ldr r0, [r4, 0x18]
pop {r4}
pop {r1}
bx r1
.align 2, 0
_08005698: .4byte 0x06010000
thumb_func_end sub_8005674
thumb_func_start sub_800569C
sub_800569C:
push {r4-r6,lr}
adds r3, r0, 0
adds r4, r1, 0
lsls r2, 24
lsrs r2, 24
movs r0, 0
strh r0, [r3]
strh r0, [r3, 0x2]
ldrh r0, [r4]
lsrs r0, 15
cmp r0, 0
beq _080056F8
cmp r2, 0x3
bhi _080056F8
ldr r1, [r4, 0x30]
cmp r1, 0
beq _080056F2
movs r5, 0x20
ldrsh r0, [r4, r5]
lsls r0, 4
adds r5, r1, r0
lsls r0, r2, 2
adds r2, r5, r0
movs r6, 0
ldrsh r1, [r2, r6]
cmp r1, 0x63
bne _080056E0
movs r6, 0x2
ldrsh r1, [r2, r6]
cmp r1, 0x63
bne _080056E0
strh r1, [r3]
strh r1, [r3, 0x2]
b _080056F8
_080056E0:
adds r0, r5, r0
ldrh r1, [r0]
ldrh r2, [r4, 0xC]
adds r1, r2
strh r1, [r3]
ldrh r0, [r0, 0x2]
ldrh r4, [r4, 0xE]
adds r0, r4
b _080056F6
_080056F2:
movs r0, 0x63
strh r0, [r3]
_080056F6:
strh r0, [r3, 0x2]
_080056F8:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_800569C
thumb_func_start sub_8005700
sub_8005700:
push {r4,r5,lr}
adds r3, r0, 0
ldrh r0, [r1]
lsrs r0, 15
cmp r0, 0
beq _0800575C
ldr r2, [r1, 0x30]
cmp r2, 0
beq _0800574C
movs r4, 0x20
ldrsh r0, [r1, r4]
lsls r0, 4
adds r2, r0
adds r4, r2, 0
adds r4, 0xC
_0800571E:
movs r5, 0
ldrsh r0, [r2, r5]
cmp r0, 0x63
bne _08005732
movs r5, 0x2
ldrsh r0, [r2, r5]
cmp r0, 0x63
bne _08005732
strh r0, [r3]
b _08005740
_08005732:
ldrh r0, [r2]
ldrh r5, [r1, 0xC]
adds r0, r5
strh r0, [r3]
ldrh r0, [r2, 0x2]
ldrh r5, [r1, 0xE]
adds r0, r5
_08005740:
strh r0, [r3, 0x2]
adds r3, 0x4
adds r2, 0x4
cmp r2, r4
ble _0800571E
b _0800575C
_0800574C:
movs r1, 0x63
movs r0, 0x3
_08005750:
strh r1, [r3]
strh r1, [r3, 0x2]
adds r3, 0x4
subs r0, 0x1
cmp r0, 0
bge _08005750
_0800575C:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_8005700
.align 2, 0 @ Don't pad with nop.

1129
asm/code_8005838.s
View File

File diff suppressed because it is too large Load Diff

97
asm/code_805744C.s
View File

@@ -1,97 +0,0 @@
#include "asm/constants/gba_constants.inc"
#include "asm/macros.inc"
.syntax unified
.text
thumb_func_start sub_80574C4
sub_80574C4:
push {r4-r6,lr}
sub sp, 0x104
adds r4, r0, 0
adds r5, r1, 0
movs r3, 0
movs r2, 0
ldr r0, [r4]
cmp r0, 0
beq _08057502
cmp r0, r5
beq _080574EA
_080574DA:
lsls r0, r3, 2
mov r6, sp
adds r1, r6, r0
lsls r0, r2, 2
adds r0, r4
ldr r0, [r0]
str r0, [r1]
adds r3, 0x1
_080574EA:
adds r2, 0x1
cmp r2, 0x40
bgt _08057502
lsls r0, r2, 2
adds r0, r4
ldr r0, [r0]
cmp r0, 0
beq _08057502
cmp r0, r5
beq _080574EA
cmp r3, 0x3F
ble _080574DA
_08057502:
movs r2, 0
ldr r0, [r4]
b _08057524
_08057508:
lsls r0, r3, 2
mov r6, sp
adds r1, r6, r0
lsls r0, r2, 2
adds r0, r4
ldr r0, [r0]
str r0, [r1]
adds r3, 0x1
_08057518:
adds r2, 0x1
cmp r2, 0x40
bgt _08057530
lsls r0, r2, 2
adds r0, r4
ldr r0, [r0]
_08057524:
cmp r0, 0
beq _08057530
cmp r0, r5
bne _08057518
cmp r3, 0x3F
ble _08057508
_08057530:
cmp r3, 0x40
bgt _08057542
movs r1, 0
lsls r0, r3, 2
add r0, sp
_0805753A:
stm r0!, {r1}
adds r3, 0x1
cmp r3, 0x40
ble _0805753A
_08057542:
mov r3, sp
adds r1, r4, 0
movs r2, 0x40
_08057548:
ldm r3!, {r0}
stm r1!, {r0}
subs r2, 0x1
cmp r2, 0
bge _08057548
add sp, 0x104
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_80574C4
.align 2,0 @ Don't pad with nop

2
include/axdata.h
View File

@@ -62,7 +62,7 @@ struct axdata
/* 0x28 */ struct ax_anim *nextAnimData; // next animation data (if flags&0x1000)
/* 0x2C */ struct ax_anim *activeAnimData; // current animation data
/* 0x30 */ void *paletteData; // ?
/* 0x34 */ struct ax_pose *poseData;
/* 0x34 */ struct ax_pose **poseData;
/* 0x38 */ struct UnkSpriteMem **spriteData;
};

36
include/bg.h
View File

@@ -1,36 +0,0 @@
#ifndef GUARD_BG_H
#define GUARD_BG_H
enum
{
BG0,
BG1,
BG2,
BG3,
NUM_BGS
};
struct BGControlStruct
{
u16 padding;
u16 unk2;
s16 hofs;
s16 vofs;
};
extern struct BGControlStruct gBG0Control;
extern struct BGControlStruct gBG1Control;
extern struct BGControlStruct gBG2Control;
extern struct BGControlStruct gBG3Control;
void SetBG0RegOffsets(s32 xoffset, s32 yoffset);
void SetBG1RegOffsets(s32 xoffset, s32 yoffset);
void SetBG2RegOffsets(s32 xoffset, s32 yoffset);
void SetBG3RegOffsets(s32 xoffset, s32 yoffset);
void SetBGRegOffsets(s32 reg, u32 xoffset, s32 yoffset);
void SetBGRegXOffset(s32 reg, s32 offset);
void SetBGRegYOffset(s32 reg, s32 offset);
void UpdateBGControlRegisters(void);
void SetBGOBJEnableFlags(u32 mask);
#endif

35
include/bg_control.h Normal file
View File

@@ -0,0 +1,35 @@
#ifndef GUARD_BG_CONTROL_H
#define GUARD_BG_CONTROL_H
enum
{
BG0,
BG1,
BG2,
BG3,
NUM_BGS
};
struct BGControlStruct
{
u16 padding;
u16 unk2;
s16 hofs;
s16 vofs;
};
extern struct BGControlStruct gBG0Control;
extern struct BGControlStruct gBG1Control;
extern struct BGControlStruct gBG2Control;
extern struct BGControlStruct gBG3Control;
extern u16 gBldAlpha;
extern u16 gBldCnt;
extern bool8 gUnknown_202D7FE;
void SetBG2RegOffsets(s32, s32);
void SetBG3RegOffsets(s32, s32);
void SetBGOBJEnableFlags(u32);
void SetBldAlphaReg(s32, s32);
void sub_800CD64(s32, bool8);
#endif // GUARD_BG_CONTROL_H

25
include/code_800558C.h
View File

@@ -1,7 +1,28 @@
#ifndef GUARD_CODE_800558C_H
#define GUARD_CODE_800558C_H
extern void *gUnknown_203B078;
#include "file_system.h"
// size: ? 0x20 for now
struct unkStructFor800561C
{
u8 fill0[0x14 - 0x0];
void *unk14;
s32 *unk18;
s32 unk1C;
};
extern s16 *gUnknown_203B078;
void nullsub_7(s16 *);
void nullsub_9(void);
void nullsub_10(bool8);
void nullsub_12(void);
void nullsub_13(void);
void nullsub_14(void);
void sub_8005610(struct OpenedFile *, s32, s32, u8 *);
void sub_8005770(s32, u8 *, s32, u8 *);
void sub_80057E8(void);
void sub_80060EC(void);
#endif //GUARD_CODE_800558C_H
#endif // GUARD_CODE_800558C_H

13
include/code_800558C_1.h
View File

@@ -1,13 +0,0 @@
#ifndef GUARD_CODE_800558C_1_H
#define GUARD_CODE_800558C_1_H
void nullsub_7(s16 *);
void nullsub_9(void);
void nullsub_10(bool8);
void nullsub_12(void);
void nullsub_13(void);
void nullsub_14(void);
void sub_8005770(s32, u8 *, s32, u8 *);
void sub_80057E8(void);
#endif // GUARD_CODE_800558C_1_H

2
include/cpu.h
View File

@@ -4,7 +4,7 @@
void CpuClear(void *, s32);
void CpuCopy(void *, void *, s32);
void nullsub_23(bool8);
void SetWindowTitle(char *);
void SetWindowTitle(u8 *);
void sub_800CDA8(u32);
u32 sub_800CDC8(void);
void VBlank_CB(void);

1
include/reg_control.h
View File

@@ -18,5 +18,6 @@ extern s16 gUnknown_203B0AE;
void nullsub_17(void);
void xxx_update_bg_sound_input(void);
void sub_800BA5C(void);
#endif // GUARD_CODE_800B5F0_H

1
include/sprite.h
View File

@@ -83,6 +83,7 @@ void SetSavingIconCoords(struct Position *);
void sub_8004E8C(struct unkStruct_2039DB0 *);
void sub_8005180(void);
void sub_8005304(void);
void sub_800533C(struct ax_pose **, struct UnkSpriteMem **, struct axdata1 *, u16 *, bool8);
void sub_80053AC(struct EntitySpriteInfo *, struct OpenedFile *, u32, u32, u32, u32, bool8);
void sub_80053D0(struct EntitySpriteInfo *, struct Dungeon_ax *, u32, u32, u32, u32, bool8);
void sub_800543C(struct EntitySpriteInfo *, struct OpenedFile *, u32, u32, u32, bool8);

4
ld_script.txt
View File

@@ -61,9 +61,6 @@ SECTIONS {
src/input.o(.text);
src/code_8004AA0.o(.text);
src/sprite.o(.text);
asm/code_800558C.o(.text);
src/code_800558C_1.o(.text);
asm/code_8005838.o(.text);
src/code_800558C.o(.text);
src/random.o(.text);
src/text1.o(.text);
@@ -190,7 +187,6 @@ SECTIONS {
asm/code_80521D0.o(.text);
src/charge_move.o(.text);
src/move_util.o(.text);
asm/code_805744C.o(.text);
src/code_8057824.o(.text);
asm/code_8057824.o(.text);
src/code_805A120.o(.text);

50
src/bg_control.c
View File

@@ -1,51 +1,42 @@
#include "global.h"
#include "bg_control.h"
#include "input.h"
#include "bg.h"
EWRAM_DATA struct BGControlStruct gBG0Control = {0};
EWRAM_DATA struct BGControlStruct gBG1Control = {0};
EWRAM_DATA struct BGControlStruct gBG2Control = {0};
EWRAM_DATA struct BGControlStruct gBG3Control = {0};
EWRAM_DATA u8 gBldAlpha_CoeffA = {0};
EWRAM_DATA u8 gBldAlpha_CoeffB = {0};
static EWRAM_DATA u8 sBldAlpha_CoeffA = {0};
static EWRAM_DATA u8 sBldAlpha_CoeffB = {0};
EWRAM_DATA u16 gBldAlpha;
EWRAM_DATA u16 gBldCnt;
EWRAM_DATA u8 gUnknown_202D7FE;
EWRAM_DATA bool8 gUnknown_202D7FE;
void SetBldAlphaReg(s32 lowAlpha, s32 highAlpha)
{
if(lowAlpha < 0)
{
if (lowAlpha < 0)
lowAlpha = 0;
}
else if(lowAlpha > 16)
{
else if (lowAlpha > 16)
lowAlpha = 16;
}
if(highAlpha < 0)
{
if (highAlpha < 0)
highAlpha = 0;
}
else if(highAlpha > 16)
{
else if (highAlpha > 16)
highAlpha = 16;
}
gBldAlpha_CoeffA = lowAlpha;
gBldAlpha_CoeffB = highAlpha;
sBldAlpha_CoeffA = lowAlpha;
sBldAlpha_CoeffB = highAlpha;
gBldAlpha = BLDALPHA_BLEND1(gBldAlpha_CoeffA, gBldAlpha_CoeffB);
gBldAlpha = BLDALPHA_BLEND1(sBldAlpha_CoeffA, sBldAlpha_CoeffB);
}
void SetBG0RegOffsets(s32 xoffset, s32 yoffset)
static void SetBG0RegOffsets(s32 xoffset, s32 yoffset)
{
gBG0Control.hofs = xoffset;
gBG0Control.vofs = yoffset;
}
void SetBG1RegOffsets(s32 xoffset, s32 yoffset)
static void SetBG1RegOffsets(s32 xoffset, s32 yoffset)
{
gBG1Control.hofs = xoffset;
gBG1Control.vofs = yoffset;
@@ -63,7 +54,7 @@ void SetBG3RegOffsets(s32 xoffset, s32 yoffset)
gBG3Control.vofs = yoffset;
}
void SetBGRegOffsets(s32 reg, u32 xoffset, s32 yoffset)
UNUSED static void SetBGRegOffsets(s32 reg, u32 xoffset, s32 yoffset)
{
switch (reg) {
default:
@@ -74,7 +65,7 @@ void SetBGRegOffsets(s32 reg, u32 xoffset, s32 yoffset)
}
}
void SetBGRegXOffset(s32 reg, s32 offset)
UNUSED static void SetBGRegXOffset(s32 reg, s32 offset)
{
switch (reg) {
default:
@@ -93,7 +84,7 @@ void SetBGRegXOffset(s32 reg, s32 offset)
}
}
void SetBGRegYOffset(s32 reg, s32 offset)
UNUSED static void SetBGRegYOffset(s32 reg, s32 offset)
{
switch (reg) {
default:
@@ -112,14 +103,13 @@ void SetBGRegYOffset(s32 reg, s32 offset)
}
}
void sub_800CD64(s32 r0, u8 r1)
void sub_800CD64(s32 r0, bool8 r1)
{
gUnknown_202D7FE = r1;
gBG2Control.unk2 = r0 ? 0x8000 : 0;
gBG2Control.unk2 = r0 ? 0x8000 : 0;
}
void SetBGOBJEnableFlags(u32 mask)
{
REG_DISPCNT = (REG_DISPCNT & 0xe0ff) | (~(mask << 8) & (DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON));
}
REG_DISPCNT = (REG_DISPCNT & 0xE0FF) | (~(mask << 8) & (DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON));
}

5
src/code_2.c
View File

@@ -1,5 +1,5 @@
#include "global.h"
#include "bg.h"
#include "bg_control.h"
#include "constants/bg_music.h"
#include "debug.h"
#include "file_system.h"
@@ -30,7 +30,6 @@ extern void LoadGameOptions(void);
extern void SetWindowBGColor(void);
extern void LoadItemParameters(void);
extern void LoadMailInfo(void);
extern void sub_800CD64(u32, u32);
extern void sub_800DAAC(void);
extern void sub_800135C(void);
extern void xxx_script_related_8001334(u32);
@@ -88,7 +87,7 @@ void GameLoop(void)
LoadWazaParameters();
sub_80950BC();
LoadMailInfo();
sub_800CD64(0x8000, 0);
sub_800CD64(0x8000, FALSE);
sub_8012284();
InitializeGameOptions(TRUE);
SetWindowTitle(gPMDBuildVersion);

1764
src/code_800558C.c
View File

File diff suppressed because it is too large Load Diff

97
src/code_800558C_1.c
View File

@@ -1,97 +0,0 @@
#include "global.h"
#include "bg_palette_buffer.h"
#include "code_800558C_1.h"
#include "file_system.h"
extern u8 gUnknown_2026E38;
extern u32 gUnknown_2026E3C;
extern u8 gUnknown_2026E4C;
extern u16 gUnknown_2026E4E;
extern bool32 gUnknown_2026E50;
extern bool32 gUnknown_2026E54;
extern u32 gUnknown_2026E58;
extern u32 gUnknown_203B078;
UNUSED static void sub_8005764(s32 a0, struct OpenedFile *file, s32 a2, u8 *a3)
{
sub_8005770(a0, file->data, a2, a3);
}
void sub_8005770(s32 param_1, u8 *RGBArray, s32 a1, u8 *a2)
{
s32 i;
for (i = 0; i < 16; i++)
SetBGPaletteBufferColorRGB((param_1 + 0x10) * 0x10 + i, &RGBArray[i * 4], a1, a2);
}
// Maybe struct Position
void nullsub_7(s16 *a0)
{}
void nullsub_8(void)
{}
void nullsub_9(void)
{}
void nullsub_10(bool8 a0)
{}
UNUSED static void nullsub_144(void)
{}
void nullsub_11(void)
{}
void nullsub_12(void)
{}
void nullsub_13(void)
{}
UNUSED static void nullsub_145(void)
{}
void nullsub_14(void)
{}
UNUSED static void nullsub_146(void)
{}
UNUSED static void nullsub_147(void)
{}
UNUSED static void nullsub_148(void)
{}
UNUSED static void nullsub_149(void)
{}
UNUSED static bool8 sub_80057D8(void)
{
return FALSE;
}
UNUSED static bool8 sub_80057DC(void)
{
return FALSE;
}
UNUSED static void nullsub_150(void)
{}
UNUSED static void nullsub_151(void)
{}
void sub_80057E8(void)
{
gUnknown_2026E4C = 1;
gUnknown_2026E54 = 0;
gUnknown_2026E50 = 1;
gUnknown_2026E58 = 0;
gUnknown_2026E3C = 0;
gUnknown_2026E38 = 0;
gUnknown_2026E4E = 0x60C;
gUnknown_203B078 = 0;
}

2
src/code_800C9CC.c
View File

@@ -3,8 +3,6 @@
#include "random.h"
#include "reg_control.h"
void sub_800BA5C();
extern u32 gUnknown_203B0B8;
extern u16 gRawKeyInput;

4
src/code_800DAC0.c
View File

@@ -1,4 +1,6 @@
#include "global.h"
#include "bg_control.h"
#include "code_800558C.h"
#include "code_800DAC0.h"
#include "code_80118A4.h"
#include "file_system.h"
@@ -48,7 +50,6 @@ extern void sub_8009BE4(void);
extern void sub_8040238(void);
extern void sub_800F204(void);
extern void sub_803EAF0(u32, u32);
extern void sub_800CD64(u32, u32);
extern struct unkStruct_800F18C *sub_800F18C(s32);
extern void sub_800DCA8(struct unkStruct_203B0CC_sub *);
@@ -56,7 +57,6 @@ extern u8 gefob000_string[];
extern u8 gefob001_string[];
extern struct FileArchive gEffectFileArchive;
extern void sub_8005610(struct OpenedFile *, u32, u32,u32);
extern void sub_800F034(void);
extern void sub_800ED38(u32);
extern void sub_800DC14(void);

4
src/code_80118A4.c
View File

@@ -2,11 +2,12 @@
#include <stdio.h>
#include "global.h"
#include "code_8004AA0.h"
#include "code_800558C.h"
#include "code_80118A4.h"
#include "music.h"
#include "constants/bg_music.h"
#include "play_time.h"
#include "bg.h"
#include "bg_control.h"
#include "input.h"
#include "config.h"
#include "game_options.h"
@@ -40,7 +41,6 @@ extern void TransferBGPaletteBuffer(void);
extern void xxx_call_update_bg_vram(void);
extern void sub_8009908(void);
extern void xxx_call_update_bg_sound_input(void);
extern void sub_80060EC(void);
extern void sub_800CB20(void);
extern bool8 sub_80111C4();
extern void sub_8010F28();

2
src/code_8040094.c
View File

@@ -1,4 +1,5 @@
#include "global.h"
#include "code_800558C.h"
#include "code_80118A4.h"
#include "code_80521D0.h"
#include "dungeon_entity.h"
@@ -15,7 +16,6 @@ extern struct FileArchive gDungeonFileArchive;
extern struct OpenedFile *gUnknown_202EE04;
extern void sub_803F7BC(void);
extern void sub_80060EC(void);
extern void sub_800CB20(void);
extern void LoadBufferedInputs(void);
extern void xxx_call_update_bg_sound_input(void);

59
src/code_8057824.c
View File

@@ -136,6 +136,65 @@ extern void sub_806F324(struct Entity *, s32, u32, u32);
extern s16 gUnknown_80F4DB4;
extern u32 gUnknown_8106A4C;
// TODO: WTF are these loops? https://decomp.me/scratch/svYTQ
void sub_80574C4(s32 *a0, s32 a1)
{
s32 r2;
s32 r3;
s32 temp;
s32 buffer[0x41];
r3 = 0;
r2 = 0;
if (a0[0] != 0) {
if (a0[0] == a1)
goto continue1;
itsmol1:
buffer[r3] = a0[r2];
r3++;
continue1:
r2++;
if (r2 >= 0x41)
goto break1;
if (a0[r2] == 0)
goto break1;
if (a0[r2] == a1)
goto continue1;
if (r3 < 0x40)
goto itsmol1;
}
break1:
r2 = 0;
temp = a0[r2];
goto for2;
itsmol2:
buffer[r3] = a0[r2];
r3++;
continue2:
r2++;
if (r2 > 0x40)
goto break2;
temp = a0[r2];
for2:
if (temp == 0)
goto break2;
if (temp != a1)
goto continue2;
if (r3 < 0x40)
goto itsmol2;
break2:
while (r3 < 0x41) {
buffer[r3] = 0;
r3++;
}
for (r2 = 0; r2 < 0x41; r2++) {
a0[r2] = buffer[r2];
}
}
bool8 sub_805755C(struct Entity* pokemon, u16 moveID)
{
if ((moveID == MOVE_SOLARBEAM) && (GetApparentWeather(pokemon) == WEATHER_SUNNY)) {

10
src/cpu.c
View File

@@ -1,8 +1,8 @@
#include "global.h"
#include "bg_control.h"
#include "cpu.h"
extern u32 gUnknown_202D800;
extern u16 gBldCnt; // used to update Blend Count Reg
extern u16 gUnknown_203B0BE[];
void sub_800CDA8(u32 r0)
@@ -16,7 +16,7 @@ u32 sub_800CDC8(void)
return gUnknown_202D800;
}
void SetWindowTitle(char *title)
void SetWindowTitle(u8 *title)
{
}
@@ -24,13 +24,11 @@ void nullsub_23(bool8 a0)
{
}
// Unused
void nullsub_182(void)
UNUSED static void nullsub_182(void)
{
}
// Unused
bool8 sub_800CDE0(void)
UNUSED static bool8 sub_800CDE0(void)
{
return TRUE;
}

2
src/ground_sprite.c
View File

@@ -1,5 +1,5 @@
#include "global.h"
#include "code_800558C_1.h"
#include "code_800558C.h"
#include "code_800DAC0.h"
#include "debug.h"
#include "file_system.h"

7
src/main.c
View File

@@ -1,7 +1,8 @@
#include "global.h"
#include "bg_control.h"
#include "bg_palette_buffer.h"
#include "code_8004AA0.h"
#include "code_800558C_1.h"
#include "code_800558C.h"
#include "cpu.h"
#include "crt0.h"
#include "file_system.h"
@@ -19,8 +20,6 @@ EWRAM_DATA IntrCallback gIntrTable[6] = {0};
EWRAM_DATA IntrCallback gIntrCallbacks[6] = {0};
extern char ewram_start[];
extern u16 gBldCnt;
extern u8 gUnknown_202D7FE;
extern char alt_203B038[];
extern char gTitlePaletteFile[];
extern char gUnknown_203BC04[];
@@ -90,7 +89,7 @@ void AgbMain(void)
REG_WINOUT = WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR; // 61
gBldCnt = REG_BLDCNT = BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_BD | BLDCNT_TGT2_OBJ; // 15426
REG_BLDALPHA = BLDALPHA_BLEND(10, 6); // 1546
gUnknown_202D7FE = 0;
gUnknown_202D7FE = FALSE;
REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_WRAP | BGCNT_SCREENBASE(12); // 11264
REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_WRAP | BGCNT_SCREENBASE(13); // 11521
REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_WRAP | BGCNT_SCREENBASE(14); // 11786

2
src/menu_input.c
View File

@@ -1,5 +1,5 @@
#include "global.h"
#include "code_800558C_1.h"
#include "code_800558C.h"
#include "code_800D090.h"
#include "code_80118A4.h"
#include "code_80130A8.h"

2
src/other_menus.c
View File

@@ -13,6 +13,7 @@
#include "code_8094F88.h"
#include "sprite.h"
#include "code_80118A4.h"
#include "code_800558C.h"
struct unkStruct_203B35C
{
@@ -446,7 +447,6 @@ extern void sub_80371B8(void);
extern void sub_8037900(void);
extern u32 sub_8037798(void);
extern void sub_8005838(u32, u32);
extern void sub_80060EC();
extern void sub_800CB20();
extern void TransferBGPaletteBuffer();
extern void xxx_call_update_bg_vram();

20
src/reg_control.c
View File

@@ -1,5 +1,5 @@
#include "global.h"
#include "bg.h"
#include "bg_control.h"
#include "debug.h"
#include "input.h"
#include "music.h"
@@ -9,10 +9,6 @@
extern struct unkStruct_202D648 gUnknown_202D608[8];
extern struct unkStruct_202D648 gUnknown_202D648[8];
// bg_control.c
extern u8 gUnknown_202D7FE;
extern u16 gBldCnt;
EWRAM_DATA bool8 gUnknown_203B099;
EWRAM_DATA bool8 gUnknown_203B09A;
EWRAM_DATA bool8 gUnknown_203B09B;
@@ -26,6 +22,8 @@ EWRAM_DATA s16 gUnknown_203B0AE;
EWRAM_DATA s16 gUnknown_203B0B0; // Written to but never read
EWRAM_DATA s16 gUnknown_203B0B2; // Written to but never read
static void UpdateBGControlRegisters(void);
void VBlankIntr(void)
{
s32 index;
@@ -243,18 +241,16 @@ void Timer3Intr(void)
AckInterrupt(INTR_FLAG_TIMER3);
}
// Unused
u32 sub_800BB34(void)
UNUSED static u32 sub_800BB34(void)
{
return gUnknown_203B0A0;
}
void nullsub_178(void)
UNUSED static void nullsub_178(void)
{
}
// Unused
void sub_800BB44(void)
UNUSED static void sub_800BB44(void)
{
u16 ie_store;
u16 dispcnt_store;
@@ -296,11 +292,11 @@ void nullsub_17(void)
{
}
void UpdateBGControlRegisters(void)
static void UpdateBGControlRegisters(void)
{
u32 BGCNT_Priority[NUM_BGS];
if (gUnknown_202D7FE == 1) {
if (gUnknown_202D7FE == TRUE) {
BGCNT_Priority[BG0] = BGCNT_PRIORITY(1);
BGCNT_Priority[BG1] = BGCNT_PRIORITY(2);
BGCNT_Priority[BG2] = BGCNT_PRIORITY(0);

4
src/sprite.c
View File

@@ -870,8 +870,8 @@ void sub_8005304(void)
}
}
// spriteMasks is a u16[6]. a4 might be a bool8
void sub_800533C(struct ax_pose **a0, struct UnkSpriteMem **a1, struct axdata1 *a2, u16 *spriteMasks, char a4)
// spriteMasks is a u16[6]
void sub_800533C(struct ax_pose **a0, struct UnkSpriteMem **a1, struct axdata1 *a2, u16 *spriteMasks, bool8 a4)
{
struct UnkSpriteMem *mem;
struct ax_pose *r4;

35
src/text1.c
View File

@@ -22,7 +22,7 @@ EWRAM_DATA u8 gUnknown_202B034;
EWRAM_DATA u16 gUnknown_202B038[4][32][32];
// ?
extern char gUnknown_3000E94[];
extern s16 gUnknown_3000E94[];
// data.s
extern const struct UnkTextStruct2 gUnknown_80B857C[4];
@@ -35,7 +35,7 @@ extern const char gKanjiB_file_string[];
// system_sbin.s
extern const struct FileArchive gSystemFileArchive;
void sub_8006438(const struct UnkTextStruct2 *, u8, u8, struct UnkTextStruct2_sub *);
static void sub_8006438(const struct UnkTextStruct2 *, u8, u8, struct UnkTextStruct2_sub *);
void LoadCharmaps(void)
{
@@ -148,10 +148,19 @@ void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2)
sub_8006438(a0, a1, a2, &r3);
}
void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, struct UnkTextStruct2_sub *a3)
static void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, struct UnkTextStruct2_sub *a3)
{
int i;
u32 r9 = 2;
s32 i;
u32 r9;
#if NONMATCHING // Simple regswap: https://decomp.me/scratch/EN6n0 99.79%
s16 **ptr2; // r2
#else
register s16 **ptr2 asm("r2");
#endif
s16 *ptr0; // r0
u8 *ptr1; // r1
r9 = 2;
if (a0 == NULL)
a0 = gUnknown_80B857C;
@@ -170,15 +179,9 @@ void sub_8006438(const struct UnkTextStruct2 *a0, u8 a1, u8 a2, struct UnkTextSt
}
}
#ifdef NONMATCHING
gUnknown_203B078 = gUnknown_3000E94;
gUnknown_20274A5 = 1;
#else
asm_unified("\tldr r2, =gUnknown_203B078\n"
"\tldr r0, =gUnknown_3000E94\n"
"\tldr r1, =gUnknown_20274A5\n"
"\tstr r0, [r2]\n"
"\tmovs r0, 0x1\n"
"\tstrb r0, [r1]");
#endif
ptr2 = &gUnknown_203B078;
ptr0 = gUnknown_3000E94;
ptr1 = &gUnknown_20274A5;
*ptr2 = ptr0;
*ptr1 = 1;
}