dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of manual sym defines in sym_ewram.txt and ld_script_modern.txt

Browse Source
This commit is contained in:
luckytyphlosion
2020-07-04 18:14:40 -04:00
parent aecf2dbf6e
commit d7df6bf6e3
8 changed files with 30 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-2
View File
@@ -56,5 +56,3 @@ types_*.taghl
_Deparsed_XSubs.pm _Deparsed_XSubs.pm
porymap.project.cfg porymap.project.cfg
.vscode/*.* .vscode/*.*
baserom.txt
pokefirered.txt
compare.sh
+6 -6
View File
@@ -1,11 +1,11 @@
#!/bin/sh #!/bin/bash
# Compares baserom.gba and pokefirered.gba # Compares baserom.gba and pokefirered.gba
# create baserom.txt if necessary # create baserom_compare.dump if necessary
if [ ! -f baserom.txt ]; then if [ ! -f baserom_compare.dump ]; then
hexdump -C baserom.gba > baserom.txt # can create an empty baserom.txt if no baserom.gba hexdump -C baserom.gba > baserom_compare.dump # can create an empty baserom_compare.dump if no baserom.gba
fi fi
hexdump -C pokefirered.gba > pokefirered.txt hexdump -C pokefirered.gba > pokefirered_compare.dump
diff -u baserom.txt pokefirered.txt | less diff -u baserom_compare.dump pokefirered_compare.dump | less
constants/misc_constants.inc
-2
View File
@@ -3,8 +3,6 @@
.set NULL, 0 .set NULL, 0
.set MOVE_NAME_LENGTH, 13
.set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14)
.set SPRITE_SIZE_16x16, (OAM_SIZE_1 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_16x16, (OAM_SIZE_1 >> 28) | (OAM_SQUARE >> 14)
.set SPRITE_SIZE_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14)
include/pokemon_summary_screen.h
+2 -4
View File
@@ -3,10 +3,8 @@
#include "main.h" #include "main.h"
extern u8 gLastViewedMonIndex; extern const u8 * const gMoveDescriptionPointers[];
extern const u8 * const gNatureNamePointers[];
extern const u8 *const gMoveDescriptionPointers[];
extern const u8 *const gNatureNamePointers[];
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
ld_script_modern.txt
-14
View File
@@ -12,20 +12,6 @@ SECTIONS {
. = 0x1C000; . = 0x1C000;
*(ewram_data); *(ewram_data);
/* pokemon_summary_screen.o */
. = ALIGN(4);
gUnknown_203B140 = .; . += 0x4;
gUnknown_203B144 = .; . += 0x4;
gUnknown_203B148 = .; . += 0x10;
gUnknown_203B158 = .; . += 0x4;
gUnknown_203B15C = .; . += 0x4;
gUnknown_203B160 = .; . += 0x4;
gUnknown_203B164 = .; . += 0x4;
gUnknown_203B168 = .; . += 0x4;
gLastViewedMonIndex = .; . += 0x1;
gUnknown_203B16D = .; . += 0x1;
gUnknown_203B16E = .; . += 0x2;
gUnknown_203B170 = .; . += 0x4;
. = 0x40000; . = 0x40000;
} }
replace.sh
+9
View File
@@ -0,0 +1,9 @@
#!/bin/bash
# $1: phrase to find
# $2: phrase to replace $1
if [ "$1" = "" -o "$2" = "" ]; then
echo "Usage: replace.sh [PHRASE TO FIND] [PHRASE TO REPLACE PHRASE TO FIND]"
exit 0
fi
sed -i 's/\<'"$1"'\>/'"$2"'/' $(grep -lwr --include="*.s" --include="*.h" --include="*.c" --include="*.inc" --include="*.json" --include="*.txt" --exclude-dir="tools" --exclude-dir=".git" --exclude-dir="build" --exclude-dir="berry_fix/build" --exclude-dir="berry_fix/payload/build" --exclude-dir=".travis" "$1")
src/pokemon_summary_screen.c
+12 -11
View File
@@ -316,17 +316,18 @@ struct Struct203B168
u16 unk06; /* 0x06 */ u16 unk06; /* 0x06 */
}; };
extern struct PokemonSummaryScreenData * gMonSummaryScreen; static EWRAM_DATA struct PokemonSummaryScreenData * gMonSummaryScreen = NULL;
extern struct Struct203B144 * gUnknown_203B144; static EWRAM_DATA struct Struct203B144 * gUnknown_203B144 = NULL;
extern struct Struct203B148 * gUnknown_203B148[4]; static EWRAM_DATA struct Struct203B148 * gUnknown_203B148[4] = {};
extern struct Struct203B158 * gUnknown_203B158; static EWRAM_DATA struct Struct203B158 * gUnknown_203B158 = NULL;
extern struct Struct203B15C * gUnknown_203B15C; static EWRAM_DATA struct Struct203B15C * gUnknown_203B15C = NULL;
extern struct Struct203B160 * gUnknown_203B160; static EWRAM_DATA struct Struct203B160 * gUnknown_203B160 = NULL;
extern struct Struct203B164 * gUnknown_203B164; static EWRAM_DATA struct Struct203B164 * gUnknown_203B164 = NULL;
extern struct Struct203B168 * gUnknown_203B168; static EWRAM_DATA struct Struct203B168 * gUnknown_203B168 = NULL;
extern u8 gUnknown_203B16D; static EWRAM_DATA u8 gLastViewedMonIndex = 0;
extern u8 gUnknown_203B16E; static EWRAM_DATA u8 gUnknown_203B16D = 0;
extern struct Struct203B170 * gUnknown_203B170; static EWRAM_DATA u8 gUnknown_203B16E = 0;
static EWRAM_DATA struct Struct203B170 * gUnknown_203B170 = NULL;
extern const u32 gUnknown_8E9B750[]; extern const u32 gUnknown_8E9B750[];
extern const u32 gUnknown_8E9B950[]; extern const u32 gUnknown_8E9B950[];
sym_ewram.txt
+1 -38
View File
@@ -232,45 +232,8 @@
.include "src/tm_case.o" .include "src/tm_case.o"
.align 2 .align 2
.include "src/menu_indicators.o" .include "src/menu_indicators.o"
.align 2 .align 2
@ .include "src/pokemon_summary_screen.o" .include "src/pokemon_summary_screen.o"
gMonSummaryScreen: @ 203B140
.space 0x4
gUnknown_203B144: @ 203B144
.space 0x4
gUnknown_203B148: @ 203B148
.space 0x10
gUnknown_203B158: @ 203B158
.space 0x4
gUnknown_203B15C: @ 203B15C
.space 0x4
gUnknown_203B160: @ 203B160
.space 0x4
gUnknown_203B164: @ 203B164
.space 0x4
gUnknown_203B168: @ 203B168
.space 0x4
gLastViewedMonIndex: @ 203B16C
.space 0x1
gUnknown_203B16D: @ 203B16D
.space 0x1
gUnknown_203B16E: @ 203B16E
.space 0x2
gUnknown_203B170: @ 203B170
.space 0x4
.align 2 .align 2
.include "src/help_system.o" .include "src/help_system.o"
.align 2 .align 2