ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile error

Browse Source
This commit is contained in:
Edouard Veyrier 2018-03-29 15:46:10 +02:00
parent cfacd23248
commit 17b9f5d892
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/learn_move.s
View File

@ -82,7 +82,7 @@ sub_81606A0: @ 81606A0
str r0, [r6] str r0, [r6]
ldr r1, =gSpecialVar_0x8004 ldr r1, =gSpecialVar_0x8004
ldrh r1, [r1] ldrh r1, [r1]
adds r0, 0x44 partymon adds r0, 0x44
movs r5, 0 movs r5, 0
strb r1, [r0] strb r1, [r0]
ldr r0, =sub_8160624 ldr r0, =sub_8160624
@ -129,7 +129,7 @@ sub_8160740: @ 8160740
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
bl ResetTasks bl ResetTasks
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram //
ldr r5, =gUnknown_0203BC34 ldr r5, =gUnknown_0203BC34
movs r0, 0x8C movs r0, 0x8C
lsls r0, 1 lsls r0, 1

6
include/learn_move.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_LEAN_MOVE_H #ifndef GUARD_LEARN_MOVE_H
#define GUARD_LEAN_MOVE_H #define GUARD_LEARN_MOVE_H
struct LearnMoveStruct struct LearnMoveStruct
{ {
@ -39,4 +39,4 @@ void sub_8160638(void);
void *gUnknown_0203BC38 = (void*)0x0203BC38; void *gUnknown_0203BC38 = (void*)0x0203BC38;
#endif //GUARD_LEAN_MOVE_H #endif //GUARD_LEARN_MOVE_H

1
ld_script.txt
View File

@ -210,6 +210,7 @@ SECTIONS {
src/fldeff_sweetscent.o(.text); src/fldeff_sweetscent.o(.text);
asm/battle_anim_815A0D4.o(.text); asm/battle_anim_815A0D4.o(.text);
asm/learn_move.o(.text); asm/learn_move.o(.text);
src/learn_move.o(.text);
src/fldeff_softboiled.o(.text); src/fldeff_softboiled.o(.text);
src/decoration_inventory.o(.text); src/decoration_inventory.o(.text);
src/roamer.o(.text); src/roamer.o(.text);

16
src/learn_move.c
View File

@ -17,6 +17,7 @@ extern struct LearnMoveStruct *gUnknown_0203BC34;
static struct LearnMoveStruct *sLearnMoveStruct; static struct LearnMoveStruct *sLearnMoveStruct;
static void sub_8160664(u8 taskId); static void sub_8160664(u8 taskId);
void sub_81606A0(void); //CB2_InitLearnMove void sub_81606A0(void); //CB2_InitLearnMove
void sub_8160740(void);
void sub_8160624(void) //VBlankCB_LearnMove void sub_8160624(void) //VBlankCB_LearnMove
{ {
@ -56,7 +57,6 @@ void sub_81606A0(void) //CB2_InitLearnMove
ResetTasks(); ResetTasks();
clear_scheduled_bg_copies_to_vram(); clear_scheduled_bg_copies_to_vram();
//LearnMoveStruct** //LearnMoveStruct**
//r1 = &gSpecialVar_0x8004; //What is this global ? //r1 = &gSpecialVar_0x8004; //What is this global ?
//u8* partyMon = gUnknown_0203BC34 + 0x44 //partyMon ? //u8* partyMon = gUnknown_0203BC34 + 0x44 //partyMon ?
@ -82,3 +82,17 @@ void sub_81606A0(void) //CB2_InitLearnMove
FillPalette(0, 0, 2); FillPalette(0, 0, 2);
SetMainCallback2(/*FIXME sub_816082C*/(void*)0x0816082C); SetMainCallback2(/*FIXME sub_816082C*/(void*)0x0816082C);
} }
/*
void sub_8160740(void)
{
ResetSpriteData();
FreeAllSpritePalettes();
ResetTasks();
clear_scheduled_bg_copies_to_vram();
gUnknown_0203BC34 = AllocZeroed(0x118);//gUnknown_0203BC34 is a global pointer to LearnMoveStruct ?
gUnknown_0203BC34->partyMon = gSpecialVar_0x8004;
gUnknown_0203BC34->unk2C6 = gSpecialVar_0x8005;
}
*/