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

Merge branch 'RHH/master' into RHH/upcoming

Browse Source
This commit is contained in:
Eduardo Quezada 2023-07-06 13:15:06 -04:00
commit 4405f79d24
10 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -28,7 +28,7 @@ LD := $(PREFIX)ld
# note: the makefile must be set up so MODERNCC is never called
# if MODERN=0
MODERNCC := $(PREFIX)gcc
PATH_MODERNCC := PATH=$(TOOLCHAIN)/bin:PATH $(MODERNCC)
PATH_MODERNCC := PATH="$(PATH)" $(MODERNCC)
ifeq ($(OS),Windows_NT)
EXE := .exe

5
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -421,7 +421,12 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
@ GAME_STAT_ENTERED_BATTLE_TOWER should not be incremented here, for two reasons:
@ 1. It is incremented again in BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful or BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
@ 2. If the player tries to save, but fails, the counter will still be incremented even if the player never enters the tower.
.ifndef BUGFIX
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
.endif
specialvar VAR_RESULT, IsWirelessAdapterConnected
goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink
goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink

19
graphics/dodrio_berry_picking/bg.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
230 246 255
82 180 172
82 205 189
156 156 131
106 156 148
123 123 98
189 172 98
189 189 139
74 172 156
172 172 131
74 156 123
115 115 82
139 139 106
164 164 115
197 197 148
230 246 255

19
graphics/dodrio_berry_picking/tree_border.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
230 246 255
246 246 222
230 230 180
139 238 139
246 246 189
197 246 164
246 230 197
230 246 255
230 213 180
205 197 164
148 222 148
222 238 255
139 205 139
213 238 246
222 246 255
213 205 164

2
include/constants/game_stat.h
View File

@ -13,7 +13,7 @@
#define GAME_STAT_TRAINER_BATTLES 9
#define GAME_STAT_ENTERED_HOF 10
#define GAME_STAT_POKEMON_CAPTURES 11
#define GAME_STAT_FISHING_CAPTURES 12
#define GAME_STAT_FISHING_ENCOUNTERS 12
#define GAME_STAT_HATCHED_EGGS 13
#define GAME_STAT_EVOLVED_POKEMON 14
#define GAME_STAT_USED_POKECENTER 15

4
ld_script.txt
View File

@ -15,8 +15,8 @@ SECTIONS {
. = 0x1C000;
INCLUDE "sym_ewram.ld"
src/*.o(.ewram_data);
gflib/*.o(.ewram_data);
src/*.o(ewram_data);
gflib/*.o(ewram_data);
*libc.a:impure.o(.data);
*libc.a:locale.o(.data);

8
src/dodrio_berry_picking.c
View File

@ -552,8 +552,8 @@ static const u8 sUnsharedColumns[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS] =
};
// Duplicate and unused gfx. Feel free to remove.
static const u32 sDuplicateGfx[] = INCBIN_U32("graphics/dodrio_berry_picking/bg.gbapal",
"graphics/dodrio_berry_picking/tree_border.gbapal",
static const u32 sDuplicateGfx[] = INCBIN_U32("graphics/dodrio_berry_picking/tree_border.gbapal",
"graphics/dodrio_berry_picking/bg.gbapal",
"graphics/dodrio_berry_picking/dodrio.gbapal",
"graphics/dodrio_berry_picking/shiny.gbapal",
"graphics/dodrio_berry_picking/status.gbapal",
@ -3586,8 +3586,8 @@ static const u8 sUnsharedColumns_Duplicate[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS] =
{1, 3, 5, 6, 9},
};
static const u16 sBg_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/bg.gbapal",
"graphics/dodrio_berry_picking/tree_border.gbapal");
static const u16 sBg_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/tree_border.gbapal",
"graphics/dodrio_berry_picking/bg.gbapal");
static const u16 sDodrioNormal_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/dodrio.gbapal");
static const u16 sDodrioShiny_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/shiny.gbapal");
static const u16 sStatus_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/status.gbapal");

2
src/mauville_old_man.c
View File

@ -969,7 +969,7 @@ static const struct Story sStorytellerStories[] = {
MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory
},
{
GAME_STAT_FISHING_CAPTURES, 1,
GAME_STAT_FISHING_ENCOUNTERS, 1,
MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle,
MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction,
MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory

4
src/tv.c
View File

@ -485,7 +485,7 @@ static const u8 *const sTVPokemonTodayFailedTextGroup[] = {
gTVPokemonTodayFailedText06
};
static const u8 *const sTVPokemonAnslerTextGroup[] = {
static const u8 *const sTVPokemonAnglerTextGroup[] = {
gTVPokemonAnglerText00,
gTVPokemonAnglerText01
};
@ -5480,7 +5480,7 @@ static void DoTVShowPokemonAngler(void)
TVShowDone();
break;
}
ShowFieldMessage(sTVPokemonAnslerTextGroup[state]);
ShowFieldMessage(sTVPokemonAnglerTextGroup[state]);
}
static void DoTVShowTheWorldOfMasters(void)

2
src/wild_encounter.c
View File

@ -886,7 +886,7 @@ void FishingWildEncounter(u8 rod)
{
species = GenerateFishingWildMon(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod);
}
IncrementGameStat(GAME_STAT_FISHING_CAPTURES);
IncrementGameStat(GAME_STAT_FISHING_ENCOUNTERS);
SetPokemonAnglerSpecies(species);
gIsFishingEncounter = TRUE;
BattleSetup_StartWildBattle();