finish decompiling naming_screen (#217)

* decompile more code

* incbin graphics data

* decompile more code

* decompile more code

* finish decompiling

* name some functions and variables
This commit is contained in:
Cameron Hall 2017-01-26 01:07:36 -05:00 committed by YamaArashi
parent 9442bdcbf3
commit 448acff16e
6 changed files with 1148 additions and 1857 deletions

File diff suppressed because it is too large Load Diff

View File

@ -3,113 +3,6 @@
.section .rodata
.align 2
gUnknown_083CE2F0:: @ 83CE2F0
.4byte sub_80B7660
.4byte sub_80B7650
.4byte sub_80B7650
.4byte sub_80B7670
.4byte sub_80B7670
.4byte sub_80B7660
.align 2
gUnknown_083CE308:: @ 83CE308
.4byte VRAM + 0xE000
.4byte VRAM + 0xE800
.align 2
gUnknown_083CE310:: @ 83CE310
.4byte sub_80B7844
.4byte sub_80B7838
.4byte sub_80B7838
.4byte sub_80B7850
.4byte sub_80B7850
.4byte sub_80B7844
.align 2
gUnknown_083CE328:: @ 83CE328
.4byte gWindowConfig_81E6EDC
.4byte gWindowConfig_81E6EF8
.4byte gWindowConfig_81E6EA4
.4byte gWindowConfig_81E6EC0
.4byte gWindowConfig_81E6EA4
.4byte gWindowConfig_81E6EC0
.4byte gWindowConfig_81E6F14
.4byte gWindowConfig_81E6F30
.4byte gWindowConfig_81E6F14
.4byte gWindowConfig_81E6F30
.4byte gWindowConfig_81E6EDC
.4byte gWindowConfig_81E6EF8
.align 2
gUnknown_083CE358:: @ 83CE358
.4byte nullsub_61
.4byte nullsub_61
.4byte sub_80B78F8
.4byte sub_80B78F8
.align 2
gUnknown_083CE368:: @ 83CE368
.4byte nullsub_62
.4byte sub_80B7924
gUnknown_083CE370:: @ 83CE370
.string "$"
.align 2
Unknown_83CE374:
.byte 0, 7, 1, 0, 0, 0, 0, 0
.4byte OtherText_YourName
.align 2
Unknown_83CE380:
.byte 0, 8, 2, 0, 0, 0, 0, 0
.4byte OtherText_BoxName
.align 2
Unknown_83CE38C:
.byte 0, 10, 3, 1, 0, 0, 0, 0
.4byte OtherText_PokeName
.align 2
gUnknown_083CE398:: @ 83CE398
.4byte Unknown_83CE374
.4byte Unknown_83CE380
.4byte Unknown_83CE38C
.4byte Unknown_83CE38C
gUnknown_083CE3A8:: @ 83CE3A8
.string " A B C D E F . $"
.string " G H I J K L , $"
.string " M N O P Q R S $"
.string " T U V W X Y Z $"
.string " a b c d e f . $"
.string " g h i j k l , $"
.string " m n o p q r s $"
.string " t u v w x y z $"
.string " 0 1 2 3 4 $"
.string " 5 6 7 8 9 $"
.string " ! ? / - $"
.string " $"
.align 2
gOamData_83CE498:: @ 83CE498
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gOamData_83CE4A0:: @ 83CE4A0
.2byte 0x0000
.2byte 0x4000
.2byte 0x0000
.align 2
gOamData_83CE4A8:: @ 83CE4A8
.2byte 0x4000
.2byte 0x8000
.2byte 0x0000
.align 2
gSubspriteTable_83CE4B0:: @ 83CE4B0
subsprite -20, -16, 1, 0, 32x8

View File

@ -223,8 +223,8 @@ u8 AllocOamMatrix(void);
void FreeOamMatrix(u8 matrixNum);
void InitSpriteAffineAnim(struct Sprite *sprite);
void SetOamMatrixRotationScaling(u8 matrixNum, s16 xScale, s16 yScale, u16 rotation);
u16 LoadSpriteSheet(struct SpriteSheet *sheet);
void LoadSpriteSheets(struct SpriteSheet *sheets);
u16 LoadSpriteSheet(const struct SpriteSheet *sheet);
void LoadSpriteSheets(const struct SpriteSheet *sheets);
u16 AllocTilesForSpriteSheet(struct SpriteSheet *sheet);
void AllocTilesForSpriteSheets(struct SpriteSheet *sheets);
void LoadTilesForSpriteSheet(const struct SpriteSheet *sheet);

View File

@ -151,7 +151,6 @@ SECTIONS {
src/berry.o(.text);
src/script_menu.o(.text);
src/naming_screen.o(.text);
asm/naming_screen.o(.text);
src/money.o(.text);
asm/contest_effect.o(.text);
src/record_mixing.o(.text);

File diff suppressed because it is too large Load Diff

View File

@ -1468,7 +1468,7 @@ void SetOamMatrixRotationScaling(u8 matrixNum, s16 xScale, s16 yScale, u16 rotat
CopyOamMatrix(matrixNum, &matrix);
}
u16 LoadSpriteSheet(struct SpriteSheet *sheet)
u16 LoadSpriteSheet(const struct SpriteSheet *sheet)
{
s16 tileStart = AllocSpriteTiles(sheet->size / TILE_SIZE_4BPP);
@ -1484,7 +1484,7 @@ u16 LoadSpriteSheet(struct SpriteSheet *sheet)
}
}
void LoadSpriteSheets(struct SpriteSheet *sheets)
void LoadSpriteSheets(const struct SpriteSheet *sheets)
{
u8 i;
for (i = 0; sheets[i].data != NULL; i++)