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

Merge pull request #196 from DizzyEggg/decompile_ray_scene

Browse Source 
Decompile rayquaza scene
This commit is contained in:
Diegoisawesome 2018-02-07 12:59:13 -06:00 committed by GitHub
commit 1ae5adbb19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1891 additions and 6050 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/field_specials.s
View File

@ -7156,14 +7156,14 @@ sub_813B7D8: @ 813B7D8
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
movs r0, 0
movs r1, 0x1
bl sub_81D6720
bl DoRayquazaScene
b _0813B802
.pool
_0813B7F8:
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
movs r0, 0x1
movs r1, 0
bl sub_81D6720
bl DoRayquazaScene
_0813B802:
pop {r0}
bx r0

5972
asm/rayquaza_scene.s
View File

File diff suppressed because it is too large Load Diff

28
include/graphics.h
View File

@ -2679,10 +2679,38 @@ extern const u8 gRaySceneGroudonTail_Gfx[];
extern const u8 gRaySceneKyogreRight_Gfx[];
extern const u8 gRaySceneRayquazaHover_Gfx[];
extern const u8 gRaySceneRayquazaFlyIn_Gfx[];
extern const u8 gRaySceneOvercast_Gfx[];
extern const u8 gRaySceneOvercast_Tilemap[];
extern const u8 gRaySceneRayquaza_Gfx[];
extern const u8 gRaySceneRayquaza_Tilemap[];
extern const u8 gRaySceneSplash_Gfx[];
extern const u8 gRaySceneGroudonLeft_Pal[];
extern const u8 gRaySceneKyogreRight_Pal[];
extern const u8 gRaySceneRayquazaHover_Pal[];
extern const u8 gRaySceneSplash_Pal[];
extern const u8 gRaySceneClouds_Gfx[];
extern const u8 gRaySceneClouds_Pal[];
extern const u8 gRaySceneClouds2_Tilemap[];
extern const u8 gRaySceneClouds1_Tilemap[];
extern const u8 gRaySceneClouds3_Tilemap[];
extern const u8 gRaySceneRayquazaLight_Gfx[];
extern const u8 gRaySceneRayquazaLight_Tilemap[];
extern const u8 gRaySceneOvercast2_Gfx[];
extern const u8 gRaySceneOvercast2_Tilemap[];
extern const u8 gRaySceneOvercast2_Pal[];
extern const u8 gRaySceneRayquazaChase_Gfx[];
extern const u8 gRaySceneChaseStreaks_Gfx[];
extern const u8 gRaySceneChaseBg_Gfx[];
extern const u8 gRayChaseRayquazaChase2_Tilemap[];
extern const u8 gRayChaseRayquazaChase_Tilemap[];
extern const u8 gRaySceneChaseStreaks_Tilemap[];
extern const u8 gRaySceneChaseBg_Tilemap[];
extern const u8 gRaySceneChase_Pal[];
extern const u8 gRaySceneHushRing_Tilemap[];
extern const u8 gRaySceneHushBg_Tilemap[];
extern const u8 gRaySceneHushRing_Map[];
extern const u8 gRaySceneHushBg_Pal[];
extern const u8 gRaySceneHushBg_Gfx[];
extern const u8 gRaySceneHushRing_Gfx[];
#endif //GUARD_GRAPHICS_H

1
include/palette.h
View File

@ -67,5 +67,6 @@ void BeginFastPaletteFade(u8);
void BeginHardwarePaletteFade(u8, u8, u8, u8, u8);
void BlendPalettes(u32, u8, u16);
void BlendPalettesUnfaded(u32, u8, u16);
void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7);
#endif // GUARD_PALETTE_H

17
include/rayquaza_scene.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef GUARD_RAYQUAZA_SCENE_H
#define GUARD_RAYQUAZA_SCENE_H
void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void));
enum
{
RAY_ANIM_DUO_FIGHT_PRE,
RAY_ANIM_DUO_FIGHT,
RAY_ANIM_TAKES_FLIGHT,
RAY_ANIM_DESCENDS,
RAY_ANIM_CHARGES,
RAY_ANIM_CHACES_AWAY,
RAY_ANIM_END
};
#endif // GUARD_RAYQUAZA_SCENE_H

4
include/scanline_effect.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_SCANLINE_EFFECT_H
#define GUARD_SCANLINE_EFFECT_H
// DMA control value to ransfer a single 16-bit value at HBlank
// DMA control value to transfer a single 16-bit value at HBlank
#define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1)
#define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS)
@ -36,7 +36,7 @@ struct ScanlineEffect
extern struct ScanlineEffect gScanlineEffect;
extern u16 gScanlineEffectRegBuffers[][0x3C0];
extern u16 gScanlineEffectRegBuffers[2][0x3C0];
void ScanlineEffect_Stop(void);
void ScanlineEffect_Clear(void);

1
ld_script.txt
View File

@ -269,7 +269,6 @@ SECTIONS {
asm/pokemon_summary_screen.o(.text);
asm/pokenav.o(.text);
src/rayquaza_scene.o(.text);
asm/rayquaza_scene.o(.text);
src/walda_phrase.o(.text);
asm/contest_link_81D9DE4.o(.text);
asm/trainer_rematch.o(.text);

1912
src/rayquaza_scene.c
View File

File diff suppressed because it is too large Load Diff

2
sym_ewram.txt
View File

@ -1505,4 +1505,4 @@ gUnknown_0203CF58: @ 203CF58
gUnknown_0203CF5C: @ 203CF5C
.space 0x4
gUnknown_0203CF60: @ 203CF60
.include "src/rayquaza_scene.o"