Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-11-26 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync makefile echo lines from Emerald; RegionMapState.choseFlyLocation

Browse Source
This commit is contained in:
PikalaxALT 2021-06-28 10:42:28 -04:00
parent 88d840c711
commit a1ad14f4af
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -242,7 +242,8 @@ $(ROM): %.gba: %.elf
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
%.elf: $(LD_SCRIPT) $(ALL_OBJECTS)
cd $(BUILD_DIR) && $(LD) -T $(LD_SCRIPT:$(BUILD_DIR)/%=%) -Map ../../$(MAP) -o ../../$@ $(OBJS_REL) $(LDFLAGS)
@echo "cd $(BUILD_DIR) && $(LD) -T $(LD_SCRIPT:$(BUILD_DIR)/%=%) -Map ../../$(MAP) -o ../../$@ <objects> <lib>"
@cd $(BUILD_DIR) && $(LD) -T $(LD_SCRIPT:$(BUILD_DIR)/%=%) -Map ../../$(MAP) -o ../../$@ $(OBJS_REL) $(LDFLAGS)
$(GBAFIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent
$(LD_SCRIPT): $(LD_SCRIPT:$(BUILD_DIR)/%.ld=%.txt) $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld $(BUILD_DIR)/sym_bss.ld
@ -251,17 +252,20 @@ $(BUILD_DIR)/sym_%.ld: sym_%.txt
$(CPP) -P $(CPPFLAGS) $< | sed -e "s#tools/#../../tools/#g" > $@
$(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP)
$(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i
$(PREPROC) $(BUILD_DIR)/$*.i charmap.txt | $(CC1) $(CC1FLAGS) -o $(BUILD_DIR)/$*.s
@echo "$(CC1) <flags> -o $@ $<"
@$(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i
@$(PREPROC) $(BUILD_DIR)/$*.i charmap.txt | $(CC1) $(CC1FLAGS) -o $(BUILD_DIR)/$*.s
@printf ".text\n\t.align\t2, 0\n" >> $(BUILD_DIR)/$*.s
@$(AS) $(ASFLAGS) -W -o $@ $(BUILD_DIR)/$*.s
# Only .s files in data need preproc
$(BUILD_DIR)/data/%.o: data/%.s $$(ASM_DEP)
$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
@echo "$(AS) <flags> -o $@ $<"
@$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
$(BUILD_DIR)/%.o: %.s $$(ASM_DEP)
$(AS) $(ASFLAGS) $< -o $@
@echo "$(AS) <flags> -o $@ $<"
@$(AS) $(ASFLAGS) $< -o $@
# "friendly" target names for convenience sake
ruby: ; @$(MAKE) GAME_VERSION=RUBY

1
include/ewram.h
View File

@ -29,7 +29,6 @@ extern u8 gSharedMem[];
#define eSaveSection (struct SaveSector *)(gSharedMem + 0x0)
#define eSlotMachine ((struct SlotMachineEwramStruct *)(gSharedMem + 0x0))
#define ePokemonStorageSystem (*(struct PokemonStorageSystemData *)(gSharedMem + 0))
#define ewramA6E (gSharedMem[0xA6E])
#define ewram01000 (*(struct Unk2001000 *)(gSharedMem + 0x1000))
#define ewramBerryPicTemp (gSharedMem + 0x1000)
#define EWRAM_1000 (*(struct Struct2001000 *)(gSharedMem + 0x1000))

3
include/region_map.h
View File

@ -68,7 +68,8 @@ struct RegionMapState
u16 mapSectionId;
struct RegionMap regionMap;
u16 unk_888[0xE0];
u8 blankMapName[12];
u8 blankMapName[0x26];
bool8 choseFlyLocation;
};
extern struct RegionMapState *const gRegionMapState;

6
src/region_map.c
View File

@ -1589,13 +1589,13 @@ static void sub_80FC600(void)
if (gRegionMapState->regionMap.unk16 == 2 || gRegionMapState->regionMap.unk16 == 4)
{
m4aSongNumStart(SE_SELECT);
ewramA6E = 1;
gRegionMapState->choseFlyLocation = 1;
sub_80FC244(sub_80FC69C);
}
break;
case INPUT_EVENT_B_BUTTON:
m4aSongNumStart(SE_SELECT);
ewramA6E = 0;
gRegionMapState->choseFlyLocation = 0;
sub_80FC244(sub_80FC69C);
break;
}
@ -1614,7 +1614,7 @@ void sub_80FC69C(void)
if (UpdatePaletteFade() != 0)
break;
FreeRegionMapIconResources();
if (ewramA6E != 0)
if (gRegionMapState->choseFlyLocation != 0)
{
switch (gRegionMapState->regionMap.mapSectionId)
{