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

Added static modifers

Browse Source
This commit is contained in:
Anders Løvig 2018-03-28 15:45:35 +02:00
parent 6cd590f4fd
commit 5bc8ee6465
7 changed files with 302 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/rom_8011DC0.s
View File

@ -2506,13 +2506,13 @@ gUnknown_082F2D40:: @ 82F2D40
.4byte gText_RegisteredTextChanged .4byte gText_RegisteredTextChanged
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gText_AlreadySavedFile .4byte gText_AlreadySavedFile_Unused
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gText_SavingDontTurnOff .4byte gText_SavingDontTurnOff_Unused
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gText_PlayerSavedGame .4byte gText_PlayerSavedGame_Unused
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00
.4byte gText_IfLeaderLeavesChatEnds .4byte gText_IfLeaderLeavesChatEnds

4
data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
View File

@ -180,12 +180,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D
.string "This is a sample message.$" .string "This is a sample message.$"
BattleFrontier_BattlePyramidEmptySquare_Text_252CA7:: @ 8252CA7 gText_BattlePyramidConfirmRest:: @ 8252CA7
.string "Your BATTLE PYRAMID quest will be\n" .string "Your BATTLE PYRAMID quest will be\n"
.string "saved so that you may quit for now.\l" .string "saved so that you may quit for now.\l"
.string "Is that okay?$" .string "Is that okay?$"
BattleFrontier_BattlePyramidEmptySquare_Text_252CFB:: @ 8252CFB gText_BattlePyramidConfirmRetire:: @ 8252CFB
.string "Are you sure you want to quit your\n" .string "Are you sure you want to quit your\n"
.string "PYRAMID quest?$" .string "PYRAMID quest?$"

6
data/strings.s
View File

@ -3704,13 +3704,13 @@ gText_LeaderLeftEndingChat:: @ 85ED2FA
gText_RegisteredTextChanged:: @ 85ED325 gText_RegisteredTextChanged:: @ 85ED325
.string "The registered text has been changed.\nIs it okay to save the game?$" .string "The registered text has been changed.\nIs it okay to save the game?$"
gText_AlreadySavedFile:: @ 85ED368 gText_AlreadySavedFile_Unused:: @ 85ED368
.string "There is already a saved file.\nIs it okay to overwrite it?$" .string "There is already a saved file.\nIs it okay to overwrite it?$"
gText_SavingDontTurnOff:: @ 85ED3A3 gText_SavingDontTurnOff_Unused:: @ 85ED3A3
.string "SAVING…\nDON’T TURN OFF THE POWER.$" .string "SAVING…\nDON’T TURN OFF THE POWER.$"
gText_PlayerSavedGame:: @ 85ED3C5 gText_PlayerSavedGame_Unused:: @ 85ED3C5
.string "{SPECIAL_F7 0x00} saved the game.$" .string "{SPECIAL_F7 0x00} saved the game.$"
gText_IfLeaderLeavesChatEnds:: @ 85ED3D8 gText_IfLeaderLeavesChatEnds:: @ 85ED3D8

12
data/text/save.inc
View File

@ -1,18 +1,18 @@
gUnknown_082C87B4:: @ 82C87B4 gText_ConfirmSave:: @ 82C87B4
.string "Would you like to save the game?$" .string "Would you like to save the game?$"
gUnknown_082C87D5:: @ 82C87D5 gText_AlreadySavedFile:: @ 82C87D5
.string "There is already a saved file.\n" .string "There is already a saved file.\n"
.string "Is it okay to overwrite it?$" .string "Is it okay to overwrite it?$"
gUnknown_082C8810:: @ 82C8810 gText_SavingDontTurnOff:: @ 82C8810
.string "SAVING…\n" .string "SAVING…\n"
.string "DON’T TURN OFF THE POWER.$" .string "DON’T TURN OFF THE POWER.$"
gUnknown_082C8832:: @ 82C8832 gText_PlayerSavedGame:: @ 82C8832
.string "{PLAYER} saved the game.$" .string "{PLAYER} saved the game.$"
gUnknown_082C8845:: @ 82C8845 gText_DifferentSaveFile:: @ 82C8845
.string "WARNING!\p" .string "WARNING!\p"
.string "There is a different game file that\n" .string "There is a different game file that\n"
.string "is already saved.\p" .string "is already saved.\p"
@ -22,7 +22,7 @@ gUnknown_082C8845:: @ 82C8845
.string "Are you sure you want to save now\n" .string "Are you sure you want to save now\n"
.string "and overwrite the other save file?$" .string "and overwrite the other save file?$"
gUnknown_082C892A:: @ 82C892A gText_SaveError:: @ 82C892A
.string "Save error.\p" .string "Save error.\p"
.string "Please exchange the\n" .string "Please exchange the\n"
.string "backup memory.$" .string "backup memory.$"

8
include/start_menu.h
View File

@ -3,6 +3,14 @@
extern bool8 (*gMenuCallback)(void); // Defined in sym_common.txt extern bool8 (*gMenuCallback)(void); // Defined in sym_common.txt
void sub_809FA18(void);
void sub_809FA34(u8 taskId);
void sub_809FA9C(void);
void sub_809FDD4(void);
void sub_809FF80(void);
void sub_80A0514(void);
void sub_80A08CC(void);
void sub_80A0934(void);
void AppendToList(u8* list, u8* pos, u8 newEntry); void AppendToList(u8* list, u8* pos, u8 newEntry);
#endif // GUARD_START_MENU_H #endif // GUARD_START_MENU_H

17
include/strings.h
View File

@ -197,6 +197,23 @@ extern const u8 gText_Peak[];
extern const u8 gText_SafariBallStock[]; extern const u8 gText_SafariBallStock[];
extern const u8 gText_BattlePyramidFloor[]; extern const u8 gText_BattlePyramidFloor[];
// save menu texts
extern const u8 gText_ConfirmSave[];
extern const u8 gText_DifferentSaveFile[];
extern const u8 gText_AlreadySavedFile[];
extern const u8 gText_SavingDontTurnOff[];
extern const u8 gText_PlayerSavedGame[];
extern const u8 gText_SaveError[];
extern const u8 gText_SavingDontTurnOffPower[];
extern const u8 gText_SavingPlayer[];
extern const u8 gText_SavingBadges[];
extern const u8 gText_SavingPokedex[];
extern const u8 gText_SavingTime[];
// Battle pyramid menu texts
extern const u8 gText_BattlePyramidConfirmRest[];
extern const u8 gText_BattlePyramidConfirmRetire[];
// option menu texts // option menu texts
extern const u8 gText_TextSpeedSlow[]; extern const u8 gText_TextSpeedSlow[];
extern const u8 gText_TextSpeedMid[]; extern const u8 gText_TextSpeedMid[];

516
src/start_menu.c
View File

File diff suppressed because it is too large Load Diff