Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-24 23:17:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #280 from DizzyEggg/text1
Some checks are pending
GithubCI / build (push) Waiting to run
Details

Browse Source 
Merge text1 and text2 and put const/ewram data in C file
This commit is contained in:
Seth Barberee 2024-12-01 08:23:53 -08:00 committed by GitHub
commit 0d27fb2516
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
113 changed files with 750 additions and 999 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/code_800F990.s
View File

@ -1942,9 +1942,9 @@ _0801089A:
_080108FC: .4byte gUnknown_203B0E8
_08010900: .4byte 0x000052da
_08010904: .4byte 0x000052d8
_08010908: .4byte gFontTiles_202C038
_08010908: .4byte gUnknown_202B038 + 0x1000
_0801090C: .4byte 0x00003114
_08010910: .4byte gFontTilesExtra_202C838
_08010910: .4byte gUnknown_202B038 + 0x1800
_08010914: .4byte 0x00001114
thumb_func_end sub_8010858

4
asm/code_8010F28.s
View File

@ -278,9 +278,9 @@ _080110F2:
_08011150: .4byte gUnknown_203B0E4
_08011154: .4byte 0x00004dd6
_08011158: .4byte 0x00004dd4
_0801115C: .4byte gFontTiles_202C038
_0801115C: .4byte gUnknown_202B038 + 0x1000
_08011160: .4byte 0x00002014
_08011164: .4byte gFontTilesExtra_202C838
_08011164: .4byte gUnknown_202B038 + 0x1800
thumb_func_end sub_80110B0
thumb_func_start sub_8011168

2
asm/code_8015080.s
View File

@ -787,7 +787,7 @@ sub_80157D8:
ldr r3, _080157F4
b _080157FE
.align 2, 0
_080157EC: .4byte gUnknown_20273B8
_080157EC: .4byte gUnknown_2027370 + 0x48 @ gUnknown_2027370[1]
_080157F0: .4byte gUnknown_203B1FC
_080157F4: .4byte gUnknown_80DAFC0
_080157F8:

187
data/data.s
View File

@ -1754,190 +1754,3 @@ gUnknown_80B83EA: @ 80B83EA
.align 2, 0
@ text1.c ?
.string "pksdir0\0"
@ text1.c or text2.c (gKanjiA_file_string is used in text1.c but the rest in text2.c, and we get code changes for merging the files...)
.string "pksdir0\0"
.global gUnknown_80B853C
gUnknown_80B853C: @ 80B853C
.4byte 0x66666666
.4byte 0x00000000
.4byte 0x11111111
.4byte 0x22222222
.4byte 0x33333333
.4byte 0x44444444
.4byte 0x55555555
.4byte 0x66666666
.4byte 0x77777777
.4byte 0x88888888
.4byte 0x99999999
.4byte 0xAAAAAAAA
.4byte 0xBBBBBBBB
.4byte 0xCCCCCCCC
.4byte 0xDDDDDDDD
.4byte 0xEEEEEEEE
.global gUnknown_80B857C
gUnknown_80B857C: @ 80B857C
@ Type: UnkTextStruct2[4]
.4byte 0, 3, 0, 0, 0, 0
.4byte 0, 3, 0, 0, 0, 0
.4byte 0, 3, 0, 0, 0, 0
.4byte 0, 3, 0, 0, 0, 0
.global gCharMasksOffsets
gCharMasksOffsets: @ 80B85DC
@ Type: unkShiftData[8]
.4byte 0xFFFFFFFF, 0x00000000, 0x00, 0x20
.4byte 0x0FFFFFFF, 0xF0000000, 0x04, 0x1C
.4byte 0x00FFFFFF, 0xFF000000, 0x08, 0x18
.4byte 0x000FFFFF, 0xFFF00000, 0x0C, 0x14
.4byte 0x0000FFFF, 0xFFFF0000, 0x10, 0x10
.4byte 0x00000FFF, 0xFFFFF000, 0x14, 0x0C
.4byte 0x000000FF, 0xFFFFFF00, 0x18, 0x08
.4byte 0x0000000F, 0xFFFFFFF0, 0x1C, 0x04
.global gUnknown_80B865C
gUnknown_80B865C:
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global gUnknown_80B86A4
gUnknown_80B86A4: @ 80B86A4
@ Fallback character with bitmap?
.4byte gUnknown_80B865C
.4byte 0x781A1, 10, 8
.global gUnknown_80B86B4
gUnknown_80B86B4: @ 80B86B4
.incbin "graphics/warning.4bpp"
.global gKanjiA_file_string
gKanjiA_file_string: @ 80B87B4
.string "kanji_a\0"
.align 2,0
.global gKanjiB_file_string
gKanjiB_file_string: @ 80B87BC
.string "kanji_b\0"
.align 2,0
.global gFadeInNone
gFadeInNone: @ 80B87C4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gFadeInDungeon
gFadeInDungeon: @ 80B87E4
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.global gUnknown_80B8804
gUnknown_80B8804: @ 80B8804
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.global gUnknown_80B8814
gUnknown_80B8814: @ 80B8814
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80B8824
gUnknown_80B8824: @ 80B8824
@ Type: unkStruct_80B8824
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00
.byte 0xff, 0x00, 0x00, 0x00
.byte 0xff, 0x0f, 0x00, 0x00
.byte 0xff, 0xff, 0x00, 0x00
.byte 0xff, 0xff, 0x0f, 0x00
.byte 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0x0f
.byte 0xff, 0xff, 0xff, 0xff
.global gUnknown_80B8848
gUnknown_80B8848: @ 80B8848
@ Type: unkStruct_80B8848
.byte 0x0F, 0x00, 0x00, 0x00
.byte 0xF0, 0x00, 0x00, 0x00
.byte 0x00, 0x0F, 0x00, 0x00
.byte 0x00, 0xF0, 0x00, 0x00
.byte 0x00, 0x00, 0x0F, 0x00
.byte 0x00, 0x00, 0xF0, 0x00
.byte 0x00, 0x00, 0x00, 0x0F
.byte 0x00, 0x00, 0x00, 0xF0
.global gUnknown_80B8868
gUnknown_80B8868: @ 80B8868
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x00, 0x00, 0x00
.byte 0xff, 0x00, 0x00, 0x00
.byte 0xff, 0x0f, 0x00, 0x00
.byte 0xff, 0xff, 0x00, 0x00
.byte 0xff, 0xff, 0x0f, 0x00
.byte 0xff, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0x0f
.byte 0xff, 0xff, 0xff, 0xff
.byte 0xf0, 0xff, 0xff, 0xff
.byte 0x00, 0xff, 0xff, 0xff
.byte 0x00, 0xf0, 0xff, 0xff
.byte 0x00, 0x00, 0xff, 0xff
.byte 0x00, 0x00, 0xf0, 0xff
.byte 0x00, 0x00, 0x00, 0xff
.byte 0x00, 0x00, 0x00, 0xf0
@ text.s
.string "pksdir0\0"
.align 2,0
.global gUnknown_80B88B0
gUnknown_80B88B0: @ 80B88B0
.string "font\0"
.align 2,0
.global gUnknown_80B88B8
gUnknown_80B88B8: @ 80B88B8
.string "fontsp\0"
.align 2,0
.global gUnknown_80B88C0
gUnknown_80B88C0: @ 80B88C0
.string "fontsppa\0"
.align 2,0
.global gUnknown_80B88CC
gUnknown_80B88CC: @ 80B88CC
.string "fontpal\0"
.align 2,0
@ code_8009804.s
.string "pksdir0\0"

