Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-10-01 05:20:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,902 Commits 2 Branches 0 Tags
fc623d2abf07d35579a6560fea271941b3a67c0b
Commit Graph

2902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deokishisu
fc623d2abf Rename "Hidden" Movement Type to "Buried" 
This commit mirrors the change to pokeemerald that renames `MOVEMENT_TYPE_HIDDEN` to `MOVEMENT_TYPE_BURIED` to avoid confusion between it and `MOVEMENT_TYPE_INVISIBLE`.

As the files and function labels are not synced between the two repos, only the necessary changes were made based on what pokefirered calls its functions. More syncing of labels with pokeemerald will need to be done in the future.
 2021-02-14 14:59:10 -05:00
GriffinR
8c66bde715 Merge pull request #388 from GriffinRichards/constants-localids 
Use more LOCALID constants
 2021-02-14 14:07:32 -05:00
GriffinR
b422fd4a49 Merge pull request #389 from Kurausukun/dexmatching 
[LEAK-INFORMED] match the rest of pokedex_screen
 2021-02-14 11:18:46 -05:00
GriffinR
43033ec97c Merge pull request #390 from GriffinRichards/fix-constwarning 
Fix warning about gMonPaletteTable section
 2021-02-12 19:17:24 -05:00
GriffinR
1b84bd395d Fix warning about gMonPaletteTable section 2021-02-12 17:18:14 -05:00
Kurausukun
ccd75ad32e words are hard 2021-02-11 23:12:55 -05:00
Kurausukun
2ff02b3c5a fix whitespace, update dex category macro 2021-02-11 23:06:33 -05:00
Kurausukun
6c77c7a714 [LEAK-INFORMED] match the rest of pokedex_screen 2021-02-11 21:50:39 -05:00
GriffinR
515dde69af Use more LOCALID constants 2021-02-10 20:20:15 -05:00
GriffinR
a34c9d09b6 Merge pull request #385 from Deokishisu/patch-3 
Fix Trainer Tower Magic Number
 2021-02-09 13:13:52 -05:00
Deokishisu
60b9b0add2 Fix Trainer Tower Magic Number 
A magic number was missed that will lead to edited projects breaking the Trainer Tower if new map layouts are added. This commit fixes it.
 2021-02-09 11:20:52 -05:00
GriffinR
efba18bb0b Merge pull request #384 from Deokishisu/patch-2 
Fix "Compatibility" Misspelling
 2021-02-05 07:18:01 -05:00
Deokishisu
b423d06cd9 Fix "Compatibility" Misspelling 
Someone misspelled "compatibility" as "compatability" in pokeemerald and the error was brought over to pokefirered.
 2021-02-05 01:17:54 -05:00
GriffinR
8a0294f9f1 Merge pull request #383 from Deokishisu/patch-2 
Fix Vermilion Gym Script Label Transposition Typos
 2021-02-03 20:49:41 -05:00
Deokishisu
ee0fb9ea5a Fix TM34 Transposition Typo 
The script labels for being given TM34 from Lt. Surge are mistakenly typoed as TM43. This commit fixes this error.
 2021-02-03 19:54:45 -05:00
GriffinR
80b2c0eee6 Merge pull request #382 from GriffinRichards/relativeconstants 
Use trainer constants in flags, automatically update flags/vars count
 2021-02-01 14:57:18 -05:00
GriffinR
1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR
419c897292 Merge pull request #380 from GriffinRichards/sync-scaninc 
Sync tools with pokeemerald
 2021-01-19 02:17:21 -05:00
GriffinR
a52d6e4379 Fix modern ld_script 2021-01-19 02:06:27 -05:00
GriffinR
9d20f55a58 Move 'source' asm files to src 2021-01-19 01:54:14 -05:00
GriffinR
9350e2d338 Sync mapjson with pokeemerald 2021-01-19 01:38:15 -05:00
GriffinR
393a6bd5b6 Sync gbagfx with pokeemerald 2021-01-19 01:28:49 -05:00
GriffinR
538c1d0efd Sync preproc with pokeemerald 2021-01-19 01:19:32 -05:00
GriffinR
8e8677f1e4 Update Makefile for scaninc 2021-01-19 01:19:19 -05:00
GriffinR
cd67c5e240 Sync scaninc with pokeemerald 2021-01-18 23:39:05 -05:00
GriffinR
ac62e8e563 Merge pull request #377 from Deokishisu/master 
Fix Egregious Magic Numbers in GetBattleBGM
 2021-01-08 08:11:13 -05:00
