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

Documentation and cleanup

Browse Source
This commit is contained in:
PikalaxALT
2019-09-25 11:09:28 -04:00
parent 932d153f5e
commit d66767ed9a
20 changed files with 714 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_weather.s
+3 -3
View File
@@ -1737,8 +1737,8 @@ _0807A93C: .4byte 0x000006ca
_0807A940: .4byte 0x000006cb
thumb_func_end fade_screen
thumb_func_start sub_807A944
sub_807A944: @ 807A944
thumb_func_start FieldWeather_StartFadingOutCreditsMap
FieldWeather_StartFadingOutCreditsMap: @ 807A944
push {r4-r6,lr}
sub sp, 0x4
adds r6, r2, 0
@@ -1887,7 +1887,7 @@ _0807AA60: .4byte gUnknown_2037F34
_0807AA64: .4byte 0x000006c6
_0807AA68: .4byte 0x000006ca
_0807AA6C: .4byte 0x000006cb
thumb_func_end sub_807A944
thumb_func_end FieldWeather_StartFadingOutCreditsMap
thumb_func_start sub_807AA70
sub_807AA70: @ 807AA70
asm/hall_of_fame.s
+5 -5
View File
@@ -138,7 +138,7 @@ _080F1EC4:
bne _080F1EF0
ldr r0, _080F1EEC @ =sub_80F1DC0
bl SetMainCallback2
movs r0, 0x8F
movs r0, 0x8F @ BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME >> 1
lsls r0, 1
bl PlayBGM
movs r0, 0
@@ -1448,15 +1448,15 @@ sub_80F2934: @ 80F2934
movs r0, 0x80
lsls r0, 7
bl FlagSet
ldr r1, _080F2974 @ =gUnknown_2031DD8
ldr r1, _080F2974 @ =gDisableMapMusicChangeOnMapLoad
movs r0, 0x2
strb r0, [r1]
movs r2, 0x1
negs r2, r2
movs r0, 0x6
str r0, [sp]
movs r0, 0x3
movs r1, 0x9
movs r0, 0x3 @ MAP_GROUP(INDIGO_PLATEAU_EXTERIOR)
movs r1, 0x9 @ MAP_NUM(INDIGO_PLATEAU_EXTERIOR)
movs r3, 0xB
bl Overworld_SetWarpDestination
bl DoWarp
@@ -1466,7 +1466,7 @@ sub_80F2934: @ 80F2934
bx r0
.align 2, 0
_080F2970: .4byte 0x00004085
_080F2974: .4byte gUnknown_2031DD8
_080F2974: .4byte gDisableMapMusicChangeOnMapLoad
thumb_func_end sub_80F2934
thumb_func_start sub_80F2978
asm/overworld.s
+13 -13
View File
@@ -2382,14 +2382,14 @@ sub_8055DB8: @ 8055DB8
Overworld_PlaySpecialMapMusic: @ 8055DC4
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _08055DD8 @ =gUnknown_2031DD8
ldr r0, _08055DD8 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08055DDC
bl StopMapMusic
b _08055E6C
.align 2, 0
_08055DD8: .4byte gUnknown_2031DD8
_08055DD8: .4byte gDisableMapMusicChangeOnMapLoad
_08055DDC:
cmp r0, 0x2
beq _08055E6C
@@ -2488,14 +2488,14 @@ _08055E90: .4byte gSaveBlock1Ptr
thumb_func_start sub_8055E94
sub_8055E94: @ 8055E94
push {r4-r6,lr}
ldr r0, _08055EA4 @ =gUnknown_2031DD8
ldr r0, _08055EA4 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08055EA8
bl StopMapMusic
b _08055F14
.align 2, 0
_08055EA4: .4byte gUnknown_2031DD8
_08055EA4: .4byte gDisableMapMusicChangeOnMapLoad
_08055EA8:
cmp r0, 0x2
beq _08055F14
@@ -2701,7 +2701,7 @@ _08056014:
adds r0, 0x32
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08056050 @ =gUnknown_2031DD8
ldr r0, _08056050 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08056054
@@ -2709,7 +2709,7 @@ _08056014:
b _0805606A
.align 2, 0
_0805604C: .4byte gUnknown_2031DDC
_08056050: .4byte gUnknown_2031DD8
_08056050: .4byte gDisableMapMusicChangeOnMapLoad
_08056054:
cmp r0, 0x2
beq _0805606A
@@ -5158,8 +5158,8 @@ _0805749A:
_080574A0: .4byte sub_8056534
thumb_func_end sub_8057430
thumb_func_start sub_80574A4
sub_80574A4: @ 80574A4
thumb_func_start Overworld_CreditsMainCB
Overworld_CreditsMainCB: @ 80574A4
push {r4,lr}
ldr r0, _080574E8 @ =gPaletteFade
ldrb r0, [r0, 0x7]
@@ -5187,7 +5187,7 @@ _080574E0:
bx r0
.align 2, 0
_080574E8: .4byte gPaletteFade
thumb_func_end sub_80574A4
thumb_func_end Overworld_CreditsMainCB
thumb_func_start sub_80574EC
sub_80574EC: @ 80574EC
@@ -5209,8 +5209,8 @@ _08057506:
bx r1
thumb_func_end sub_80574EC
thumb_func_start sub_805750C
sub_805750C: @ 805750C
thumb_func_start Overworld_DoScrollSceneForCredits
Overworld_DoScrollSceneForCredits: @ 805750C
push {lr}
ldr r3, _08057520 @ =gUnknown_2031DE4
str r1, [r3]
@@ -5223,7 +5223,7 @@ sub_805750C: @ 805750C
.align 2, 0
_08057520: .4byte gUnknown_2031DE4
_08057524: .4byte gUnknown_2036E28
thumb_func_end sub_805750C
thumb_func_end Overworld_DoScrollSceneForCredits
thumb_func_start sub_8057528
sub_8057528: @ 8057528
@@ -5451,7 +5451,7 @@ _08057712:
ldr r2, _08057738 @ =0x3fffffff
movs r0, 0
movs r1, 0
bl sub_807A944
bl FieldWeather_StartFadingOutCreditsMap
_0805772A:
ldrb r0, [r4]
adds r0, 0x1
asm/pokedex_screen.s
+1 -1
View File
@@ -4491,7 +4491,7 @@ sub_81049FC: @ 81049FC
adds r0, r5, 0
movs r1, 0x8
movs r3, 0x1
bl sub_810C228
bl LoadMonPicForCredits
add sp, 0x8
pop {r4-r6}
pop {r0}
asm/post_battle_event_funcs.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80CA2E4
sub_80CA2E4: @ 80CA2E4
thumb_func_start Special_HallOfFame
Special_HallOfFame: @ 80CA2E4
push {r4-r7,lr}
sub sp, 0x4
bl sp000_heal_pokemon
@@ -104,7 +104,7 @@ _080CA3B4: .4byte gSaveBlock2Ptr
_080CA3B8: .4byte gPlayerParty
_080CA3BC: .4byte 0x0000083b
_080CA3C0: .4byte CB2_DoHallOfFameScreen
thumb_func_end sub_80CA2E4
thumb_func_end Special_HallOfFame
thumb_func_start sub_80CA3C4
sub_80CA3C4: @ 80CA3C4
data/graphics.s
+6 -6
View File
@@ -16343,16 +16343,16 @@ gUnknown_8EAAA10:: @ 8EAAA10
gUnknown_8EAAA6C:: @ 8EAAA6C
.incbin "baserom.gba", 0xEAAA6C, 0xAC
gUnknown_8EAAB18:: @ 8EAAB18
gCreditsMonBackdropPals:: @ 8EAAB18
.incbin "graphics/credits/charizard.gbapal"
.incbin "graphics/credits/venusaur.gbapal"
.incbin "graphics/credits/blastoise.gbapal"
.incbin "graphics/credits/pikachu.gbapal"
gUnknown_8EAAB98:: @ 8EAAB98
gCreditsPokeballBgGfxTiles:: @ 8EAAB98
.incbin "graphics/credits/unk_8EAAB98.4bpp.lz"
gUnknown_8EAB30C:: @ 8EAB30C
gCreditsPokeballBgGfxMap:: @ 8EAB30C
.incbin "graphics/credits/unk_8EAB30C.bin.lz"
@ title_screen
@@ -16389,13 +16389,13 @@ gGraphics_TitleScreen_FirePals:: @ 8EAE488
gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8
.incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz"
gUnknown_8EAE528:: @ 8EAE528
gCreditsAllRightsReservedGfxPal:: @ 8EAE528
.incbin "graphics/credits/unk_8EAE548.gbapal"
gUnknown_8EAE548:: @ 8EAE548
gCreditsAllRightsReservedGfxTiles:: @ 8EAE548
.incbin "graphics/credits/unk_8EAE548.4bpp.lz"
gUnknown_8EAE900:: @ 8EAE900
gCreditsAllRightsReservedGfxMap:: @ 8EAE900
.incbin "graphics/credits/unk_8EAE548.bin.lz"
gUnknown_8EAEA00:: @ 8EAEA00
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ EventScript_162D70:: @ 8162D70
call EventScript_1A651A
setrespawn SPAWN_PALLET_TOWN
fadescreenspeed 1, 24
special sub_80CA2E4
special Special_HallOfFame
waitstate
releaseall
end
data/specials.inc
+1 -1
View File
@@ -281,7 +281,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_61
def_special DoSoftReset
def_special sub_80CA2E4
def_special Special_HallOfFame
def_special sub_80CB498
def_special nullsub_75
def_special SpawnScriptFieldObject
data/strings.s
+2 -2
View File
@@ -3320,11 +3320,11 @@ gUnknown_841D18D:: @ 841D18D
.string "ROOFTOP$"
.align 2
gUnknown_841D198:: @ 841D198
gString_PokemonFireRed_Staff:: @ 841D198
.string "Pokémon FireRed Version\nStaff$"
.align 2
gUnknown_841D1B8:: @ 0x841D1B6
gString_PokemonLeafGreen_Staff:: @ 0x841D1B6
.string "Pokémon LeafGreen Version\nStaff$"
.align 2
include/credits.h
-6
View File
@@ -1,6 +0,0 @@
#ifndef GUARD_CREDITS_H
#define GUARD_CREDITS_H
#endif //GUARD_CREDITS_H
include/field_weather.h
+1 -1
View File
@@ -16,6 +16,6 @@ void PlayRainStoppingSoundEffect(void);
bool8 sub_807AA70(void);
void SetWeatherScreenFadeOut(void);
void sub_807B070(void);
void sub_807A944(u8, u8, u32);
void FieldWeather_StartFadingOutCreditsMap(u8, u8, u32);
#endif // GUARD_WEATHER_H
include/graphics.h
+6 -6
View File
@@ -975,11 +975,11 @@ extern const u16 gGraphics_TitleScreen_FirePals[];
extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
// credits
extern const u32 gUnknown_8EAAB98[];
extern const u32 gUnknown_8EAB30C[];
extern const u16 gUnknown_8EAAB18[][16];
extern const u16 gUnknown_8EAE528[];
extern const u8 gUnknown_8EAE548[];
extern const u8 gUnknown_8EAE900[];
extern const u32 gCreditsPokeballBgGfxTiles[];
extern const u32 gCreditsPokeballBgGfxMap[];
extern const u16 gCreditsMonBackdropPals[][16];
extern const u16 gCreditsAllRightsReservedGfxPal[];
extern const u8 gCreditsAllRightsReservedGfxTiles[];
extern const u8 gCreditsAllRightsReservedGfxMap[];
#endif //GUARD_GRAPHICS_H
include/overworld.h
+11 -6
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_ROM4_H
#define GUARD_ROM4_H
#ifndef GUARD_OVERWORLD_H
#define GUARD_OVERWORLD_H
#include "global.h"
#include "main.h"
@@ -30,6 +30,11 @@ struct CreditsOverworldCmd
u16 unk_4;
};
/* gDisableMapMusicChangeOnMapLoad */
#define MUSIC_DISABLE_OFF 0
#define MUSIC_DISABLE_STOP 1
#define MUSIC_DISABLE_KEEP 2
extern struct UCoords32 gDirectionToVectors[];
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
@@ -104,7 +109,7 @@ void ResetInitialPlayerAvatarState(void);
void sub_8055D40(u16 mapDataId);
void CleanupOverworldWindowsAndTilemaps(void);
extern u8 gUnknown_2031DD8;
extern u8 gDisableMapMusicChangeOnMapLoad;
extern u8 gUnknown_2036E28;
extern void (*gFieldCallback)(void);
@@ -126,7 +131,7 @@ bool32 sub_8055C9C(void);
void Overworld_ResetStateAfterDigEscRope(void);
bool32 sub_8058244(void);
void sub_80574A4(void);
bool32 sub_805750C(u8 *, const struct CreditsOverworldCmd *, u8);
void Overworld_CreditsMainCB(void);
bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
#endif //GUARD_ROM4_H
#endif //GUARD_OVERWORLD_H
include/strings.h
+2 -2
View File
@@ -210,8 +210,8 @@ extern const u8 gString_SlotMachineControls[];
// credits
extern const u8 gUnknown_84161CD[];
extern const u8 gUnknown_841D198[]; // FR
extern const u8 gUnknown_841D1B8[]; // LG
extern const u8 gString_PokemonFireRed_Staff[]; // FR
extern const u8 gString_PokemonLeafGreen_Staff[]; // LG
extern const u8 gUnknown_841D1D8[];
extern const u8 gUnknown_841D1E8[];
extern const u8 gUnknown_841D200[];
include/trainer_pokemon_sprites.h
+1 -1
View File
@@ -14,6 +14,6 @@ u8 sub_818D97C(u8 a0, u8 a1);
u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 FreeAndDestroyTrainerPicSprite(u16);
u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
u16 sub_810C228(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
#endif // GUARD_TRAINER_POKEMON_SPRITES_H
src/credits.c
+651 -608
View File
File diff suppressed because it is too large Load Diff
src/quest_log.c
+2 -2
View File
@@ -871,7 +871,7 @@ void sub_8110F90(u8 unused)
gSaveBlock1Ptr->location.mapNum = 19;
gSaveBlock1Ptr->location.warpId = -1;
gUnknown_203ADF8 = 0;
gUnknown_2031DD8 = 1;
gDisableMapMusicChangeOnMapLoad = 1;
sub_8082740(1);
sub_8111368();
}
@@ -1567,7 +1567,7 @@ void sub_81120AC(u8 taskId)
switch (data[0])
{
case 0:
gUnknown_2031DD8 = 0;
gDisableMapMusicChangeOnMapLoad = 0;
Overworld_PlaySpecialMapMusic();
sub_811229C();
FillWindowPixelRect(gUnknown_203ADFE[0], 0xF, 0, 0, gUnknown_845661C[0].width * 8, gUnknown_845661C[0].height * 8);
src/sound.c
+2 -2
View File
@@ -15,7 +15,7 @@ struct Fanfare
};
// TODO: what are these
extern u8 gUnknown_2031DD8;
extern u8 gDisableMapMusicChangeOnMapLoad;
extern u8 gUnknown_203ADFA;
extern u8 gUnknown_203F174;
@@ -571,7 +571,7 @@ void PlayBGM(u16 songNum)
void PlaySE(u16 songNum)
{
if(gUnknown_2031DD8 == 0 && gUnknown_203ADFA != 2)
if(gDisableMapMusicChangeOnMapLoad == 0 && gUnknown_203ADFA != 2)
m4aSongNumStart(songNum);
}
src/trainer_pokemon_sprites.c
+1 -1
View File
@@ -278,7 +278,7 @@ u16 FreeAndDestroyMonPicSprite(u16 spriteId)
return FreeAndDestroyPicSpriteInternal(spriteId);
}
u16 sub_810C228(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
{
return sub_810C0C0(species, otId, personality, isFrontPic, 0, 0, paletteSlot, windowId, FALSE);
}
sym_ewram.txt
+2 -3
View File
@@ -529,7 +529,7 @@ gUnknown_2031DCC: @ 2031DCC
gUnknown_2031DD4: @ 2031DD4
.space 0x4
gUnknown_2031DD8: @ 2031DD8
gDisableMapMusicChangeOnMapLoad: @ 2031DD8
.space 0x2
gUnknown_2031DDA: @ 2031DDA
@@ -1099,8 +1099,7 @@ gUnknown_203AB38: @ 203AB38
gUnknown_203AB3C: @ 203AB3C
.space 0x4
gUnknown_203AB40: @ 203AB40
.space 0x4
.include "src/credits.o"
gUnknown_203AB44: @ 203AB44
.space 0x4