31
data/data2.s Normal file
View File

@ -0,0 +1,31 @@
.section .rodata
@ text.s
.string "pksdir0\0"
.align 2,0
.global gUnknown_80B88B0
gUnknown_80B88B0: @ 80B88B0
.string "font\0"
.align 2,0
.global gUnknown_80B88B8
gUnknown_80B88B8: @ 80B88B8
.string "fontsp\0"
.align 2,0
.global gUnknown_80B88C0
gUnknown_80B88C0: @ 80B88C0
.string "fontsppa\0"
.align 2,0
.global gUnknown_80B88CC
gUnknown_80B88CC: @ 80B88CC
.string "fontpal\0"
.align 2,0
@ code_8009804.s
.string "pksdir0\0"

93
include/text.h Normal file
View File

@ -0,0 +1,93 @@
#ifndef GUARD_TEXT_H
#define GUARD_TEXT_H
#include "structs/str_text.h"
// size: 0x10
struct unkShiftData
{
u32 bytesA;
u32 bytesB;
u32 shift_left;
u32 shift_right;
};
// size: 0xC
struct unkChar
{
const u16 *unk0;
u16 unk4;
s16 unk6;
u8 unk8;
u8 fill9;
u8 unkA;
u8 fillB;
};
struct UnkDrawStringStruct;
struct UnkDrawStringStruct
{
s16 unk0;
s16 unk2;
s16 unk4;
s16 unk6;
s16 unk8;
s16 unkA;
s32 unkC;
u32 unk10;
u32 unk14;
u32 unk18;
u32 unk1C;
u8 unk20;
u8 unk21;
u8 fill22;
u8 fill23;
const u8* (*unk24)(const u8 *, const u8 *, struct UnkDrawStringStruct*);
s32 unk28;
s32 unk2C;
s32 unk30;
};
extern UnkTextStruct1 gUnknown_2027370[4];
extern u8 gUnknown_202749A[11];
extern bool8 gUnknown_20274A5;
extern u16 gUnknown_202B038[4][32][32]; // Usage points to these dimensions
void LoadCharmaps(void);
u32 UpdateFadeInTile(u32 a0);
u32 sub_80063B0(void);
void SelectCharmap(u32 a0);
void SetCharacterMask(int a0);
void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct2 *a0, bool8 a1, bool8 a2);
void RestoreUnkTextStruct_8006518(UnkTextStruct2 *unkData);
u32 sub_8006544(u32 index);
void sub_8007334(s32 a0);
void sub_80073B8(s32 a0);
void sub_80073E0(s32 a0);
u32 xxx_call_draw_char(s32 x, s32 y, u32 a2, u32 color, u32 a4);
void sub_80078A4(u32 a0, s32 x, s32 y, s32 a3, u32 color);
void sub_800792C(u32 a0, s32 x, s32 y, s32 a3, u32 color);
void sub_8007A78(u32 a0, s32 x, s32 y, s32 a3, u32 color);
void sub_8007B7C(u32 a0, s32 x, s32 y, s32 a3, u32 color);
void sub_8007E20(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, u32 *a5, u32 a6);
void DisplayMonPortraitSprite(s32 a0, const u8 *compressedData, s32 a2);
void DisplayMonPortraitSpriteFlipped(s32 a0, const u8 *compressedData, s32 a1);
const struct unkChar *GetCharacter(s32 chr);
const u8 *xxx_get_next_char_from_string(const u8 *a1, u32 *a0);
void sub_80087EC(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4);
bool8 xxx_call_update_bg_vram(void);
void CallPrepareTextbox_8008C54(u32 strId);
bool8 sub_8008D8C(u32 strId);
void sub_8008DC8(s32 a0, s32 a1, u16 a2, s32 a3);
s32 sub_8008ED0(const u8 *str);
void PrintStringOnWindow2(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 lineSpacing);
void PrintStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr);
const u8 *xxx_handle_format_global(const u8 *str, struct UnkDrawStringStruct *unkStrPtr);
void sub_8009408(s32 from, s32 to);
void sub_8009524(s32 strArrId);
void sub_80095CC(s32 a0, s32 a1);
s32 sub_80095E4(s32 a0, s32 a1);
s32 sub_8009614(s32 a0, s32 a1);
#endif // GUARD_TEXT_H

18
include/text1.h
View File

@ -1,18 +0,0 @@
#ifndef GUARD_TEXT1_H
#define GUARD_TEXT1_H
#include "structs/str_text.h"
extern UnkTextStruct1 gUnknown_2027370[4];
extern UnkTextStruct2 gUnknown_202AFC0[4];
extern u32 gTextShadowMask;
extern u16 gUnknown_202B038[4][32][32]; // dimensions unknown... but usage points to these dimensions
void LoadCharmaps(void);
void SelectCharmap(u32);
u32 UpdateFadeInTile(u32 a0);
u32 sub_80063B0(void);
void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct2 *a0, bool8 a1, bool8 a2);
#endif // GUARD_TEXT1_H

87
include/text2.h
View File

@ -1,87 +0,0 @@
#ifndef GUARD_TEXT2_H
#define GUARD_TEXT2_H
#include "structs/str_text.h"
// size: 0x10
struct unkShiftData
{
u32 bytesA;
u32 bytesB;
u32 shift_left;
u32 shift_right;
};
// size: 0xC
struct unkChar
{
u16 *unk0;
u16 unk4;
s16 unk6;
u8 fill8;
u8 fill9;
u8 unkA;
};
struct unkStruct_80B8824
{
u32 arr[9];
};
struct unkStruct_80B8848
{
u32 arr[8];
};
u32 xxx_call_draw_char(s32, s32, u32, u32, u32);
struct UnkDrawStringStruct;
struct UnkDrawStringStruct
{
s16 unk0;
s16 unk2;
s16 unk4;
s16 unk6;
s16 unk8;
s16 unkA;
s32 unkC;
u32 unk10;
u32 unk14;
u32 unk18;
u32 unk1C;
u8 unk20;
u8 unk21;
u8 fill22;
u8 fill23;
const u8* (*unk24)(const u8 *, const u8 *, struct UnkDrawStringStruct*);
s32 unk28;
s32 unk2C;
s32 unk30;
};
void RestoreUnkTextStruct_8006518(UnkTextStruct2 *);
void sub_8006554(UnkTextStruct1 *, u32 *, u32 *, u16 *, u32, const UnkTextStruct2 *, u8, u32, UnkTextStruct2_sub *, u8);
void sub_80073B8(s32);
void sub_80073E0(s32);
void sub_80078A4(u32, s32, s32, s32, u32);
void sub_800792C(u32, s32, s32, s32, u32);
void sub_8007A78(u32, s32, s32, s32, u32);
void sub_8007B7C(u32, s32, s32, s32, u32);
void sub_8007E20(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, u32 *a5, u32 a6);
const u8 *xxx_get_next_char_from_string(const u8 *a1, u32 *a0);
const u8 *xxx_handle_format_global(const u8 *str, struct UnkDrawStringStruct *unkStrPtr);
// text.s
extern const struct unkChar *GetCharacter(s32);
extern void InitGraphics(void);
void DisplayMonPortraitSpriteFlipped(s32 a0, const u8 *compressedData, s32 a1);
extern void sub_800898C(void);
extern void sub_80089AC(const UnkTextStruct2 *, UnkTextStruct2_sub *);
extern void CallPrepareTextbox_8008C54(u32);
extern s32 sub_8008ED0(const u8 *);
extern void sub_8009388(void);
void PrintStringOnWindow2(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 lineSpacing);
void PrintStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr);
#endif // GUARD_TEXT2_H

