Skip to content

Commit

Permalink
v0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@RevoSucks
RevoSucks committed Oct 3, 2021
1 parent 85fa923 commit 92949b6
Show file tree
Hide file tree
Showing 39 changed files with 972 additions and 54 deletions.
11 changes: 2 additions & 9 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ GAME_CODE := SPDX
MAKER_CODE := 01
REVISION := 0
MODERN ?= 0
DEBUG ?= 0

SHELL := /bin/bash -o pipefail

Expand Down Expand Up @@ -78,7 +77,7 @@ OBJ_DIR := build/modern
LIBPATH := -L "$(dir $(shell $(CC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libc.a))"
endif

CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN) -DDEBUG=$(DEBUG)
CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
ifeq ($(MODERN),0)
CPPFLAGS += -I tools/agbcc/include -I tools/agbcc
endif
Expand Down Expand Up @@ -116,7 +115,7 @@ MAKEFLAGS += --no-print-directory
# Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION:

.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) berry_fix libagbsyscall modern debugging debugging_modern
.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) berry_fix libagbsyscall modern

infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))

Expand Down Expand Up @@ -267,12 +266,6 @@ ifeq ($(DINFO),1)
override CFLAGS += -g
endif

# Debug menu
ifeq ($(DDEBUGGING),1)
override ASFLAGS += --defsym DEBUGGING=1
override CPPFLAGS += -D DEBUGGING=1
endif

$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
Expand Down
31 changes: 31 additions & 0 deletions data/maps/SlateportCity/scripts.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,37 @@ SlateportCity_Pokemart_Speedchoice: @ 81DD1F0
.2byte ITEM_ROSE_INCENSE
.2byte ITEM_LUCK_INCENSE
.2byte ITEM_PURE_INCENSE
.2byte ITEM_UP_GRADE
.2byte ITEM_DUBIOUS_DISC
.2byte ITEM_DRAGON_SCALE
.2byte ITEM_DEEP_SEA_TOOTH
.2byte ITEM_DEEP_SEA_SCALE
.2byte ITEM_METAL_COAT
.2byte ITEM_KINGS_ROCK
.2byte ITEM_ELECTIRIZER
.2byte ITEM_MAGMARIZER
.2byte ITEM_OVAL_STONE
.2byte ITEM_PROTECTOR
.2byte ITEM_RAZOR_CLAW
.2byte ITEM_RAZOR_FANG
.2byte ITEM_REAPER_CLOTH
.2byte ITEM_PRISM_SCALE
.2byte ITEM_SACHET
.2byte ITEM_WHIPPED_DREAM
@ These are not implemented upstream yet.
@.2byte ITEM_CHIPPED_POT
@.2byte ITEM_CRACKED_POT
@.2byte ITEM_GALARICA_CUFF
@.2byte ITEM_GALARICA_WREATH
@.2byte ITEM_SWEET_APPLE
@.2byte ITEM_TART_APPLE
@.2byte ITEM_STRAWBERRY_SWEET
@.2byte ITEM_LOVE_SWEET
@.2byte ITEM_BERRY_SWEET
@.2byte ITEM_CLOVER_SWEET
@.2byte ITEM_FLOWER_SWEET
@.2byte ITEM_STAR_SWEET
@.2byte ITEM_RIBBON_SWEET
.2byte ITEM_NONE
release
end
Expand Down
259 changes: 259 additions & 0 deletions graphics/rhh_copyright/credits.pal
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,259 @@
JASC-PAL
0100
256
198 231 214
255 255 255
222 222 222
222 222 214
198 198 198
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 255 255
247 247 247
231 231 231
222 222 222
222 222 214
214 214 214
198 198 198
181 181 181
165 165 165
148 148 148
132 132 132
115 115 115
99 99 99
82 82 82
66 66 66
49 49 49
33 33 33
16 16 16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
Binary file added graphics/rhh_copyright/powered_by.bin
View file
Binary file not shown.
Binary file added graphics/rhh_copyright/powered_by.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/rhh_copyright/rhh_credits.bin
View file
Binary file not shown.
Binary file added graphics/rhh_copyright/rhh_credits.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/rhh_copyright/sprites/dizzy_egg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/rhh_copyright/sprites/porygon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/rhh_copyright/sprites/shiny.pal
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
199 225 209
248 248 248
197 197 197
139 213 238
89 189 230
7 172 213
7 131 164
7 89 114
246 213 246
238 172 238
255 97 207
197 56 165
123 40 88
0 0 0
0 0 0
0 0 0
Binary file modified graphics/title_screen/rayquaza.bin
View file
Binary file not shown.
Binary file modified graphics/title_screen/rayquaza.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/title_screen/rayquaza_old.bin
View file
Binary file not shown.
Binary file added graphics/title_screen/rayquaza_old.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion include/global.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,8 @@ struct SpeedchoiceSaveOptions
u8 gen7XItems:1;
u8 evoEveryLevel:1;
u8 inverseBattles:1;
u8 shuffleMusic:1;
u8 debugMenus:1;
};

// The struct has to be split in two because neither chunk of block 1 and 2 has enough room left for the full struct.
Expand Down Expand Up @@ -594,9 +596,11 @@ struct SaveBlock2
/*0x57C*/ struct RankingHall2P hallRecords2P[2][3]; // From record mixing.
/*0x624*/ u16 contestLinkResults[CONTEST_CATEGORIES_COUNT][CONTESTANT_COUNT];
/*0x64C*/ struct BattleFrontier frontier;
// SPEEDCHOICE
struct SpeedchoiceSaveOptions speedchoiceConfig;
struct DoneButtonStats2 doneButtonStats;
}; // sizeof=0xF2C
u32 typeTableRngSeed;
};

extern struct SaveBlock2 *gSaveBlock2Ptr;

Expand Down
2 changes: 1 addition & 1 deletion include/main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct Main

/*0x038*/ struct OamData oamBuffer[128];

/*0x438*/ u8 state;
/*0x438*/ u16 state;

/*0x439*/ u8 oamLoadDisabled:1;
/*0x439*/ u8 inBattle:1;
Expand Down
11 changes: 11 additions & 0 deletions include/rhh_copyright.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#ifndef GUARD_RHH_COPYRIGHT_H
#define GUARD_RHH_COPYRIGHT_H

void RhhIntro_InitCopyrightBgs();
void RhhIntro_LoadCopyrightBgGraphics();
void RhhIntro_ShowRhhCredits();
void RhhIntro_LoadCopyrightSpriteGraphics();
void RhhIntro_CreateCopyRightSprites();
void RhhIntro_DestroyRhhCreditSprites();

#endif /* GUARD_RHH_COPYRIGHT_H */
Loading

0 comments on commit 92949b6

Please sign in to comment.