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

Decomp hall_of_fame

Browse Source
This commit is contained in:
PikalaxALT
2019-11-04 16:20:11 -05:00
parent d002ea4fe8
commit 57b328ad40
19 changed files with 1343 additions and 3667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/hall_of_fame.s
-3442
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_summary_screen.s
+1 -1
View File
@@ -3339,7 +3339,7 @@ sub_81360D4: @ 81360D4
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8043F90
bl SpeciesToPokedexNum
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _08136110 @ =0x0000ffff
asm/post_battle_event_funcs.s
+4 -4
View File
@@ -17,14 +17,14 @@ Special_HallOfFame: @ 80CA2E4
lsrs r1, r0, 24
cmp r1, 0x1
bne _080CA30C
ldr r0, _080CA308 @ =gUnknown_203AB44
ldr r0, _080CA308 @ =gHasHallOfFameRecords
strb r1, [r0]
b _080CA318
.align 2, 0
_080CA304: .4byte 0x0000082c
_080CA308: .4byte gUnknown_203AB44
_080CA308: .4byte gHasHallOfFameRecords
_080CA30C:
ldr r1, _080CA3B0 @ =gUnknown_203AB44
ldr r1, _080CA3B0 @ =gHasHallOfFameRecords
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
@@ -99,7 +99,7 @@ _080CA39E:
pop {r1}
bx r1
.align 2, 0
_080CA3B0: .4byte gUnknown_203AB44
_080CA3B0: .4byte gHasHallOfFameRecords
_080CA3B4: .4byte gSaveBlock2Ptr
_080CA3B8: .4byte gPlayerParty
_080CA3BC: .4byte 0x0000083b
data/hall_of_fame.s
-180
View File
@@ -1,180 +0,0 @@
#include "constants/region_map.h"
#include "constants/flags.h"
#include "constants/moves.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_840C228:: @ 840C228
.4byte 0x000001f8
@ {
@ .bg = 0,
@ .charBaseIndex = 2,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
.4byte 0x000011e1
@ {
@ .bg = 1,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 30,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 1,
@ .baseTile = 0x0000
@ }
.4byte 0x000031d3
@ {
@ .bg = 3,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 29,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0000
@ }
gUnknown_840C234:: @ 840C234
.byte 0, 2, 2, 17, 6, 13
.2byte 0x0001
.align 2
gUnknown_840C23C:: @ 840C23C
.byte 0, 1, 2
.align 2
gUnknown_840C240:: @ 840C240
.byte 0, 2, 3
.byte 0, 4, 5
.align 2
gUnknown_840C248:: @ 840C248
obj_tiles gFile_graphics_misc_confetti_sheet, 0x220, 1001
null_obj_tiles
gUnknown_840C258:: @ 840C258
obj_pal gFile_graphics_misc_confetti_palette, 1001
null_obj_pal
gUnknown_840C268:: @ 840C268
.2byte 0x0078, 0x00d2, 0x0078, 0x0028
.2byte 0x0146, 0x00dc, 0x0038, 0x0028
.2byte 0xffaa, 0x00dc, 0x00b8, 0x0028
.2byte 0x0078, 0xffc2, 0x0078, 0x0058
.2byte 0xffba, 0xffa4, 0x00c8, 0x0058
.2byte 0x0136, 0xffa4, 0x0028, 0x0058
gUnknown_840C298:: @ 840C298
.2byte 0x0078, 0x00ea, 0x0078, 0x0040
.2byte 0x0146, 0x00f4, 0x0038, 0x0040
.2byte 0xffaa, 0x00f4, 0x00b8, 0x0040
gOamData_840C2B0::
.4byte 0x00000000, 0x00000000
gAnimCmd_840C2B8::
obj_image_anim_frame 0x00, 30
obj_image_anim_end
gAnimCmd_840C2C0::
obj_image_anim_frame 0x01, 30
obj_image_anim_end
gAnimCmd_840C2C8::
obj_image_anim_frame 0x02, 30
obj_image_anim_end
gAnimCmd_840C2D0::
obj_image_anim_frame 0x03, 30
obj_image_anim_end
gAnimCmd_840C2D8::
obj_image_anim_frame 0x04, 30
obj_image_anim_end
gAnimCmd_840C2E0::
obj_image_anim_frame 0x05, 30
obj_image_anim_end
gAnimCmd_840C2E8::
obj_image_anim_frame 0x06, 30
obj_image_anim_end
gAnimCmd_840C2F0::
obj_image_anim_frame 0x07, 30
obj_image_anim_end
gAnimCmd_840C2F8::
obj_image_anim_frame 0x08, 30
obj_image_anim_end
gAnimCmd_840C300::
obj_image_anim_frame 0x09, 30
obj_image_anim_end
gAnimCmd_840C308::
obj_image_anim_frame 0x0a, 30
obj_image_anim_end
gAnimCmd_840C310::
obj_image_anim_frame 0x0b, 30
obj_image_anim_end
gAnimCmd_840C318::
obj_image_anim_frame 0x0c, 30
obj_image_anim_end
gAnimCmd_840C320::
obj_image_anim_frame 0x0d, 30
obj_image_anim_end
gAnimCmd_840C328::
obj_image_anim_frame 0x0e, 30
obj_image_anim_end
gAnimCmd_840C330::
obj_image_anim_frame 0x0f, 30
obj_image_anim_end
gAnimCmd_840C338::
obj_image_anim_frame 0x10, 30
obj_image_anim_end
gSpriteAnimTable_840C340::
.4byte gAnimCmd_840C2B8
.4byte gAnimCmd_840C2C0
.4byte gAnimCmd_840C2C8
.4byte gAnimCmd_840C2D0
.4byte gAnimCmd_840C2D8
.4byte gAnimCmd_840C2E0
.4byte gAnimCmd_840C2E8
.4byte gAnimCmd_840C2F0
.4byte gAnimCmd_840C2F8
.4byte gAnimCmd_840C300
.4byte gAnimCmd_840C308
.4byte gAnimCmd_840C310
.4byte gAnimCmd_840C318
.4byte gAnimCmd_840C320
.4byte gAnimCmd_840C328
.4byte gAnimCmd_840C330
.4byte gAnimCmd_840C338
gUnknown_840C384:: @ 840C384
spr_template 1001, 1001, gOamData_840C2B0, gSpriteAnimTable_840C340, NULL, gDummySpriteAffineAnimTable, sub_80F38D8
gUnknown_840C39C:: @ 840C39C
.incbin "graphics/hall_of_fame/unk_840C3BC.gbapal"
gUnknown_840C3BC:: @ 840C3BC
.incbin "graphics/hall_of_fame/unk_840C3BC.4bpp.lz"
gUnknown_840C588::
@ Unreferenced
.2byte 1002, 1002
.space 16
.byte 2, 1, 3
.byte 6, 4, 5
data/strings.s
+9 -9
View File
@@ -122,7 +122,7 @@ gUnknown_8415CD9:: @ 0x8415CD9
gUnknown_8415CE0:: @ 0x8415CE0
.string "ポケモンずかん$"
gUnknown_8415CE8:: @ 8415CE8
gText_MainMenuTime:: @ 8415CE8
.string "TIME$"
gUnknown_8415CED:: @ 0x8415CED
@@ -330,7 +330,7 @@ gUnknown_8416002:: @ 8416002
.string "PAGE$"
.align 2
gUnknown_8416008:: @ 8416008
gText_WelcomeToHOF:: @ 8416008
.string "Welcome to the HALL OF FAME!$"
gUnknown_8416025:: @ 0x8416025
@@ -346,31 +346,31 @@ gUnknown_8416067:: @ 0x8416067
.string "でんげんを きらないでください$"
.align 2
gUnknown_8416090:: @ 8416090
gText_HOFCorrupted:: @ 8416090
.string "The HALL OF FAME data is\n"
.string "corrupted.$"
gUnknown_84160B4:: @ 84160B4
gText_HOFNumber:: @ 84160B4
.string "HALL OF FAME No. {STR_VAR_1}$"
gUnknown_84160C8:: @ 84160C8
gText_LeagueChamp:: @ 84160C8
.string "LEAGUE CHAMPION!\n"
.string "CONGRATULATIONS!$"
.align 2
gUnknown_84160EC:: @ 84160EC
gText_Number:: @ 84160EC
.string "No. $"
.align 2
gUnknown_84160F4:: @ 84160F4
gText_Level:: @ 84160F4
.string "Lv. $"
.align 2
gUnknown_84160FC:: @ 84160FC
gText_Name:: @ 84160FC
.string "NAME$"
.align 2
gUnknown_8416104:: @ 8416104
gText_IDNumber:: @ 8416104
.string "IDNo.$"
gUnknown_841610A:: @ 0x841610A
include/credits.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_CREDITS_H
#define GUARD_CREDITS_H
extern bool8 gHasHallOfFameRecords;
#endif //GUARD_CREDITS_H
include/graphics.h
+3
View File
@@ -4226,4 +4226,7 @@ extern const u16 gTradeMenuMonBox_Tilemap[];
extern const u16 gUnknown_8E9CBBC[];
extern const u16 gUnknown_8E9CB9C[];
extern const u32 gFile_graphics_misc_confetti_sheet[];
extern const u32 gFile_graphics_misc_confetti_palette[];
#endif //GUARD_GRAPHICS_H
include/hall_of_fame.h
+1 -1
View File
@@ -7,7 +7,7 @@ void CB2_DoHallOfFameScreen(void);
void CB2_DoHallOfFameScreenDontSaveData(void);
void CB2_DoHallOfFamePC(void);
void sub_8175280(void);
void sub_80F2978(void);
void CB2_InitHofPC(void);
void HallOfFamePCBeginFade(void);
void ReturnFromHallOfFamePC(void);
include/pokemon.h
+1 -1
View File
@@ -609,7 +609,7 @@ u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm);
u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves);
u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves);
u8 GetNumberOfRelearnableMoves(struct Pokemon *mon);
u16 sub_8043F90(u16 species);
u16 SpeciesToPokedexNum(u16 species);
void ClearBattleMonForms(void);
void PlayBattleBGM(void);
void PlayMapChosenOrBattleBGM(u16 songId);
include/save.h
-11
View File
@@ -62,17 +62,6 @@ enum
CHECK // unused
};
// Do save types
enum
{
NORMAL_SAVE,
LINK_SAVE,
EREADER_SAVE,
HOF_SAVE,
DIFFERENT_FILE_SAVE,
HOF_DELETE_SAVE // unused
};
extern u16 gFirstSaveSector;
extern u32 gPrevSaveCounter;
extern u16 gLastKnownGoodSector;
include/strings.h
+14
View File
@@ -710,4 +710,18 @@ extern const u8 gEasyChatGroupName_TrendySaying[];
extern const u8 gEasyChatGroupName_Pokemon2[];
extern const u8 gText_ThreeQuestionMarks[];
// hall_of_fame
extern const u8 gText_LeagueChamp[];
extern const u8 gText_HOFNumber[];
extern const u8 gText_UPDOWNPick_ABUTTONBBUTTONCancel[];
extern const u8 gText_UPDOWNPick_ABUTTONNext_BBUTTONBack[];
extern const u8 gText_ABUTTONExit[];
extern const u8 gText_HOFCorrupted[];
extern const u8 gText_WelcomeToHOF[];
extern const u8 gText_Number[];
extern const u8 gText_Level[];
extern const u8 gText_IDNumber[];
extern const u8 gText_Name[];
extern const u8 gText_MainMenuTime[];
#endif //GUARD_STRINGS_H
include/trainer_pokemon_sprites.h
+1
View File
@@ -12,6 +12,7 @@ u16 sub_818D8F0(u16 spriteId);
u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
u8 sub_818D97C(u8 a0, u8 a1);
u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 FreeAndDestroyMonPicSprite(u16);
u16 FreeAndDestroyTrainerPicSprite(u16);
u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
ld_script.txt
+2 -2
View File
@@ -213,7 +213,7 @@ SECTIONS {
src/player_pc.o(.text);
src/intro.o(.text);
asm/battle_anim_special.o(.text);
asm/hall_of_fame.o(.text);
src/hall_of_fame.o(.text);
src/credits.o(.text);
src/diploma.o(.text);
asm/save_failed_screen.o(.text);
@@ -484,7 +484,7 @@ SECTIONS {
src/player_pc.o(.rodata);
src/intro.o(.rodata);
data/battle_anim_special.o(.rodata);
data/hall_of_fame.o(.rodata);
src/hall_of_fame.o(.rodata);
src/credits.o(.rodata);
src/diploma.o(.rodata);
data/strings.o(.rodata);
src/credits.c
+1
View File
@@ -188,6 +188,7 @@ struct CreditsTaskData
};
static EWRAM_DATA struct CreditsResources * sCreditsMgr = NULL;
EWRAM_DATA bool8 gHasHallOfFameRecords = FALSE;
static void CB2_Credits(void);
static s32 RollCredits(void);
src/hall_of_fame.c
+1293
View File
File diff suppressed because it is too large Load Diff
src/hof_pc.c
+1 -1
View File
@@ -19,7 +19,7 @@ static void Task_WaitFadeAndSetCallback(u8 taskId)
FreeAllWindowBuffers();
ResetBgsAndClearDma3BusyFlags(0);
DestroyTask(taskId);
SetMainCallback2(sub_80F2978);
SetMainCallback2(CB2_InitHofPC);
}
}
src/pokemon.c
+1 -1
View File
@@ -5625,7 +5625,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon)
}
// SpeciesToPokedexNum?
u16 sub_8043F90(u16 species)
u16 SpeciesToPokedexNum(u16 species)
{
species = SpeciesToNationalPokedexNum(species);
src/save.c
+1 -1
View File
@@ -672,7 +672,7 @@ u8 HandleSavingData(u8 saveType)
for(i = 0; i < 5; i++)
save_write_to_flash(i, gRamSaveSectionLocations);
break;
case EREADER_SAVE:
case SAVE_EREADER:
SaveSerializedGame();
save_write_to_flash(0, gRamSaveSectionLocations);
break;
sym_ewram.txt
+4 -13
View File
@@ -450,22 +450,13 @@ gUnknown_203AAB8: @ 203AAB8
.include "src/intro.o"
.align 2
gUnknown_203AB34: @ 203AB34
.space 0x4
gUnknown_203AB38: @ 203AB38
.space 0x4
gUnknown_203AB3C: @ 203AB3C
.space 0x4
.include "src/hall_of_fame.o"
.align 2
.include "src/credits.o"
gUnknown_203AB44: @ 203AB44
.space 0x4
.align 2
.include "src/diploma.o"
.align 2
gUnknown_203AB4C: @ 203AB4C
.space 0x4