6
ld_script.txt
View File

@ -63,8 +63,7 @@ SECTIONS {
src/sprite.o(.text);
src/code_800558C.o(.text);
src/random.o(.text);
src/text1.o(.text);
src/text2.o(.text);
src/text.o(.text);
asm/text.o(.text);
src/code_8009804.o(.text);
asm/code_8009804.o(.text);
@ -423,6 +422,9 @@ SECTIONS {
{
data/data_code_2.o(.rodata);
data/data.o(.rodata);
src/random.o(.rodata);
src/text.o(.rodata);
data/data2.o(.rodata);
src/math.o(.rodata);
src/file_system.o(.rodata);
src/decompress.o(.rodata);

5
src/adventure_log.c
View File

@ -8,8 +8,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
static EWRAM_DATA_2 struct_Sub80095E4_2 *sAdventureLog = {0};
@ -151,4 +150,4 @@ static void DisplayAdventureLog(void)
}
sub_80073E0(sAdventureLog->s0.unk34);
}
}

4
src/adventure_log_menu.c
View File

@ -3,7 +3,7 @@
#include "adventure_log_menu.h"
#include "constants/main_menu.h"
#include "input.h"
#include "text1.h"
#include "text.h"
void CreateAdventureLogMenu(void)
{
@ -33,4 +33,4 @@ u32 UpdateAdventureLogMenu(void)
break;
}
return nextMenu;
}
}

6
src/code_2.c
View File

@ -28,20 +28,16 @@
#include "save_read.h"
#include "save.h"
#include "sprite.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
extern void NDS_LoadOverlay_GroundMain(void);
extern void sub_8014144(void);
extern void sub_800DAAC(void);
extern void xxx_script_related_8001334(u32);
extern void LoadTitleScreen(void);
extern void sub_80095CC(u32, u32);
extern void nullsub_33(void);
extern u32 sub_80009D0(u32);
extern void xxx_call_update_bg_vram(void);
extern u32 gUnknown_203B03C;
extern u16 gUnknown_2026E4E;
extern s32 gTitleBrightness;

2
src/code_8009804.c
View File

@ -3,7 +3,7 @@
#include "code_8009804.h"
#include "cpu.h"
#include "file_system.h"
#include "text1.h"
#include "text.h"
extern const u8 gUnknown_80B88CC[];
extern const struct FileArchive gSystemFileArchive; // 8300500

2
src/code_8012A18_1.c
View File

@ -2,7 +2,7 @@
#include "code_8012A18_1.h"
#include "sprite_oam.h"
#include "text_util.h"
#include "text2.h"
#include "text.h"
struct unkStruct_203B1FC
{

7
src/code_8015080.c
View File

@ -4,8 +4,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
struct unkStruct_203B1F8
{
@ -49,7 +48,7 @@ bool8 sub_8015080(u8 *buffer, const MenuItem *menuItems)
{
s32 index;
gUnknown_203B1F8 = MemoryAlloc(sizeof(struct unkStruct_203B1F8), 8);
gUnknown_203B1F8->menuAction = 0;
@ -78,7 +77,7 @@ u32 sub_801516C(void)
sub_8013114(&gUnknown_203B1F8->unk4, &gUnknown_203B1F8->menuAction);
return 3;
}
else
else
{
return 0;
}

2
src/code_801602C.c
View File

@ -7,7 +7,7 @@
#include "input.h"
#include "memory.h"
#include "text_util.h"
#include "text1.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B200 *sUnknown_203B200 = {0};

3
src/code_801B3C0.c
View File

@ -8,8 +8,7 @@
#include "memory.h"
#include "menu_input.h"
#include "sprite.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B230 *sUnknown_203B230 = {0};

3
src/code_801B60C.c
View File

@ -14,8 +14,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B234 *sUnknown_203B234 = {0};

3
src/code_801C8C4.c
View File

@ -6,8 +6,7 @@
#include "items.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B244 *sUnknown_203B244 = {0};
static EWRAM_DATA_2 u32 sUnknown_203B248 = {0};

3
src/code_801D014.c
View File

@ -24,8 +24,7 @@
#include "options_menu1.h"
#include "party_list_menu.h"
#include "rescue_team_info.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "wigglytuff_shop2.h"
#include "wonder_mail_802C4C8.h"
#include "wonder_mail_802C860.h"

3
src/code_801D9E4.c
View File

@ -7,8 +7,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
static EWRAM_DATA_2 struct struct_Sub80095E4_2 *sUnknown_203B258 = {0};

4
src/code_801EE10.c
View File

@ -3,8 +3,7 @@
#include "constants/input.h"
#include "input.h"
#include "items.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "memory.h"
#include "moves.h"
#include "code_801EE10.h"
@ -45,7 +44,6 @@ const UnkTextStruct2 gUnknown_80DC274 = {
ALIGNED(4) const u8 gUnknown_80DC28C[] = _("Moves: {COLOR YELLOW}{POKEMON_0}{RESET} ");
ALIGNED(4) const u8 gUnknown_80DC2A0[] = _("{MOVE_ITEM_0}");
u32 sub_8006544(u32 index);
s32 sub_801F3F8(void);
u8 sub_801EE10(u32 param_1, s16 species, Move *moves, u32 param_4, const u8 *text, u32 param_6)

3
src/code_801F428.c
View File

@ -7,8 +7,7 @@
#include "menu_input.h"
#include "moves.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
struct unkStruct_203B274

3
src/code_801F808.c
View File

@ -9,8 +9,7 @@
#include "sprite.h"
#include "structs/menu.h"
#include "structs/str_text.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
// TODO: UNIFY WITH struct_Sub80095E4
struct unkStruct_203B278

3
src/code_80227B8.c
View File

@ -14,8 +14,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B294 *sUnknown_203B294 = {0};

3
src/code_8023144.c
View File

@ -11,8 +11,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 u32 gUnknown_203B298 = {0};
static EWRAM_DATA_2 u16 gUnknown_203B29C = {0};

3
src/code_8024458.c
View File

@ -9,8 +9,7 @@
#include "menu_input.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B2AC *sUnknown_203B2AC = {0};

5
src/code_802DB28.c
View File

@ -10,10 +10,7 @@
#include "items.h"
#include "memory.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
extern u8 gSpeakerNameBuffer[];
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B2FC *sUnknown_203B2FC = {0};

5
src/code_802DE84.c
View File

@ -6,8 +6,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon_mail.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B300 *sUnknown_203B300 = {0};
@ -72,4 +71,4 @@ static void sub_802DF88(void)
sub_80073B8(sUnknown_203B300->unk10);
CreateRescueDescription(sUnknown_203B300->mail);
sub_80073E0(sUnknown_203B300->unk10);
}
}

3
src/code_8031D70.c
View File

@ -5,8 +5,7 @@
#include "code_803D0D8.h"
#include "input.h"
#include "memory.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/str_dungeon.h"
#include "pokemon.h"
#include "code_8094F88.h"

4
src/code_803D110.c
View File

@ -10,6 +10,7 @@
#include "code_800D090.h"
#include "pokemon_3.h"
#include "game_options.h"
#include "text.h"
#include "constants/dungeon.h"
extern void sub_80901D8(DungeonLocation *param_1,DungeonLocation *param_2);
@ -18,7 +19,6 @@ extern void sub_808E9C4(UnkDungeonGlobal_unk1CD98 *r0, s16 r1);
extern bool8 sub_80848EC(void);
extern u8 GetFloorType(void);
extern const u8 *GetDungeonName2(u8 dungeon);
extern void sub_8008DC8(s32 r0, s32 r1, u16 r2, u16 r3);
extern const char gUnknown_80F4D8C[]; // "mapparam"
extern const char gUnknown_80F60F8[]; // "banrpal"
@ -590,7 +590,7 @@ void ShowDungeonNameBanner(void)
}
sub_803DC14(text, (224 - CalcStringWidth(text)) / 2, var + 32);
gUnknown_20274A5 = 1;
gUnknown_20274A5 = TRUE;
}
CloseFile(gDungeonNameBannerFontFile);

