ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move braille_puzzles data to C

Browse Source
This commit is contained in:
Slawter666 2018-09-11 02:17:21 +01:00
parent b6ee8823f0
commit 3c16d8c598
3 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/braille_puzzles.s
View File

@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085EFE74:: @ 85EFE74
.byte 0x04, 0x15, 0x05, 0x15, 0x06, 0x15, 0x07, 0x15
.byte 0x08, 0x15, 0x09, 0x15, 0x0a, 0x15, 0x0b, 0x15
.byte 0x0c, 0x15, 0x0c, 0x16, 0x0c, 0x17, 0x0d, 0x17
.byte 0x0d, 0x18, 0x0d, 0x19, 0x0d, 0x1a, 0x0d, 0x1b
.byte 0x0c, 0x1b, 0x0c, 0x1c, 0x04, 0x1d, 0x05, 0x1d
.byte 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x09, 0x1d
.byte 0x0a, 0x1d, 0x0b, 0x1d, 0x0c, 0x1d, 0x04, 0x1c
.byte 0x04, 0x1b, 0x03, 0x1b, 0x03, 0x1a, 0x03, 0x19
.byte 0x03, 0x18, 0x03, 0x17, 0x04, 0x17, 0x04, 0x16

2
ld_script.txt
View File

@ -512,7 +512,7 @@ SECTIONS {
src/berry_tag_screen.o(.rodata); src/berry_tag_screen.o(.rodata);
src/mystery_event_menu.o(.rodata); src/mystery_event_menu.o(.rodata);
src/save_failed_screen.o(.rodata); src/save_failed_screen.o(.rodata);
data/braille_puzzles.o(.rodata); src/braille_puzzles.o(.rodata);
src/pokeblock_feed.o(.rodata); src/pokeblock_feed.o(.rodata);
src/clear_save_data_screen.o(.rodata); src/clear_save_data_screen.o(.rodata);
src/intro_credits_graphics.o(.rodata); src/intro_credits_graphics.o(.rodata);

55
src/braille_puzzles.c
View File

@ -1,19 +1,16 @@
#include "global.h" #include "global.h"
#include "event_data.h" #include "event_data.h"
#include "constants/songs.h" #include "field_camera.h"
#include "sound.h"
#include "script.h"
#include "constants/species.h"
#include "task.h"
#include "field_effect.h" #include "field_effect.h"
#include "script.h"
#include "sound.h"
#include "task.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/songs.h"
#include "constants/species.h"
extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap
extern void DrawWholeMapView(); // field_camera
extern void SetCameraPanningCallback(void ( *callback)()); // field_camera
extern void InstallCameraPanAheadCallback(void);
extern void SetCameraPanning(s16 x, s16 y);
extern u8 GetCursorSelectionMonId(void); extern u8 GetCursorSelectionMonId(void);
extern u8 oei_task_add(void); extern u8 oei_task_add(void);
@ -26,7 +23,45 @@ enum
EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0; EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0;
extern const u8 gUnknown_085EFE74[][2]; static const u8 gUnknown_085EFE74[][2] =
{
{0x04, 0x15},
{0x05, 0x15},
{0x06, 0x15},
{0x07, 0x15},
{0x08, 0x15},
{0x09, 0x15},
{0x0a, 0x15},
{0x0b, 0x15},
{0x0c, 0x15},
{0x0c, 0x16},
{0x0c, 0x17},
{0x0d, 0x17},
{0x0d, 0x18},
{0x0d, 0x19},
{0x0d, 0x1a},
{0x0d, 0x1b},
{0x0c, 0x1b},
{0x0c, 0x1c},
{0x04, 0x1d},
{0x05, 0x1d},
{0x06, 0x1d},
{0x07, 0x1d},
{0x08, 0x1d},
{0x09, 0x1d},
{0x0a, 0x1d},
{0x0b, 0x1d},
{0x0c, 0x1d},
{0x04, 0x1c},
{0x04, 0x1b},
{0x03, 0x1b},
{0x03, 0x1a},
{0x03, 0x19},
{0x03, 0x18},
{0x03, 0x17},
{0x04, 0x17},
{0x04, 0x16},
};
void SealedChamberShakingEffect(u8); void SealedChamberShakingEffect(u8);
void sub_8179860(void); void sub_8179860(void);