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

Move remaining field_player_avatar data across

Browse Source
This commit is contained in:
Slawter666 2018-09-06 12:02:37 +01:00
parent 26c91f1502
commit 9ad7dc9fd7
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/field_player_avatar.s
View File

@ -1,21 +0,0 @@
@ the third big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_084975A8:: @ 84975A8
.string "·$"
gUnknown_084975AA:: @ 84975AA
.2byte 36, 33, 30
gUnknown_084975B0:: @ 84975B0
.2byte 0, 0
.2byte 0x28, 10
.2byte 0x46, 30
gUnknown_084975BC:: @ 84975BC
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00

1
ld_script.txt
View File

@ -409,7 +409,6 @@ SECTIONS {
src/metatile_behavior.o(.rodata); src/metatile_behavior.o(.rodata);
src/field_door.o(.rodata); src/field_door.o(.rodata);
src/field_player_avatar.o(.rodata); src/field_player_avatar.o(.rodata);
data/field_player_avatar.o(.rodata);
src/event_object_movement.o(.rodata); src/event_object_movement.o(.rodata);
src/text_window.o(.rodata); src/text_window.o(.rodata);
src/scrcmd.o(.rodata); src/scrcmd.o(.rodata);

6
src/field_player_avatar.c
View File

@ -266,8 +266,8 @@ u8 (*const gUnknown_0849755C[])(struct Task *) =
const u16 gUnknown_0849759C[] = {1, 1, 1}; const u16 gUnknown_0849759C[] = {1, 1, 1};
const u16 gUnknown_084975A2[] = {1, 3, 6}; const u16 gUnknown_084975A2[] = {1, 3, 6};
/*
const u8 gUnknown_084975A8[] = _("·$"); const u8 gUnknown_084975A8[] = _("·");
const u16 gUnknown_084975AA[] = {36, 33, 30}; const u16 gUnknown_084975AA[] = {36, 33, 30};
@ -279,7 +279,7 @@ const u16 gUnknown_084975B0[] =
}; };
const u8 gUnknown_084975BC[] = {0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00}; const u8 gUnknown_084975BC[] = {0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00};
*/
// .text // .text
void MovementType_Player(struct Sprite *sprite) void MovementType_Player(struct Sprite *sprite)
{ {