4
src/code_803E724.c
View File

@ -3,7 +3,7 @@
#include "bg_palette_buffer.h"
#include "code_8004AA0.h"
#include "input.h"
#include "text1.h"
#include "text.h"
#include "code_801602C.h"
#include "menu_input.h"
#include "code_8009804.h"
@ -1179,7 +1179,7 @@ void sub_803F9CC(void)
sub_803FB74();
}
gUnknown_20274A5 = 1;
gUnknown_20274A5 = TRUE;
}
void sub_803FA4C(s32 a0, s32 a1, bool8 a2)

3
src/code_8042B34.c
View File

@ -21,7 +21,7 @@
#include "dungeon_random.h"
#include "code_8009804.h"
#include "tile_types.h"
#include "text1.h"
#include "text.h"
#include "code_805D8C8.h"
#include "code_803E668.h"
#include "dungeon_engine.h"
@ -330,7 +330,6 @@ extern void nullsub_16(void);
extern void sub_80521D0(void);
extern void sub_803F27C(u8);
extern void sub_807E7FC(u8);
extern void sub_80095CC(u32, u32);
extern bool8 IsLevelResetTo1(u8 dungeon);
extern void sub_8068A84(PokemonStruct1 *pokemon);
extern void sub_807EAA0(u32, u32);

4
src/code_805D8C8_1.c
View File

@ -36,8 +36,7 @@
#include "items.h"
#include "play_time.h"
#include "pokemon_3.h"
#include "text2.h"
#include "text1.h"
#include "text.h"
#include "code_806CD90.h"
#include "code_8044CC8.h"
#include "code_801B3C0.h"
@ -1699,7 +1698,6 @@ extern void sub_8041AE0(Entity *pokemon);
extern void sub_807EC28(bool8);
extern void sub_8083CE0(u8 param_1);
extern u8 gUnknown_202749A[];
extern MenuInputStruct gUnknown_202EE10;
void sub_805F02C(void)

3
src/code_8072F3C.c
View File

@ -7,8 +7,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"

2
src/code_809447C.c
View File

@ -7,7 +7,7 @@
#include "items.h"
#include "moves.h"
#include "text_util.h"
#include "text2.h"
#include "text.h"
struct unkStruct_8113080
{

4
src/code_809A560.c
View File

@ -1,5 +1,5 @@
#include "global.h"
#include "text1.h"
#include "text.h"
#include "memory.h"
#include "string_format.h"
#include "structs/str_3001B64.h"
@ -13,8 +13,6 @@ extern u8 gInvalidityText[];
extern u8 ScriptPrintText_809B2B8(u32 *, u32, u32, u32);
extern u32 IsTextboxOpen_809B40C(u32 *);
extern void sub_801416C(s32, s32);
extern void sub_80095CC(u32, u32);
extern void sub_8009408(u32, u32);
extern void ResetTextbox_809B294(void);
extern void sub_8014144(void);

2
src/code_8272724.c
View File

@ -1,5 +1,5 @@
#include "global.h"
#include "text1.h"
#include "text.h"
extern void sub_8272774(UnkTextStruct1 *r0, u32 r1);
extern void sub_8272884(UnkTextStruct1 *r0, u32 r1);

5
src/credits1.c
View File

@ -4,8 +4,7 @@
#include "event_flag.h"
#include "input.h"
#include "memory.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 Credits1Work *sCredits1Work = {0};
@ -138,4 +137,4 @@ void sub_803565C(void)
MemoryFree(sCredits1Work);
sCredits1Work = NULL;
}
}
}

2
src/debug_menu1.c
View File

