From a6072ae293b0c0c3577b280274a2fd755033ab9f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 16 Jan 2018 18:59:06 +0100 Subject: decompile option menu --- include/option_menu.h | 6 ++++++ include/strings.h | 17 +++++++++++++++++ include/text_window.h | 2 +- include/unknown_task.h | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 include/option_menu.h (limited to 'include') diff --git a/include/option_menu.h b/include/option_menu.h new file mode 100644 index 000000000..b23a73c4c --- /dev/null +++ b/include/option_menu.h @@ -0,0 +1,6 @@ +#ifndef GUARD_OPTION_MENU_H +#define GUARD_OPTION_MENU_H + +void CB2_InitOptionMenu(void); + +#endif // GUARD_OPTION_MENU_H diff --git a/include/strings.h b/include/strings.h index a382191a0..5a26881a3 100644 --- a/include/strings.h +++ b/include/strings.h @@ -170,4 +170,21 @@ extern const u8 gText_Peak[]; extern const u8 gText_SafariBallStock[]; extern const u8 gText_BattlePyramidFloor[]; +// option menu texts +extern const u8 gText_TextSpeedSlow[]; +extern const u8 gText_TextSpeedMid[]; +extern const u8 gText_TextSpeedFast[]; +extern const u8 gText_BattleSceneOn[]; +extern const u8 gText_BattleSceneOff[]; +extern const u8 gText_BattleStyleShift[]; +extern const u8 gText_BattleStyleSet[]; +extern const u8 gText_SoundMono[]; +extern const u8 gText_SoundStereo[]; +extern const u8 gText_FrameTypeNumber[]; +extern const u8 gText_FrameType[]; +extern const u8 gText_ButtonTypeNormal[]; +extern const u8 gText_ButtonTypeLR[]; +extern const u8 gText_ButtonTypeLEqualsA[]; +extern const u8 gText_Option[]; + #endif //GUARD_STRINGS_H diff --git a/include/text_window.h b/include/text_window.h index 0af007397..f9a458cc3 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -7,7 +7,7 @@ struct TilesPal u16 *pal; }; -const struct TilesPal* sub_8098758(u8 id); +const struct TilesPal* GetWindowFrameTilesPal(u8 id); void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset); void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset); void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset); diff --git a/include/unknown_task.h b/include/unknown_task.h index 9c6968c30..906fed3e0 100644 --- a/include/unknown_task.h +++ b/include/unknown_task.h @@ -15,7 +15,7 @@ extern struct UnknownTaskStruct gUnknown_0831AC70; // Exported RAM declarations // Exported ROM declarations -void remove_some_task(void); +void ScanlineEffect_Stop(void); void sub_80BA038(struct UnknownTaskStruct arg0); void sub_80BA0A8(void); -- cgit v1.2.3 From 4dd06dbcd327e2af38912e09d31d5c3e00bc93ba Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 16 Jan 2018 19:39:35 +0100 Subject: optiom menu move data to C --- include/strings.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 5a26881a3..7527e56fb 100644 --- a/include/strings.h +++ b/include/strings.h @@ -186,5 +186,13 @@ extern const u8 gText_ButtonTypeNormal[]; extern const u8 gText_ButtonTypeLR[]; extern const u8 gText_ButtonTypeLEqualsA[]; extern const u8 gText_Option[]; +extern const u8 gText_OptionMenu[]; +extern const u8 gText_TextSpeed[]; +extern const u8 gText_BattleScene[]; +extern const u8 gText_BattleStyle[]; +extern const u8 gText_Sound[]; +extern const u8 gText_Frame[]; +extern const u8 gText_OptionMenuCancel[]; +extern const u8 gText_ButtonMode[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From c408110319885748b4fcc696063242c7002f4d30 Mon Sep 17 00:00:00 2001 From: Devin Date: Fri, 19 Jan 2018 15:06:49 -0500 Subject: Fix file permissions. --- include/event_scripts.h | 0 include/field_map_obj.h | 0 include/gba/isagbprint.h | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/event_scripts.h mode change 100755 => 100644 include/field_map_obj.h mode change 100755 => 100644 include/gba/isagbprint.h (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h old mode 100755 new mode 100644 diff --git a/include/field_map_obj.h b/include/field_map_obj.h old mode 100755 new mode 100644 diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h old mode 100755 new mode 100644 -- cgit v1.2.3 From 0bc7fb92db8658c461f81ef57bc9bc4f3ee80c7b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 21 Jan 2018 12:36:11 +0100 Subject: start decompiling mystery event script --- include/constants/vars.h | 2 +- include/mystery_event_msg.h | 16 ++++++++++++++++ include/mystery_event_script.h | 4 +++- include/strings.h | 4 ++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 include/mystery_event_msg.h (limited to 'include') diff --git a/include/constants/vars.h b/include/constants/vars.h index b8bd46a96..8a07c5d19 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -48,7 +48,7 @@ #define VAR_HAPPINESS_STEP_COUNTER 0x402A #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C -#define VAR_0x402D 0x402D +#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D #define VAR_0x402E 0x402E #define VAR_FRONTIER_MANIAC_FACILITY 0x402F diff --git a/include/mystery_event_msg.h b/include/mystery_event_msg.h new file mode 100644 index 000000000..465b60ccb --- /dev/null +++ b/include/mystery_event_msg.h @@ -0,0 +1,16 @@ +#ifndef GUARD_MYSTERY_EVENT_MSG_H +#define GUARD_MYSTERY_EVENT_MSG_H + +extern const u8 gText_MysteryGiftBerry[]; +extern const u8 gText_MysteryGiftBerryTransform[]; +extern const u8 gText_MysteryGiftBerryObtained[]; +extern const u8 gText_MysteryGiftSpecialRibbon[]; +extern const u8 gText_MysteryGiftNationalDex[]; +extern const u8 gText_MysteryGiftRareWord[]; +extern const u8 gText_MysteryGiftSentOver[]; +extern const u8 gText_MysteryGiftFullParty[]; +extern const u8 gText_MysteryGiftNewTrainer[]; +extern const u8 gText_MysteryGiftNewAdversaryInBattleTower[]; +extern const u8 gText_MysteryGiftCantBeUsed[]; + +#endif // GUARD_MYSTERY_EVENT_MSG_H diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h index ab23a8d00..991cab53a 100644 --- a/include/mystery_event_script.h +++ b/include/mystery_event_script.h @@ -1,7 +1,9 @@ #ifndef GUARD_MYSTERY_EVENT_SCRIPT_H #define GUARD_MYSTERY_EVENT_SCRIPT_H -u32 RunMysteryEventScript(u8 *); +void sub_8153870(u8 *script); +bool32 sub_8153884(u32 *a0); +u32 RunMysteryEventScript(u8 *script); void SetMysteryEventScriptStatus(u32 val); u16 GetRecordMixingGift(void); diff --git a/include/strings.h b/include/strings.h index a382191a0..66fbc9b11 100644 --- a/include/strings.h +++ b/include/strings.h @@ -148,6 +148,10 @@ extern const u8 gText_MoveItemsDescription[]; extern const u8 gText_SeeYa[]; extern const u8 gText_SeeYaDescription[]; +extern const u8 gText_EggNickname[]; +extern const u8 gText_Pokemon[]; +extern const u8 gText_InGameClockUsable[]; + // menu texts extern const u8 gText_MenuPokedex[]; extern const u8 gText_MenuPokemon[]; -- cgit v1.2.3 From e0fbd5daad0646c77d1f587d2763bc707df5d417 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 21 Jan 2018 13:32:11 +0100 Subject: text window cleanup --- include/graphics.h | 4 ++++ include/text_window.h | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 85e31aec9..5917e9d2a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1,6 +1,10 @@ #ifndef GUARD_GRAPHICS_H #define GUARD_GRAPHICS_H +// overworld +extern const u32 gMessageBox_Gfx[]; +extern const u16 gMessageBox_Pal[]; + // interface pokeballs extern const u8 gInterfaceGfx_PokeBall[]; extern const u8 gInterfacePal_PokeBall[]; diff --git a/include/text_window.h b/include/text_window.h index f9a458cc3..e6a753fcb 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -1,12 +1,17 @@ #ifndef GUARD_TEXT_WINDOW_H #define GUARD_TEXT_WINDOW_H +#define WINDOW_FRAMES_COUNT 20 + struct TilesPal { - u32 *tiles; - u16 *pal; + const u32 *tiles; + const u16 *pal; }; +extern const u32 gTextWindowFrame1_Gfx[]; +extern const u16 gTextWindowFrame1_Pal[]; + const struct TilesPal* GetWindowFrameTilesPal(u8 id); void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset); void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset); @@ -15,8 +20,8 @@ void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset); void sub_8098858(u8 windowId, u16 tileNum, u8 palNum); void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum); void rbox_fill_rectangle(u8 windowId); -const u16* stdpal_get(u8 id); -const u16* GetOverworldTextboxPalettePtr(void); +const u16 *stdpal_get(u8 id); +const u16 *GetOverworldTextboxPalettePtr(void); void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset); #endif // GUARD_TEXT_WINDOW_H -- cgit v1.2.3 From 89bbecd34bf50a1c0be15746097d797b09356273 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 21 Jan 2018 14:40:19 -0500 Subject: Include in global.h --- include/global.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 3e260fd2a..9f6c45df1 100644 --- a/include/global.h +++ b/include/global.h @@ -1,6 +1,7 @@ #ifndef GUARD_GLOBAL_H #define GUARD_GLOBAL_H +#include #include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" @@ -11,11 +12,16 @@ #define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") +// IDE support #if defined (__APPLE__) || defined (__CYGWIN__) -void *memset(void *, int, size_t); -void *memcpy(void *, const void *, size_t); -int strcmp(const char *s1, const char *s2); -char* strcpy(char *dst0, const char *src0); +#define _(x) x +#define __(x) x +#define INCBIN_U8 {0} +#define INCBIN_U16 {0} +#define INCBIN_U32 {0} +#define INCBIN_S8 {0} +#define INCBIN_S16 {0} +#define INCBIN_S32 {0} #endif // __APPLE__ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) -- cgit v1.2.3