mirror of
https://github.com/pret/pmd-red.git
synced 2024-11-23 05:00:12 +00:00
decomp for sub_8099328
This commit is contained in:
parent
f437721844
commit
01922e2a21
2377
asm/code_8098BDC.s
2377
asm/code_8098BDC.s
File diff suppressed because it is too large
Load Diff
2353
asm/code_8099360.s
Normal file
2353
asm/code_8099360.s
Normal file
File diff suppressed because it is too large
Load Diff
@ -3,12 +3,5 @@
|
|||||||
|
|
||||||
// code_8098DBC.s
|
// code_8098DBC.s
|
||||||
extern void nullsub_104(void);
|
extern void nullsub_104(void);
|
||||||
extern u8 sub_8099328(u8 *);
|
|
||||||
extern void sub_80993D8(void);
|
|
||||||
extern void sub_80993E4(void);
|
|
||||||
extern void sub_8099690(u32);
|
|
||||||
extern void sub_8099A5C(u32, u32, u32);
|
|
||||||
extern void sub_8099AFC(u32, u32, u32);
|
|
||||||
extern bool8 sub_8099B94(void);
|
|
||||||
|
|
||||||
#endif // GUARD_CODE_8098BDC_H
|
#endif // GUARD_CODE_8098BDC_H
|
||||||
|
7
include/code_8099328.h
Normal file
7
include/code_8099328.h
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#ifndef GUARD_CODE_8099328_H
|
||||||
|
#define GUARD_CODE_8099328_H
|
||||||
|
|
||||||
|
|
||||||
|
bool8 sub_8099328(u8 *);
|
||||||
|
|
||||||
|
#endif // GUARD_CODE_8099328_H
|
12
include/code_8099360.h
Normal file
12
include/code_8099360.h
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#ifndef GUARD_CODE_8099360_H
|
||||||
|
#define GUARD_CODE_8099360_H
|
||||||
|
|
||||||
|
// code_8099360.s
|
||||||
|
extern void sub_80993D8(void);
|
||||||
|
extern void sub_80993E4(void);
|
||||||
|
extern void sub_8099690(u32);
|
||||||
|
extern void sub_8099A5C(u32, u32, u32);
|
||||||
|
extern void sub_8099AFC(u32, u32, u32);
|
||||||
|
extern bool8 sub_8099B94(void);
|
||||||
|
|
||||||
|
#endif //GUARD_CODE_8099360_H
|
@ -341,6 +341,8 @@ SECTIONS {
|
|||||||
asm/code_8098468.o(.text);
|
asm/code_8098468.o(.text);
|
||||||
src/ground_main.o(.text);
|
src/ground_main.o(.text);
|
||||||
asm/code_8098BDC.o(.text);
|
asm/code_8098BDC.o(.text);
|
||||||
|
src/code_8099328.o(.text);
|
||||||
|
asm/code_8099360.o(.text);
|
||||||
src/code_809A560.o(.text);
|
src/code_809A560.o(.text);
|
||||||
asm/code_809A560.o(.text);
|
asm/code_809A560.o(.text);
|
||||||
src/code_809A560_1.o(.text);
|
src/code_809A560_1.o(.text);
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "code_80118A4.h"
|
#include "code_80118A4.h"
|
||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_801AFA4.h"
|
#include "code_801AFA4.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "gulpin_shop.h"
|
#include "gulpin_shop.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "moves.h"
|
#include "moves.h"
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_801B3C0.h"
|
#include "code_801B3C0.h"
|
||||||
#include "code_801B60C.h"
|
#include "code_801B60C.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "constants/colors.h"
|
#include "constants/colors.h"
|
||||||
#include "event_flag.h"
|
#include "event_flag.h"
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#include "code_801B3C0.h"
|
#include "code_801B3C0.h"
|
||||||
#include "code_80227B8.h"
|
#include "code_80227B8.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8098BDC.h"
|
||||||
|
#include "code_8099360.h"
|
||||||
#include "code_80118A4.h"
|
#include "code_80118A4.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "constants/colors.h"
|
#include "constants/colors.h"
|
||||||
|
19
src/code_8099328.c
Normal file
19
src/code_8099328.c
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#include "global.h"
|
||||||
|
#include "code_80A26CC.h"
|
||||||
|
#include "event_flag.h"
|
||||||
|
|
||||||
|
bool8 sub_8099328(u8 *dungeonId) {
|
||||||
|
s16 script_disc;
|
||||||
|
DungeonInfo* dungeonInfo;
|
||||||
|
|
||||||
|
script_disc = GetScriptVarValue(NULL, DUNGEON_ENTER);
|
||||||
|
if (script_disc == 0x51) {
|
||||||
|
script_disc = GetScriptVarValue(NULL, DUNGEON_ENTER_INDEX);
|
||||||
|
dungeonInfo = (DungeonInfo *)GetDungeonInfo_80A2608(script_disc);
|
||||||
|
if(dungeonInfo->dungeonIndex < 0x3f) {
|
||||||
|
*dungeonId = dungeonInfo->dungeonIndex;
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return FALSE;
|
||||||
|
}
|
@ -1,5 +1,5 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "credits1.h"
|
#include "credits1.h"
|
||||||
#include "event_flag.h"
|
#include "event_flag.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
#include "code_8023868.h"
|
#include "code_8023868.h"
|
||||||
#include "code_8024458.h"
|
#include "code_8024458.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8098BDC.h"
|
||||||
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "constants/dungeon.h"
|
#include "constants/dungeon.h"
|
||||||
#include "event_flag.h"
|
#include "event_flag.h"
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include "code_8023868.h"
|
#include "code_8023868.h"
|
||||||
#include "code_8024458.h"
|
#include "code_8024458.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8098BDC.h"
|
||||||
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "constants/dungeon.h"
|
#include "constants/dungeon.h"
|
||||||
#include "event_flag.h"
|
#include "event_flag.h"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_801B3C0.h"
|
#include "code_801B3C0.h"
|
||||||
#include "code_801C8C4.h"
|
#include "code_801C8C4.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "kangaskhan_storage1.h"
|
#include "kangaskhan_storage1.h"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_801B3C0.h"
|
#include "code_801B3C0.h"
|
||||||
#include "code_801C8C4.h"
|
#include "code_801C8C4.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "kangaskhan_storage2.h"
|
#include "kangaskhan_storage2.h"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "code_80118A4.h"
|
#include "code_80118A4.h"
|
||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_801B3C0.h"
|
#include "code_801B3C0.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "felicity_bank.h"
|
#include "felicity_bank.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "code_800D090.h"
|
#include "code_800D090.h"
|
||||||
#include "code_80118A4.h"
|
#include "code_80118A4.h"
|
||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "constants/input.h"
|
#include "constants/input.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "items.h"
|
#include "items.h"
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include "code_801B3C0.h"
|
#include "code_801B3C0.h"
|
||||||
#include "code_8097670.h"
|
#include "code_8097670.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8098BDC.h"
|
||||||
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "constants/bg_music.h"
|
#include "constants/bg_music.h"
|
||||||
#include "constants/colors.h"
|
#include "constants/colors.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "globaldata.h"
|
#include "globaldata.h"
|
||||||
#include "adventure_log_menu.h"
|
#include "adventure_log_menu.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "constants/item.h"
|
#include "constants/item.h"
|
||||||
#include "constants/main_menu.h"
|
#include "constants/main_menu.h"
|
||||||
#include "debug_menu1.h"
|
#include "debug_menu1.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "globaldata.h"
|
#include "globaldata.h"
|
||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "hints_menu1.h"
|
#include "hints_menu1.h"
|
||||||
#include "hints_menu2.h"
|
#include "hints_menu2.h"
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include "code_80227B8.h"
|
#include "code_80227B8.h"
|
||||||
#include "code_8024458.h"
|
#include "code_8024458.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8098BDC.h"
|
||||||
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "constants/dungeon.h"
|
#include "constants/dungeon.h"
|
||||||
#include "event_flag.h"
|
#include "event_flag.h"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_801602C.h"
|
#include "code_801602C.h"
|
||||||
#include "code_8094D28.h"
|
#include "code_8094D28.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "constants/emotions.h"
|
#include "constants/emotions.h"
|
||||||
#include "game_options.h"
|
#include "game_options.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "globaldata.h"
|
#include "globaldata.h"
|
||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "save.h"
|
#include "save.h"
|
||||||
#include "save_write.h"
|
#include "save_write.h"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "code_80118A4.h"
|
#include "code_80118A4.h"
|
||||||
#include "code_80130A8.h"
|
#include "code_80130A8.h"
|
||||||
#include "code_8023144.h"
|
#include "code_8023144.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "event_flag.h"
|
#include "event_flag.h"
|
||||||
#include "felicity_bank.h"
|
#include "felicity_bank.h"
|
||||||
|
@ -5,7 +5,8 @@
|
|||||||
#include "code_803B050.h"
|
#include "code_803B050.h"
|
||||||
#include "code_80958E8.h"
|
#include "code_80958E8.h"
|
||||||
#include "code_80972F4.h"
|
#include "code_80972F4.h"
|
||||||
#include "code_8098BDC.h"
|
#include "code_8099360.h"
|
||||||
|
#include "code_8099328.h"
|
||||||
#include "common_strings.h"
|
#include "common_strings.h"
|
||||||
#include "constants/dungeon.h"
|
#include "constants/dungeon.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user