@ -13,7 +13,7 @@
#include "pokemon.h"
#include "save.h"
#include "text_util.h"
#include "text1.h"
#include "text.h"
enum DebugMenuOptions
{

3
src/debug_menu2.c
View File

@ -8,8 +8,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B3F0 *sUnknown_203B3F0 = {0};

5
src/debug_menu3.c
View File

@ -8,8 +8,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "wigglytuff_shop1.h"
#include "wigglytuff_shop2.h"
@ -217,7 +216,7 @@ static bool8 sub_803ABC8(void)
PokemonStruct1 *mon;
s32 i;
s32 mask;
for (i = 0, mask = 1; i < NUM_MONSTERS; i++) {
// Some check was optimized out. Needed for matching. Thanks kaz
if (i) {

3
src/debug_menu4.c
View File

@ -7,8 +7,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B3F8 *sUnknown_203B3F8 = {0};

2
src/ds_menus.c
View File

@ -1,6 +1,6 @@
#include "global.h"
#include "input.h"
#include "text1.h"
#include "text.h"
u32 CreateDualSlotMenu(void)
{

2
src/dungeon_map_access.c
View File

@ -7,7 +7,7 @@
#include "structs/str_dungeon.h"
#include "tile_types.h"
#include "random.h"
#include "text1.h"
#include "text.h"
#include "dungeon_engine.h"
#include "dungeon_movement.h"
#include "dungeon_leader.h"

4
src/dungeon_message.c
View File

@ -10,7 +10,6 @@
#include "code_803E668.h"
#include "bg_palette_buffer.h"
#include "input.h"
#include "text2.h"
#include "pokemon.h"
#include "file_system.h"
#include "dungeon_util_1.h"
@ -19,7 +18,7 @@
#include "code_8045A00.h"
#include "exclusive_pokemon.h"
#include "dungeon_leader.h"
#include "text1.h"
#include "text.h"
void sub_80526D0(s32 r0);
static void PutStringsOnMessageLog(void);
@ -35,7 +34,6 @@ extern void sub_805E804(void);
extern void sub_803EAF0(s32, s32);
extern void sub_8040238(void);
extern void sub_8083E28(void);
extern bool8 sub_8008D8C(u32 strId);
extern u32 sub_8014140(s32 a0, const void *a1);
extern void sub_8083D30(void);
extern void sub_8083D08(void);

5
src/felicity_bank.c
View File

@ -8,13 +8,10 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 FelicityBankWork *sFelicityBankWork = {0};
extern u8 gSpeakerNameBuffer[];
#include "data/felicity_bank.h"
static void CreateFelicityBankShopMenu(void);

3
src/friend_area_action_menu.c
View File

@ -21,8 +21,7 @@
#include "moves.h"
#include "pokemon.h"
#include "sprite.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B2BC *sUnknown_203B2BC = {0};

3
src/friend_list_menu.c
View File

@ -23,8 +23,7 @@
#include "menu_input.h"
#include "moves.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
EWRAM_DATA_2 unkStruct_203B2B4 *gUnknown_203B2B4 = {0};

3
src/friend_rescue.c
View File

@ -23,8 +23,7 @@
#include "save_write.h"
#include "rescue_password_menu.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "wonder_mail_4.h"
#include "wonder_mail_5.h"

3
src/gulpin_shop.c
View File

@ -11,8 +11,7 @@
#include "memory.h"
#include "menu_input.h"
#include "moves.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 GulpinShopWork *sGulpinShopWork = {0};

5
src/gulpin_shop_801FB50.c
View File

@ -17,13 +17,10 @@
#include "moves.h"
#include "pokemon_3.h"
#include "pokemon_mid.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
EWRAM_DATA_2 unkStruct_203B27C *gUnknown_203B27C = {0};
extern u8 gSpeakerNameBuffer[];
#include "data/gulpin_shop_801FB50.h"
enum menuActions {

3
src/hints_menu1.c
View File

@ -6,8 +6,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
static EWRAM_DATA_2 struct_Sub80095E4 *sUnknown_203B264 = {0};

3
src/hints_menu2.c
View File

@ -6,8 +6,7 @@
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
static EWRAM_DATA_2 struct_Sub80095E4_2 *sUnknown_203B268 = {0};

3
src/iq_skill_info_menu.c
View File

@ -9,8 +9,7 @@
#include "menu_input.h"
#include "pokemon_3.h"
#include "sprite.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct IQSkillInfoMenu *sIQSkillInfoMenu = {0};

3
src/iq_skill_list_menu.c
View File

@ -8,8 +8,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct IQSkillListMenu *sIQSkillListMenu = {0};

3
src/iq_skill_menu.c
View File

@ -9,8 +9,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct IQSkillMenu *sIQSkillMenu = {0};

2
src/items.c
View File

@ -9,7 +9,7 @@
#include "random.h"
#include "code_800D090.h"
#include "text_util.h"
#include "text2.h"
#include "text.h"
#include "string_format.h"
#include <stddef.h>

5
src/kangaskhan_storage1.c
View File

@ -11,10 +11,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
extern u8 gSpeakerNameBuffer[];
#include "text.h"
EWRAM_DATA_2 struct KangaskhanStorageWork *gKangaskhanStorageWork = {0};

3
src/kangaskhan_storage2.c
View File

@ -10,8 +10,7 @@
#include "kecleon_bros4.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B20C *sUnknown_203B20C = {0};

5
src/kecleon_bros1.c
View File

@ -15,10 +15,7 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
extern u8 gSpeakerNameBuffer[];
#include "text.h"
static EWRAM_DATA_2 KecleonBrosWork1 *sKecleonBrosWork1 = {0};

3
src/kecleon_bros2.c
View File

@ -8,8 +8,7 @@
#include "kecleon_bros2.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
static EWRAM_DATA_2 struct_Sub80095E4_2 *gUnknown_203B214 = {0};

3
src/kecleon_bros3.c
View File

@ -8,8 +8,7 @@
#include "kecleon_bros3.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
static EWRAM_DATA_2 struct_Sub80095E4_2 *gUnknown_203B21C = {0};

3
src/kecleon_bros4.c
View File

@ -10,8 +10,7 @@
#include "kecleon_bros4.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B224 *gUnknown_203B224 = {0};
static EWRAM_DATA_2 u16 gUnknown_203B228 = {0};

3
src/load_screen.c
View File

@ -20,8 +20,7 @@
#include "pokemon.h"
#include "save.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
extern const struct FileArchive gTitleMenuFileArchive;

3
src/luminous_cave.c
View File

@ -19,8 +19,7 @@
#include "pokemon.h"
#include "random.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
enum
{

3
src/mailbox.c
View File

@ -3,8 +3,7 @@
#include "code_802DE84.h"
#include "common_strings.h"
#include "memory.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/menu.h"
#include "input.h"
#include "mailbox.h"

10
src/main.c
View File

@ -14,8 +14,7 @@
#include "random.h"
#include "reg_control.h"
#include "sprite.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
EWRAM_DATA u8 IntrMain_Buffer[0x120] = {0};
EWRAM_DATA IntrCallback gIntrTable[6] = {0};
@ -41,6 +40,7 @@ extern const IntrCallback gInitialIntrTable[6];
// code_2.c
extern void GameLoop(void);
extern void InitGraphics(void);
// code_800D090.c
extern void Hang(void);
extern void sub_800D6AC(void);
@ -128,11 +128,11 @@ void sub_800B540(void)
REG_IE ^= INTR_FLAG_TIMER3 | INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT; // 0x45
*(u8*)&REG_DISPCNT |= DISPCNT_FORCED_BLANK;
*(u8*)&REG_DISPCNT |= DISPCNT_FORCED_BLANK;
InitIntrTable(gInitialIntrTable); // set up intrrupt vector/table
REG_TM3CNT = (TIMER_64CLK | TIMER_INTR_ENABLE | TIMER_ENABLE) << 16;
REG_TM3CNT = (TIMER_64CLK | TIMER_INTR_ENABLE | TIMER_ENABLE) << 16;
REG_IE |= INTR_FLAG_GAMEPAK | INTR_FLAG_TIMER3 | INTR_FLAG_VCOUNT | INTR_FLAG_VBLANK; // 0x2045
REG_DISPSTAT = DISPSTAT_VCOUNT_INTR | DISPSTAT_VBLANK_INTR;
@ -216,4 +216,4 @@ IntrCallback SetInterruptCallback(u32 index, IntrCallback new_callback)
EnableInterrupts();
return old_callback;
}
}

3
src/main_menu1.c
View File

@ -17,8 +17,7 @@
#include "other_menus1.h"
#include "rescue_password_menu.h"
#include "save_menu.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "trade_items_menu.h"
#include "unk_menu_203B360.h"
#include "wonder_mail_main_menu.h"

2
src/main_menu2.c
View File

@ -9,7 +9,7 @@
#include "memory.h"
#include "menu_input.h"
#include "save.h"
#include "text1.h"
#include "text.h"
static EWRAM_DATA_2 MainMenu2Work *sUnknown_203B34C = {0};
static EWRAM_DATA_2 u32 sUnknown_203B350 = {0};

5
src/makuhita_dojo1.c
View File

@ -12,10 +12,7 @@
#include "makuhita_dojo2.h"
#include "memory.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
extern u8 gSpeakerNameBuffer[];
#include "text.h"
static EWRAM_DATA_2 MakuhitaDojoWork1 *sMakuhitaDojoWork1 = {0};

3
src/makuhita_dojo2.c
View File

@ -11,8 +11,7 @@
#include "makuhita_dojo2.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 MakuhitaDojoWork2 *sMakuhitaDojoWork2 = {0};

3
src/menu_input.c
View File

@ -10,8 +10,7 @@
#include "menu_input.h"
#include "sprite.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "util.h"
#include "structs/struct_sub80095e4.h"

3
src/mission_reward.c
View File

@ -11,8 +11,7 @@
#include "string_format.h"
#include "code_80118A4.h"
#include "code_801B60C.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
struct unkStruct_203B310
{

2
src/moves.c
View File

@ -8,7 +8,7 @@
#include "memory.h"
#include "moves.h"
#include "text_util.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA OpenedFile *sWazaParametersFile = {0};
static EWRAM_DATA MoveDataEntry *sMovesData = {0};

5
src/options_menu1.c
View File

@ -10,8 +10,7 @@
#include "menu_input.h"
#include "options_menu1.h"
#include "options_menu2.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
enum
{
@ -309,4 +308,4 @@ static void HandleChangeSettingsMenu(void)
SetOptionsMenuState(OPTIONS_MENU_MAIN);
break;
}
}
}

5
src/options_menu2.c
View File

@ -7,8 +7,7 @@
#include "memory.h"
#include "menu_input.h"
#include "options_menu2.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B260 *sUnknown_203B260 = {0};
@ -124,4 +123,4 @@ static void CreateOptionsMenu(void)
}
sub_80073E0(sUnknown_203B260->unk44);
}
}

