mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 19:24:16 +01:00
ray scene is decompiled
This commit is contained in:
parent
68146af07c
commit
b697497835
@ -7156,14 +7156,14 @@ sub_813B7D8: @ 813B7D8
|
|||||||
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
|
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
movs r1, 0x1
|
movs r1, 0x1
|
||||||
bl sub_81D6720
|
bl DoRayquazaScene
|
||||||
b _0813B802
|
b _0813B802
|
||||||
.pool
|
.pool
|
||||||
_0813B7F8:
|
_0813B7F8:
|
||||||
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
|
ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
movs r1, 0
|
movs r1, 0
|
||||||
bl sub_81D6720
|
bl DoRayquazaScene
|
||||||
_0813B802:
|
_0813B802:
|
||||||
pop {r0}
|
pop {r0}
|
||||||
bx r0
|
bx r0
|
||||||
|
1629
asm/rayquaza_scene.s
1629
asm/rayquaza_scene.s
File diff suppressed because it is too large
Load Diff
@ -2700,5 +2700,11 @@ extern const u8 gRayChaseRayquazaChase_Tilemap[];
|
|||||||
extern const u8 gRaySceneChaseStreaks_Tilemap[];
|
extern const u8 gRaySceneChaseStreaks_Tilemap[];
|
||||||
extern const u8 gRaySceneChaseBg_Tilemap[];
|
extern const u8 gRaySceneChaseBg_Tilemap[];
|
||||||
extern const u8 gRaySceneChase_Pal[];
|
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
|
#endif //GUARD_GRAPHICS_H
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef GUARD_RAYQUAZA_SCENE_H
|
#ifndef GUARD_RAYQUAZA_SCENE_H
|
||||||
#define GUARD_RAYQUAZA_SCENE_H
|
#define GUARD_RAYQUAZA_SCENE_H
|
||||||
|
|
||||||
|
void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void));
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
RAY_ANIM_DUO_FIGHT_PRE,
|
RAY_ANIM_DUO_FIGHT_PRE,
|
||||||
|
@ -269,7 +269,6 @@ SECTIONS {
|
|||||||
asm/pokemon_summary_screen.o(.text);
|
asm/pokemon_summary_screen.o(.text);
|
||||||
asm/pokenav.o(.text);
|
asm/pokenav.o(.text);
|
||||||
src/rayquaza_scene.o(.text);
|
src/rayquaza_scene.o(.text);
|
||||||
asm/rayquaza_scene.o(.text);
|
|
||||||
src/walda_phrase.o(.text);
|
src/walda_phrase.o(.text);
|
||||||
asm/contest_link_81D9DE4.o(.text);
|
asm/contest_link_81D9DE4.o(.text);
|
||||||
asm/trainer_rematch.o(.text);
|
asm/trainer_rematch.o(.text);
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1527,4 +1527,4 @@ gUnknown_0203CF58: @ 203CF58
|
|||||||
gUnknown_0203CF5C: @ 203CF5C
|
gUnknown_0203CF5C: @ 203CF5C
|
||||||
.space 0x4
|
.space 0x4
|
||||||
|
|
||||||
sRayScene: @ 203CF60
|
.include "src/rayquaza_scene.o"
|
||||||
|
Loading…
Reference in New Issue
Block a user