From ab569cc466879939689b3ed945657a13a444bf66 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 14:57:00 -0500 Subject: clock.s --- include/dewford_trend.h | 1 + include/field_screen.h | 1 + include/rom6.h | 6 ++++++ include/tv.h | 1 + include/wallclock.h | 6 ++++++ 5 files changed, 15 insertions(+) create mode 100644 include/wallclock.h (limited to 'include') diff --git a/include/dewford_trend.h b/include/dewford_trend.h index 01e5d9762..3972ad143 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -3,5 +3,6 @@ void InitDewfordTrend(void); void UpdateDewfordTrendPerDay(u16); +void sub_8122580(u16 days); #endif // GUARD_DEWFORDTREND_H diff --git a/include/field_screen.h b/include/field_screen.h index 089e79cc4..f01760fcb 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -9,5 +9,6 @@ void pal_fill_black(void); bool8 sub_80ABDFC(void); void sub_80AF168(void); +void sub_80AEFBC(u16 days); #endif //GUARD_FIELD_SCREEN_H diff --git a/include/rom6.h b/include/rom6.h index b4a972794..014422b3d 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -5,5 +5,11 @@ void sub_81357FC(u8, void(void)); u8 GetLeadMonIndex(void); u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y); void sub_813BADC(bool8); +bool8 sub_813B9C0(void); +void sub_8137904(u16 days); +void sub_8137A20(u16 days); +void sub_8139EF4(u16 days); +void sub_813A7F4(u16 days); +void sub_813945C(u16 days); #endif //GUARD_ROM6_H diff --git a/include/tv.h b/include/tv.h index 3f48af569..80828faf1 100644 --- a/include/tv.h +++ b/include/tv.h @@ -14,5 +14,6 @@ void sub_80EEA70(void); void sub_80F14F8(TVShow *shows); size_t sub_80EF370(int value); void SetPokemonAnglerSpecies(u16 species); +void sub_80ED888(u16 days); #endif //GUARD_TV_H diff --git a/include/wallclock.h b/include/wallclock.h new file mode 100644 index 000000000..48697c19f --- /dev/null +++ b/include/wallclock.h @@ -0,0 +1,6 @@ +#ifndef GUARD_WALLCLOCK_H +#define GUARD_WALLCLOCK_H + +void Cb2_StartWallClock(void); + +#endif //GUARD_WALLCLOCK_H -- cgit v1.2.3 From f54f2c424ffdbdd9b9b3c4758bbbe245833f6436 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 18:00:26 -0500 Subject: LoadWallClockGraphics --- include/gba/macro.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/graphics.h | 3 +++ 2 files changed, 78 insertions(+) (limited to 'include') diff --git a/include/gba/macro.h b/include/gba/macro.h index 7b6b98c06..ad4820bcf 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -78,6 +78,81 @@ #define DmaCopy16(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 16) #define DmaCopy32(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 32) +#define DmaCopyLarge(dmaNum, src, dest, size, block, bit) \ +{ \ + const void *_src = src; \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + DmaCopy##bit(dmaNum, _src, _dest, (block)); \ + _src += (block); \ + _dest += (block); \ + _size -= (block); \ + if (_size <= (block)) \ + { \ + DmaCopy##bit(dmaNum, _src, _dest, _size); \ + break; \ + } \ + } \ +} + +#define DmaCopyLarge16(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 16) + +#define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32) + +#define DmaFillLarge(dmaNum, value, dest, size, block, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + DmaFill##bit(dmaNum, value, _dest, (block)); \ + _dest += (block); \ + _size -= (block); \ + if (_size <= (block)) \ + { \ + DmaFill##bit(dmaNum, value, _dest, _size); \ + break; \ + } \ + } \ +} + +#define DmaFillLarge16(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 16) + +#define DmaFillLarge32(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 32) + +#define DmaCopyDefvars(dmaNum, src, dest, size, bit) \ +{ \ + const void *_src = src; \ + void *_dest = dest; \ + u32 _size = size; \ + DmaCopy##bit(dmaNum, _src, _dest, _size); \ +} + +#define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16) +#define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32) + +#define DmaFillDefvars(dmaNum, value, dest, size, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + DmaFill##bit(dmaNum, value, _dest, _size); \ +} + +#define DmaFill16Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 16) +#define DmaFill32Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 32) + +#define DmaClearDefvars(dmaNum, dest, size, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + DmaClear##bit(dmaNum, _dest, _size); \ +} + +#define DmaClear16Defvars(dmaNum, dest, size) DmaClearDefvars(dmaNum, dest, size, 16) +#define DmaClear32Defvars(dmaNum, dest, size) DmaClearDefvars(dmaNum, dest, size, 32) + #define DmaStop(dmaNum) \ { \ vu16 *dmaRegs = (vu16 *)REG_ADDR_DMA##dmaNum; \ diff --git a/include/graphics.h b/include/graphics.h index c50fdef3f..f3d4588ea 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -91,5 +91,8 @@ extern const u8 gUnknown_08DB9F08[]; extern const u8 gUnknown_08DB9FFC[]; extern const u8 gUnknown_08DBA020[]; extern const u8 gUnknown_08DBA12C[]; +extern const u8 gUnknown_08DCC05C[]; +extern const u16 gUnknown_08DCC01C[]; +extern const u16 gUnknown_08DCC03C[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 24009ea941abb81068745926ca9960acf927dd4e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 19:49:03 -0500 Subject: through Cb2_StartWallClock and associated data --- include/graphics.h | 1 + include/strings.h | 1 + 2 files changed, 2 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index f3d4588ea..528b7f49f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -94,5 +94,6 @@ extern const u8 gUnknown_08DBA12C[]; extern const u8 gUnknown_08DCC05C[]; extern const u16 gUnknown_08DCC01C[]; extern const u16 gUnknown_08DCC03C[]; +extern const u16 gUnknown_08DCC648[]; #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index 08e2b4bba..17ecdd565 100644 --- a/include/strings.h +++ b/include/strings.h @@ -82,5 +82,6 @@ extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; +extern const u8 gText_Confirm3[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From efd23cb91b402ff44cf8139490ae37cf6990d1be Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 20:06:29 -0500 Subject: Cb2_ViewWallClock --- include/graphics.h | 3 ++- include/strings.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 528b7f49f..25a5431c6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -94,6 +94,7 @@ extern const u8 gUnknown_08DBA12C[]; extern const u8 gUnknown_08DCC05C[]; extern const u16 gUnknown_08DCC01C[]; extern const u16 gUnknown_08DCC03C[]; -extern const u16 gUnknown_08DCC648[]; +extern const u8 gUnknown_08DCC648[]; +extern const u8 gUnknown_08DCC908[]; #endif //GUARD_GRAPHICS_H diff --git a/include/strings.h b/include/strings.h index 17ecdd565..b54c68c6e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -83,5 +83,6 @@ extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; extern const u8 gText_Confirm3[]; +extern const u8 gText_Cancel4[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From b210d5f86b4c949b8e98c9117bc19b62fe0ed352 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 21:06:46 -0500 Subject: through c3_80BF560 --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index b54c68c6e..030f46330 100644 --- a/include/strings.h +++ b/include/strings.h @@ -84,5 +84,6 @@ extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; extern const u8 gText_Confirm3[]; extern const u8 gText_Cancel4[]; +extern const u8 gText_IsThisTheCorrectTime[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 16 Dec 2017 10:23:05 -0500 Subject: Import function labels from Ruby --- include/constants/vars.h | 13 ++++++++----- include/dewford_trend.h | 2 +- include/field_screen.h | 2 +- include/menu.h | 2 +- include/rom6.h | 10 +++++----- include/tv.h | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/constants/vars.h b/include/constants/vars.h index 6828614bf..6dc8d0ccd 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -50,11 +50,14 @@ #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_0x402D 0x402D #define VAR_0x402E 0x402E -#define VAR_0x402F 0x402F -#define VAR_0x4030 0x4030 -#define VAR_0x4031 0x4031 -#define VAR_0x4032 0x4032 -#define VAR_0x4033 0x4033 + +#define VAR_FRONTIER_MANIAC_FACILITY 0x402F + +#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 +#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 +#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 +#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 + #define VAR_0x4034 0x4034 #define VAR_0x4035 0x4035 #define VAR_STORAGE_UNKNOWN 0x4036 diff --git a/include/dewford_trend.h b/include/dewford_trend.h index 3972ad143..dac5ea6c9 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -3,6 +3,6 @@ void InitDewfordTrend(void); void UpdateDewfordTrendPerDay(u16); -void sub_8122580(u16 days); +void UpdateDewfordTrendPerDay(u16 days); #endif // GUARD_DEWFORDTREND_H diff --git a/include/field_screen.h b/include/field_screen.h index f01760fcb..cfc0d081f 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -9,6 +9,6 @@ void pal_fill_black(void); bool8 sub_80ABDFC(void); void sub_80AF168(void); -void sub_80AEFBC(u16 days); +void UpdateWeatherPerDay(u16 days); #endif //GUARD_FIELD_SCREEN_H diff --git a/include/menu.h b/include/menu.h index 2052a8dad..99ff35adb 100644 --- a/include/menu.h +++ b/include/menu.h @@ -29,7 +29,7 @@ int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u bool8 free_temp_tile_data_buffers_if_possible(void); u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); -s8 sub_8198C58(void); +s8 ProcessMenuInputNoWrap_(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); diff --git a/include/rom6.h b/include/rom6.h index 014422b3d..6d20752e2 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -6,10 +6,10 @@ u8 GetLeadMonIndex(void); u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y); void sub_813BADC(bool8); bool8 sub_813B9C0(void); -void sub_8137904(u16 days); -void sub_8137A20(u16 days); -void sub_8139EF4(u16 days); -void sub_813A7F4(u16 days); -void sub_813945C(u16 days); +void UpdateMirageRnd(u16 days); +void UpdateBirchState(u16 days); +void UpdateFrontierManiac(u16 days); +void UpdateFrontierGambler(u16 days); +void SetShoalItemFlag(u16 days); #endif //GUARD_ROM6_H diff --git a/include/tv.h b/include/tv.h index afa0ae930..eca11385e 100644 --- a/include/tv.h +++ b/include/tv.h @@ -15,6 +15,6 @@ void sub_80F14F8(TVShow *shows); size_t sub_80EF370(int value); bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language); void SetPokemonAnglerSpecies(u16 species); -void sub_80ED888(u16 days); +void UpdateTVShowsPerDay(u16 days); #endif //GUARD_TV_H -- cgit v1.2.3