4
src/other_menus1.c
View File

@ -16,7 +16,7 @@
#include "other_menus1.h"
#include "other_menus2.h"
#include "sprite.h"
#include "text1.h"
#include "text.h"
// TODO: MAKE STATIC WHEN other_menus1.s IS DED
EWRAM_DATA_2 unkStruct_203B35C *sUnknown_203B35C = {0};
@ -26,8 +26,6 @@ EWRAM_DATA_2 unkStruct_203B35C *sUnknown_203B35C = {0};
// other_menus1.s
extern void sub_8037810(void);
extern void sub_8037900(void);
// text.s
extern void xxx_call_update_bg_vram();
// other_menus2.s
extern s32 sub_8037B28(u32);

3
src/party_list_menu.c
View File

@ -23,8 +23,7 @@
#include "party_list_menu.h"
#include "pokemon.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B2B8 *sUnknown_203B2B8 = {0};

7
src/pelipper_board.c
View File

@ -5,8 +5,7 @@
#include "pokemon.h"
#include "items.h"
#include "memory.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "structs/menu.h"
#include "input.h"
#include "menu_input.h"
@ -230,7 +229,7 @@ void CreatePelipperBoardMenu(void)
{
gPelipperBoard->unkFC[loopMax] = 1;
}
loopMax += 1;
gPelipperBoard->menuItems[loopMax].text = NULL;
gPelipperBoard->menuItems[loopMax].menuAction = PELIPPER_BOARD_NULL;
@ -255,7 +254,7 @@ void CreatePelipperBoardMenu(void)
void sub_802EC10(void) {
s32 index;
s32 loopMax = 0;
s32 loopMax = 0;
gPelipperBoard->menuItems[loopMax].text = gCommonAccept[0];
gPelipperBoard->menuItems[loopMax].menuAction = PELIPPER_BOARD_ACCEPT;

3
src/personality_test1.c
View File

@ -16,8 +16,7 @@
#include "random.h"
#include "save.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "string_format.h"
enum

3
src/personality_test2.c
View File

@ -10,8 +10,7 @@
#include "menu_input.h"
#include "personality_test2.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "string_format.h"
EWRAM_DATA_2 struct PersonalityStruct_203B404 *gUnknown_203B404 = {0};

92
src/pokemon_mail.c
View File

@ -15,10 +15,8 @@
#include "pokemon_mail.h"
#include "pokemon_mail_pre.h"
#include "text_util.h"
#include "text2.h"
extern u8 gFormatBuffer_Items[];
extern u8 gFormatBuffer_Monsters[]; // 202DF98
#include "text.h"
#include "string_format.h"
#include "data/pokemon_mail.h"
@ -57,13 +55,13 @@ void CreateRescueTitle(unkStruct_802C39C *param_1)
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
case 12:
BufferItemName(gFormatBuffer_Items, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8830, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8830, gFormatBuffer_Items[0]);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
case 11:
BufferItemName(gFormatBuffer_Items, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8848, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8848, gFormatBuffer_Items[0]);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
case 4:
@ -78,24 +76,24 @@ void CreateRescueTitle(unkStruct_802C39C *param_1)
case 10: {
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80EAE5C[bVar2 % 4], gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80EAE5C[bVar2 % 4], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
}
case 9: {
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80E910C[bVar2 % 10], gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80E910C[bVar2 % 10], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
}
default: {
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80E8C98[bVar2 % 15], gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80E8C98[bVar2 % 15], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(21, param_1->y, buf_1, param_1->unk0[0], 0);
break;
}
@ -163,13 +161,13 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
PrintStringOnWindow(10, y, gMedichamMissionDescription, param_1->unk0[0], 0);
break;
case 4:
BufferItemName(gFormatBuffer_Items, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8968, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8968, gFormatBuffer_Items[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
break;
case 5:
BufferItemName(gFormatBuffer_Items, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E89B0, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E89B0, gFormatBuffer_Items[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
break;
case 6:
@ -177,8 +175,8 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
break;
case 7:
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80E9F8C[param_1->unk0[1]].text, gFormatBuffer_Monsters, gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80E9F8C[param_1->unk0[1]].text, gFormatBuffer_Monsters[0], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
break;
case 9:
@ -194,12 +192,12 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
case 16: {
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
u8 bVar3 = param_1->unk8->seed + param_1->unk8->dungeon.floor;
BufferItemName(gFormatBuffer_Items, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80EB3F8[bVar2 % 22], gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80EB3F8[bVar2 % 22], gFormatBuffer_Items[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80EB72C[bVar3 % 22], gFormatBuffer_Items);
sprintfStatic(buf_1, gUnknown_80EB72C[bVar3 % 22], gFormatBuffer_Items[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
@ -208,12 +206,12 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
u8 bVar3 = param_1->unk8->seed + param_1->unk8->dungeon.floor;
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80EAEB8[bVar2 % 20], gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80EAEB8[bVar2 % 20], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80EB198[bVar3 % 4], gFormatBuffer_Monsters);
sprintfStatic(buf_1, gUnknown_80EB198[bVar3 % 4], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
@ -222,12 +220,12 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
u8 bVar3 = param_1->unk8->seed + param_1->unk8->dungeon.floor;
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80EB220[bVar2 % 6], gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80EB220[bVar2 % 6], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80EB2F0[bVar3 % 6], gFormatBuffer_Monsters);
sprintfStatic(buf_1, gUnknown_80EB2F0[bVar3 % 6], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
@ -236,12 +234,12 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
u8 bVar3 = param_1->unk8->seed + param_1->unk8->dungeon.floor;
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80E91D4[bVar2 % 45], gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80E91D4[bVar2 % 45], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80E9820[bVar3 % 10], gFormatBuffer_Monsters);
sprintfStatic(buf_1, gUnknown_80E9820[bVar3 % 10], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
@ -250,12 +248,12 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
u8 bVar2 = param_1->unk8->seed + param_1->unk8->dungeon.id;
u8 bVar3 = param_1->unk8->seed + param_1->unk8->dungeon.floor;
monName = GetMonSpecies(param_1->clientSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80E8DE4[bVar2 % 13], gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80E8DE4[bVar2 % 13], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y += 12;
sprintfStatic(buf_1, gUnknown_80E8FB0[bVar3 % 13], gFormatBuffer_Monsters);
sprintfStatic(buf_1, gUnknown_80E8FB0[bVar3 % 13], gFormatBuffer_Monsters[0]);
PrintStringOnWindow(10, y, buf_1, param_1->unk0[0], 0);
y -= 12;
break;
@ -282,13 +280,13 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
PrintStringOnWindow(68, y, gUnknown_80E8AEC, param_1->unk0[0], 0);
break;
case MISSION_TYPE_DELIVER_ITEM:
BufferItemName(gFormatBuffer_Items, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8AFC, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8AFC, gFormatBuffer_Items[0]);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_FIND_ITEM:
BufferItemName(gFormatBuffer_Items, param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8B10, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->targetItem, NULL);
sprintfStatic(buf_1, gUnknown_80E8B10, gFormatBuffer_Items[0]);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_RESCUE_CLIENT:
@ -296,14 +294,14 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
break;
case MISSION_TYPE_ESCORT_CLIENT:
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80E8B2C, gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80E8B2C, gFormatBuffer_Monsters[0]);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_RESCUE_TARGET:
monName = GetMonSpecies(param_1->targetSpecies);
strcpy(gFormatBuffer_Monsters, monName);
sprintfStatic(buf_1, gUnknown_80E8B40, gFormatBuffer_Monsters);
strcpy(gFormatBuffer_Monsters[0], monName);
sprintfStatic(buf_1, gUnknown_80E8B40, gFormatBuffer_Monsters[0]);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case MISSION_TYPE_SPECIAL_MISSION:
@ -314,7 +312,7 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
y += 12;
PrintStringOnWindow(10, y, gPlaceText, param_1->unk0[0], 0);
if (param_1->mailMissionType == MISSION_TYPE_FIND_ITEM) {
PrintDungeonLocationtoBuffer(buf_5, &param_1->unk8->dungeon);
sprintfStatic(buf_1, gUnknown_80E8884, buf_5);
@ -347,14 +345,14 @@ void CreateRescueDescription(unkStruct_802C39C *param_1)
break;
case ITEM: // Item
case ITEM_EXTRA: // Item + ?
BufferItemName(gFormatBuffer_Items, param_1->rewardItem, NULL);
sprintfStatic(buf_1, gMissionRewardText[param_1->rewardType], gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], param_1->rewardItem, NULL);
sprintfStatic(buf_1, gMissionRewardText[param_1->rewardType], gFormatBuffer_Items[0]);
PrintStringOnWindow(68, y, buf_1, param_1->unk0[0], 0);
break;
case 4: // Friend Area
PrintStringOnWindow(68, y, gMissionRewardText[param_1->rewardType], param_1->unk0[0], 0);
break;
default:
default:
PrintStringOnWindow(68, y, gMissionRewardText[param_1->rewardType], param_1->unk0[0], 0);
break;
}

3
src/pokemon_news1.c
View File

@ -10,8 +10,7 @@
#include "pokemon_news2.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B2CC *sUnknown_203B2CC = {0};
static EWRAM_DATA_2 u16 sUnknown_203B2D0 = {0};

3
src/pokemon_news2.c
View File

@ -9,8 +9,7 @@
#include "pokemon_news2.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B2D4 *sUnknown_203B2D4 = {0};

10
src/pokemon_news3.c
View File

@ -14,10 +14,8 @@
#include "pokemon_mid.h"
#include "pokemon_news3.h"
#include "structs/str_802C39C.h"
#include "text1.h"
#include "text2.h"
extern u8 gFormatBuffer_Monsters[]; // 202DF98
#include "text.h"
#include "string_format.h"
static EWRAM_DATA_2 struct unkStruct_203B2D8 *sUnknown_203B2D8 = {0};
static EWRAM_DATA_2 u16 sUnknown_203B2DC = {0};
@ -143,8 +141,8 @@ void CreateMailMenu(void)
if (mail->mailType == MAIL_TYPE_UNK1) {
y = sub_8013800(&sUnknown_203B2D8->unk4.s0.input, i);
sub_803B6B0(10, y, 6, sUnknown_203B2D8->unk4.s0.unk34);
PrintPokeNameToBuffer(gFormatBuffer_Monsters, GetPlayerPokemonStruct());
sprintfStatic(buffer, GetPokemonMailHeadline(mail->unk4.dungeon.floor), gFormatBuffer_Monsters);
PrintPokeNameToBuffer(gFormatBuffer_Monsters[0], GetPlayerPokemonStruct());
sprintfStatic(buffer, GetPokemonMailHeadline(mail->unk4.dungeon.floor), gFormatBuffer_Monsters[0]);
PrintStringOnWindow(21, y, buffer, sUnknown_203B2D8->unk4.s0.unk34, 0);
}
else {

2
src/post_office_guide1.c
View File

@ -6,7 +6,7 @@
#include "structs/menu.h"
#include "pokemon.h"
#include "post_office_guide1.h"
#include "text1.h"
#include "text.h"
enum PostOfficeStates
{

14
src/post_office_guide2.c
View File

@ -15,10 +15,8 @@
#include "menu_input.h"
#include "pokemon_mail.h"
#include "post_office_guide2.h"
#include "text1.h"
#include "text2.h"
extern u8 gFormatBuffer_Items[];
#include "text.h"
#include "string_format.h"
static EWRAM_DATA_2 unkStruct_203B330 *sUnknown_203B330 = {0};
@ -146,13 +144,13 @@ static void DisplayMissionObjectives(void)
switch (jobInfo->missionType) {
case WONDER_MAIL_MISSION_TYPE_DELIVER_ITEM:
BufferItemName(gFormatBuffer_Items, jobInfo->targetItem, NULL);
sprintfStatic(buffer1, sFmtBring, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], jobInfo->targetItem, NULL);
sprintfStatic(buffer1, sFmtBring, gFormatBuffer_Items[0]);
PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
break;
case WONDER_MAIL_MISSION_TYPE_FIND_ITEM:
BufferItemName(gFormatBuffer_Items, jobInfo->targetItem, NULL);
sprintfStatic(buffer1, sFmtFind, gFormatBuffer_Items);
BufferItemName(gFormatBuffer_Items[0], jobInfo->targetItem, NULL);
sprintfStatic(buffer1, sFmtFind, gFormatBuffer_Items[0]);
PrintStringOnWindow(40, yCoord, buffer1, sUnknown_203B330->unk10, 0);
break;
case WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT:

1
src/random.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "random.h"
EWRAM_DATA_2 s32 gPRNGSequenceNum = {0};

3
src/rescue_password_menu.c
View File

@ -13,8 +13,7 @@
#include "pokemon.h"
#include "rescue_password_menu.h"
#include "save.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#define RESCUE_PASSWORD_SIZE 0x36

2
src/save_menu.c
View File

@ -8,7 +8,7 @@
#include "save.h"
#include "save_menu.h"
#include "sprite.h"
#include "text1.h"
#include "text.h"
static EWRAM_DATA_2 SaveMenuWork *sUnknown_203B364 = {0};

3
src/string_format.c
View File

@ -7,8 +7,7 @@
#include "string_format.h"
#include "bg_palette_buffer.h"
#include "input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "game_options.h"
#include "pokemon.h"
#include "code_800D090.h"

634
src/text2.c → src/text.c
View File

File diff suppressed because it is too large Load Diff

185
src/text1.c
View File

@ -1,185 +0,0 @@
#include "global.h"
#include "code_800558C.h"
#include "cpu.h"
#include "file_system.h"
#include "text1.h"
#include "text2.h"
extern UnkTextStruct1 gUnknown_2027370[4];
extern u8 *gCharmaps[2];
extern s16 gCharacterSpacing;
extern u8 gUnknown_20274A5;
extern u32 gCurrentCharmap;
extern vu32 gUnknown_20274B0;
extern u32 gUnknown_20274B4[0xEC0];
extern OpenedFile *gCharmapFiles[2]; // 202AFB4
// u32 unused // 202AFBC
extern UnkTextStruct2 gUnknown_202AFC0[4];
extern u32 gUnknown_202B020;
extern u32 gUnknown_202B024;
extern u32 gCharHeight[2];
extern u32 gTextShadowMask; // Some text color info is stored; retrieve via "& 0xF"
extern u8 gDrawTextShadow;
extern u16 gUnknown_202B038[4][32][32];
// ?
extern s16 gUnknown_3000E94[];
// data.s
extern const UnkTextStruct2 gUnknown_80B857C[4];
extern const u8 gKanjiA_file_string[]; // 80B87B4
extern const u8 gKanjiB_file_string[]; // 80B87BC
extern const u32 gFadeInNone[8];
extern const u32 gFadeInDungeon[8];
extern const u32 gUnknown_80B8804[4];
extern const u32 gUnknown_80B8814[];
// system_sbin.s
extern const struct FileArchive gSystemFileArchive;
static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct2 *, bool8, bool8, UnkTextStruct2_sub *);
void LoadCharmaps(void)
{
int i;
int j;
int k;
gCurrentCharmap = 0;
gCharmapFiles[0] = OpenFileAndGetFileDataPtr(gKanjiA_file_string, &gSystemFileArchive);
gCharmapFiles[1] = OpenFileAndGetFileDataPtr(gKanjiB_file_string, &gSystemFileArchive);
gCharmaps[0] = gCharmapFiles[0]->data;
gCharmaps[1] = gCharmapFiles[1]->data;
gCharHeight[0] = 11;
gCharHeight[1] = 12;
for (k = 0; k < 4; k++) {
gUnknown_2027370[k].unk4 = 0;
gUnknown_2027370[k].unk8 = 0;
gUnknown_2027370[k].unk46 = 0;
}
gCharacterSpacing = 0;
for (i = 0; i < 20; i++) {
gUnknown_202B038[0][i][0] = 0xf279;
gUnknown_202B038[1][i][0] = 0xf27a;
for (j = 1; j < 32; j++) {
gUnknown_202B038[0][i][j] = 0;
gUnknown_202B038[1][i][j] = 0xf27a;
}
}
gDrawTextShadow = 1;
gTextShadowMask = 0x88888888;
gUnknown_203B078 = NULL;
gUnknown_20274A5 = 0;
gUnknown_202B020 = 1;
gUnknown_202B024 = 20;
UpdateFadeInTile(0);
}
u32 UpdateFadeInTile(u32 a0)
{
u32 r5 = gUnknown_20274B0;
u32 *r4 = (u32 *)(VRAM + 0x4F40);
const u32 *r2;
gUnknown_20274B0 = a0;
if (a0 == 0 || a0 == 2) {
sub_800CDA8(2);
r2 = gFadeInNone;
}
else {
sub_800CDA8(1);
r2 = gFadeInDungeon;
}
gTextShadowMask = 0x88888888;
*r4++ = *r2++;
*r4++ = *r2++;
*r4++ = *r2++;
*r4++ = *r2++;
*r4++ = *r2++;
*r4++ = *r2++;
*r4++ = *r2++;
*r4++ = *r2++;
return r5;
}
u32 sub_80063B0(void)
{
return gUnknown_20274B0;
}
u8 UnusedSetTextShadow(u8 a0)
{
u8 retval = gDrawTextShadow;
gDrawTextShadow = a0;
return retval;
}
void SelectCharmap(u32 a0)
{
gCurrentCharmap = a0;
}
void SetCharacterMask(int a0)
{
u32 retval;
if (a0 == 0) {
gUnknown_20274B0;
retval = 0x88888888;
}
else {
retval = (a0 & 0xF) | ((a0 & 0xF) << 4); // Must be one line for matching
retval |= ((a0 & 0xF) << 8);
retval |= ((a0 & 0xF) << 12);
retval |= ((a0 & 0xF) << 16);
retval |= ((a0 & 0xF) << 20);
retval |= ((a0 & 0xF) << 24);
retval |= ((a0 & 0xF) << 28);
}
gTextShadowMask = retval;
}
// TODO: Move xxx_call_save_unk_text_struct_800641C and SaveUnkTextStructAndXXX_8006438 to text2.c ? data.s shows text1 and text2 are merged somehow but not fully
void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct2 *a0, bool8 a1, bool8 a2)
{
UnkTextStruct2_sub r3 = {0, 0};
SaveUnkTextStructAndXXX_8006438(a0, a1, a2, &r3);
}
// https://decomp.me/scratch/xF5Y1
static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct2 *a0, bool8 a1, bool8 a2, UnkTextStruct2_sub *a3)
{
s32 i;
u32 r9;
r9 = 2;
if (a0 == NULL)
a0 = gUnknown_80B857C;
if (a2)
sub_8009388();
sub_800898C();
for (i = 0; i < 4; i++) {
gUnknown_202AFC0[i] = a0[i];
if (a0[i].unkC) {
sub_8006554(gUnknown_2027370, (u32 *)VRAM, gUnknown_20274B4, &gUnknown_202B038[0][0][0], gUnknown_80B8804[i], a0 + i, a1, r9, a3, 0);
sub_80089AC(a0 + i, a3);
r9 += a0[i].unkC * a0[i].unk10;
}
}
// Needed to account for weird compiler LDRs
ASM_MATCH_TRICK(gUnknown_203B078);
ASM_MATCH_TRICK(gUnknown_3000E94[0]);
ASM_MATCH_TRICK(gUnknown_20274A5);
gUnknown_203B078 = gUnknown_3000E94;
gUnknown_20274A5 = 1;
}

3
src/thank_you_wonder_mail.c
View File

@ -20,8 +20,7 @@
#include "save.h"
#include "save_write.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "thank_you_wonder_mail.h"
#include "wonder_mail_4.h"
#include "wonder_mail_5.h"

3
src/trade_items_menu.c
View File

@ -13,8 +13,7 @@
#include "menu_input.h"
#include "other_menus2.h"
#include "save_write.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "trade_items_menu.h"
static EWRAM_DATA_2 struct TradeItemsMenu *sTradeItemsMenu = {0};

2
src/unk_menu_203B360.c
View File

@ -5,7 +5,7 @@
#include "memory.h"
#include "menu_input.h"
#include "sprite.h"
#include "text1.h"
#include "text.h"
#include "unk_menu_203B360.h"
// Size: 0x1B4. Similar to SaveMenuWork

3
src/wigglytuff_shop1.c
View File

@ -9,8 +9,7 @@
#include "items.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "wigglytuff_shop1.h"
static EWRAM_DATA_2 WigglytuffShop1Work *sWigglytuffShop1Work = {0};

9
src/wigglytuff_shop2.c
View File

@ -10,8 +10,7 @@
#include "menu_input.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "wigglytuff_shop2.h"
static EWRAM_DATA_2 WigglytuffShop2Work *sWigglytuffShop2Work = {0};
@ -114,10 +113,10 @@ static void PopulateWigglytuffShopFriendAreaInfoScreen(void)
sub_808D930(buffer2, sWigglytuffShop2Work->friendAreaSpecies[i]);
switch (sWigglytuffShop2Work->pokemonStatus[i]) {
case POKEMON_UNKNOWN:
case POKEMON_UNKNOWN:
PrintStringOnWindow(x, y, gCommonTripleQuestionMark[0], sWigglytuffShop2Work->unk74, 0);
break;
case POKEMON_SEEN:
case POKEMON_SEEN:
PrintStringOnWindow(x, y, buffer2, sWigglytuffShop2Work->unk74, 0);
break;
case POKEMON_RECRUITED:
@ -174,7 +173,7 @@ static void sub_8021A60(void)
}
}
/* Return index of pokemon if in the friend area, else return -1 */
/* Return index of pokemon if in the friend area, else return -1 */
static s32 CheckSpeciesinWigglytuffFriendArea(s16 species)
{
s32 baseSpecies;

6
src/wigglytuff_shop3.c
View File

@ -12,15 +12,11 @@
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"
#include "text.h"
#include "wigglytuff_shop1.h"
#include "wigglytuff_shop2.h"
#include "wigglytuff_shop3.h"
extern u8 gSpeakerNameBuffer[];
extern u8 gFormatBuffer_FriendArea[];
static EWRAM_DATA_2 WigglytuffShop3Work *sWigglytuffShop3Work = {0};
#include "data/wigglytuff_shop3.h"

Some files were not shown because too many files have changed in this diff Show More