Deokishisu
90e5a5ff7e Fix Egregious Magic Numbers in GetBattleBGM 
Whoever originally decomped this function must've been really fed up with this file.

Renamed GetMUS_ForBattle to GetBattleBGM to be consistent with pokeemerald.

This entire function was magic numbers, so I replaced them with the appropriate constants.
 2021-01-08 04:09:59 -05:00
GriffinR
135fd3948a Merge pull request #376 from SatoMew/master 
Document the unused battle strings for downpour and rain weather
 2021-01-07 00:35:31 -05:00
SatoMew
e5d0a4f35c Document the unused battle strings for downpour and rain weather 2021-01-01 14:38:25 +00:00
GriffinR
22cd65bd55 Merge pull request #375 from GriffinRichards/deadname 
Remove deadnaming, sync BgEvent
 2020-12-31 14:36:01 -05:00
GriffinR
9509797b98 Remove deadnaming, sync BgEvent 2020-12-31 14:24:30 -05:00
GriffinR
2183626229 Merge pull request #374 from Deokishisu/patch-1 
Fix Missed Magic Numbers in main_menu.c
 2020-12-31 12:40:31 -05:00
Deokishisu
6e77eef0cd Fix Missed Magic Numbers in main_menu.c 
There were two lines where magic numbers were used instead of the constant for MAIN_MENU_WINDOW_ERROR, so I filled them in.
 2020-12-31 11:36:27 -05:00
GriffinR
f8a1bf14fb Merge pull request #371 from GriffinRichards/data-pokedex 
Move pokedex_screen data from asm to C
 2020-11-27 11:12:05 -05:00
GriffinR
7377bc438b Merge pull request #373 from V-FEXrt/farfetchd 
Rename farfetchd graphics to match define
 2020-11-27 10:57:55 -05:00
Ashley Coleman
06b6853fb8 Rename farfetchd graphics to match define 2020-11-26 11:26:05 -08:00
GriffinR
46a9525534 Merge pull request #372 from V-FEXrt/trainer_parties_variables 
Rename unknown trainer party variables
 2020-11-15 20:15:12 -05:00
Ashley Coleman
83fe4e5dd8 Rename unknown trainer party variables 2020-11-12 21:06:49 -08:00
GriffinR
f2e7684b17 Fix modern build 2020-11-12 00:53:57 -05:00
GriffinR
1d820d4e0f Clean up pokedex screen text 2020-11-12 00:06:22 -05:00
GriffinR
66e9059578 Move pokedex_screen data from asm to C 2020-11-11 23:44:30 -05:00
Ashley Coleman
8485cec283 Merge pull request #1 from pret/master 
Sync upstream
 2020-11-11 15:46:56 -08:00
GriffinR
2062659541 Merge pull request #370 from V-FEXrt/pokedex-screen 
Give meaningful names to globals in pokedex_screen.s
 2020-11-11 17:53:11 -05:00
Ashley Coleman
2745ac3445 Give meaningfull names to globals in pokedex_screen.s 2020-11-11 13:40:18 -08:00
GriffinR
8669fe0f95 Merge pull request #368 from Kurausukun/match_m4a 
Match FadeOutBody (ported from pokeemerald)
 2020-11-02 11:48:06 -05:00
Kurausukun
feb10af9f8 Match FadeOutBody (ported from pokeemerald) 2020-11-01 23:35:10 -05:00
GriffinR
7b8c935926 Merge pull request #365 from GriffinRichards/moves-const 
Fix hang when releasing after adding new moves
 2020-10-11 16:26:00 -04:00
GriffinR
0f21fc13ef Fix hang when releasing after adding new moves 2020-10-11 16:10:03 -04:00
GriffinR
f9ce82fd74 Merge pull request #364 from Kurausukun/audio_macros 
Update Audio Macros
 2020-09-28 08:04:10 -04:00
Kurausukun
86445c2131 update audio macros 2020-09-27 22:38:52 -04:00