ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 09:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #557 from Phlosioneer/navgear-decompile

Browse Source 
Navgear decompile
This commit is contained in:
Diegoisawesome 2019-02-18 00:34:01 -06:00 committed by GitHub
commit 047d8288cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 1291 additions and 1811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1680
asm/pokenav.s
View File

File diff suppressed because it is too large Load Diff

2
asm/rom_8011DC0.s
View File

@ -27181,7 +27181,7 @@ sub_8024700: @ 8024700
adds r0, r5, 0
bl sub_8024668
adds r1, r0, r4
ldr r2, =0x0001869f
ldr r2, =0x0001869f @ Note to decompiler: See UNKNOWN_OFFSET
cmp r1, r2
bhi _08024730
adds r0, r5, 0

156
data/pokenav.s
View File

@ -3,162 +3,6 @@
.section .rodata
gUnknown_0861F3EC:: @ 861F3EC
.4byte sub_81C9298
.4byte sub_81C941C
.4byte sub_81C9924
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9298
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9338
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9368
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C92CC
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9304
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81CC4D4
.4byte sub_81CC554
.4byte sub_81CC5F4
.4byte sub_81CC62C
.4byte sub_81CC65C
.4byte sub_81CC524
.4byte sub_81CC670
.4byte sub_81CCFD8
.4byte sub_81CD070
.4byte sub_81CDDD4
.4byte sub_81CDE2C
.4byte sub_81CDE64
.4byte sub_81CD1C0
.4byte sub_81CECA0
.4byte sub_81CEF3C
.4byte sub_81CEFDC
.4byte sub_81CF330
.4byte sub_81CF3A0
.4byte sub_81CF3D0
.4byte sub_81CEFF0
.4byte sub_81CF3F8
.4byte sub_81CD024
.4byte sub_81CD070
.4byte sub_81CDDD4
.4byte sub_81CDE2C
.4byte sub_81CDE64
.4byte sub_81CD1C0
.4byte sub_81CECA0
.4byte sub_81CEF98
.4byte sub_81CEFDC
.4byte sub_81CF368
.4byte sub_81CF3A0
.4byte sub_81CF3D0
.4byte sub_81CEFF0
.4byte sub_81CF3F8
.4byte sub_81CAAE8
.4byte sub_81CAB24
.4byte sub_81CB260
.4byte sub_81CB29C
.4byte sub_81CB2CC
.4byte sub_81CAB38
.4byte sub_81CB2E0
.4byte sub_81CF9BC
.4byte sub_81CFA34
.4byte sub_81CFDD0
.4byte sub_81CFE40
.4byte sub_81CFE70
.4byte sub_81CFA48
.4byte sub_81CFE98
.4byte sub_81D0450
.4byte sub_81D04A0
.4byte sub_81D0978
.4byte sub_81D09B0
.4byte sub_81D09E0
.4byte sub_81D04B8
.4byte sub_81D09F4
.4byte sub_81CFA04
.4byte sub_81CFA34
.4byte sub_81CFE08
.4byte sub_81CFE40
.4byte sub_81CFE70
.4byte sub_81CFA48
.4byte sub_81CFE98
gUnknown_0861F590:: @ 861F590
.incbin "graphics/pokenav/icon2.gbapal"
gUnknown_0861F5B0:: @ 861F5B0
.incbin "graphics/pokenav/icon2.4bpp.lz"
gUnknown_0861F994:: @ 861F994
.incbin "graphics/pokenav/icon2_unused.4bpp.lz"
gUnknown_0861FA04:: @ 861FA04
.byte 0x50
.byte 0x0
.byte 0x0
.byte 0x0
gUnknown_0861FA08:: @ 861FA08
window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36
null_window_template
gUnknown_0861FA18:: @ 861FA18
.4byte gUnknown_085EBED5
.4byte gUnknown_085EBED9
.4byte gUnknown_085EBEE9
.4byte gUnknown_085EBEF9
.4byte gUnknown_085EBF0E
.4byte gUnknown_085EBF22
.4byte gUnknown_085EBF39
.4byte gUnknown_085EBF49
.4byte gUnknown_085EBF57
.4byte gUnknown_085EBF60
.4byte gUnknown_085EBF73
.4byte gUnknown_085EBF84
gUnknown_0861FA48:: @ 861FA48
.byte 0x4
.byte 0x1
.byte 0x2
.byte 0x0
gUnknown_0861FA4C:: @ 861FA4C
obj_tiles gUnknown_0861F5B0, 0x1000, 0
gUnknown_0861FA54:: @ 861FA54
obj_pal gUnknown_0861F590, 0
null_obj_pal
gUnknown_0861FA64:: @ 861FA64
obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0xC00, 2
gUnknown_0861FA6C:: @ 861FA6C
obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3
obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1

10
include/graphics.h
View File

@ -4007,9 +4007,17 @@ extern const u32 gBerryPalette_Enigma[];
//credits
extern const u32 gCreditsCopyrightEnd_Gfx[];
//pokenav condition marker
//pokenav
extern const u8 gPokenavConditionMarker_Gfx[];
extern const u16 gPokenavConditionMarker_Pal[];
extern const u16 gPokenavHeader_Pal[];
extern const u32 gPokenavHeader_Gfx[];
extern const u32 gPokenavHeader_Tilemap[];
extern const u32 gPokenavLeftHeaderHoennMap_Gfx[];
extern const u32 gPokenavLeftHeaderMainMenu_Gfx[];
extern const u32 gPokenavLeftHeaderCondition_Gfx[];
extern const u32 gPokenavLeftHeaderRibbons_Gfx[];
extern const u32 gPokenavLeftHeaderMatchCall_Gfx[];
extern const u32 gUnknown_08D9862C[];
extern const u32 gUnknown_08D98CC8[];

13
include/strings.h
View File

@ -986,6 +986,19 @@ extern const u8 gText_SomeonesPC[];
extern const u8 gText_PlayersPC[];
extern const u8 gText_WhichPCShouldBeAccessed[];
extern const u8 gText_Navgear_ClearButtonList[];
extern const u8 gText_NavgearMap_ZoomedOutButtons[];
extern const u8 gText_NavgearMap_ZoomedInButtons[];
extern const u8 gText_NavgearCondition_MonListButtons[];
extern const u8 gText_NavgearCondition_MonStatusButtons[];
extern const u8 gText_NavgearCondition_MarkingButtons[];
extern const u8 gText_NavgearMatchCall_TrainerListButtons[];
extern const u8 gText_NavgearMatchCall_CallMenuButtons[];
extern const u8 gText_NavgearMatchCall_CheckTrainerButtons[];
extern const u8 gText_NavgearRibbons_MonListButtons[];
extern const u8 gText_NavgearRibbons_RibbonListButtons[];
extern const u8 gText_NavgearRibbons_RibbonCheckButtons[];
extern const u8 gUnknown_085EAD37[];
extern const u8 gUnknown_085EAD41[];
extern const u8 gUnknown_085EAD67[];

2
ld_script.txt
View File

@ -289,6 +289,7 @@ SECTIONS {
src/pokemon_summary_screen.o(.text);
src/unk_pokedex_area_screen_helper.o(.text);
src/battle_pyramid_bag.o(.text);
src/pokenav.o(.text);
asm/pokenav.o(.text);
src/pokenav_match_call.o(.text);
asm/rom_81D1C44.o(.text);
@ -591,6 +592,7 @@ SECTIONS {
src/pokemon_summary_screen.o(.rodata);
src/unk_pokedex_area_screen_helper.o(.rodata);
src/battle_pyramid_bag.o(.rodata);
src/pokenav.o(.rodata);
data/pokenav.o(.rodata);
src/pokenav_match_call.o(.rodata);
data/rom_81D1C44.o(.rodata);

4
src/pokedex.c
View File

@ -4041,7 +4041,7 @@ void sub_80C0460(u16 weight, u8 left, u8 top)
lsls r2, 24\n\
lsrs r2, 24\n\
str r2, [sp, 0x10]\n\
ldr r5, =0x000186a0\n\
ldr r5, =0x000186a0 @ Note to decompiler: See UNKNOWN_OFFSET\n\
muls r0, r5\n\
ldr r1, =0x000011b8\n\
bl __divsi3\n\
@ -4075,7 +4075,7 @@ _080C04C0:\n\
mov r8, r1\n\
movs r6, 0x1\n\
_080C04C6:\n\
ldr r1, =0x000186a0\n\
ldr r1, =0x000186a0 @ Note to decompiler: See UNKNOWN_OFFSET\n\
adds r0, r7, 0\n\
bl __umodsi3\n\
adds r7, r0, 0\n\

1211
src/pokenav.c Normal file
View File

File diff suppressed because it is too large Load Diff

24
src/strings.c
View File

@ -965,18 +965,18 @@ const u8 gUnknown_085EBE8E[] = _("Can't call opponent here.");
const u8 gUnknown_085EBEA8[] = _("STRATEGY");
const u8 gUnknown_085EBEB1[] = _("TRAINER'S POKéMON");
const u8 gUnknown_085EBEC3[] = _("SELF-INTRODUCTION");
const u8 gUnknown_085EBED5[] = _("{CLEAR 0x80}");
const u8 gUnknown_085EBED9[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL");
const u8 gUnknown_085EBEE9[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL");
const u8 gUnknown_085EBEF9[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL");
const u8 gUnknown_085EBF0E[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL");
const u8 gUnknown_085EBF22[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL");
const u8 gUnknown_085EBF39[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL");
const u8 gUnknown_085EBF49[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL");
const u8 gUnknown_085EBF57[] = _("{B_BUTTON}CANCEL");
const u8 gUnknown_085EBF60[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL");
const u8 gUnknown_085EBF73[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL");
const u8 gUnknown_085EBF84[] = _("{B_BUTTON}CANCEL");
const u8 gText_Navgear_ClearButtonList[] = _("{CLEAR 0x80}");
const u8 gText_NavgearMap_ZoomedOutButtons[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL");
const u8 gText_NavgearMap_ZoomedInButtons[] = _("{A_BUTTON}FULL {B_BUTTON}CANCEL");
const u8 gText_NavgearCondition_MonListButtons[] = _("{A_BUTTON}CONDITION {B_BUTTON}CANCEL");
const u8 gText_NavgearCondition_MonStatusButtons[] = _("{A_BUTTON}MARKINGS {B_BUTTON}CANCEL");
const u8 gText_NavgearCondition_MarkingButtons[] = _("{A_BUTTON}SELECT MARK {B_BUTTON}CANCEL");
const u8 gText_NavgearMatchCall_TrainerListButtons[] = _("{A_BUTTON}MENU {B_BUTTON}CANCEL");
const u8 gText_NavgearMatchCall_CallMenuButtons[] = _("{A_BUTTON}OK {B_BUTTON}CANCEL");
const u8 gText_NavgearMatchCall_CheckTrainerButtons[] = _("{B_BUTTON}CANCEL");
const u8 gText_NavgearRibbons_MonListButtons[] = _("{A_BUTTON}RIBBONS {B_BUTTON}CANCEL");
const u8 gText_NavgearRibbons_RibbonListButtons[] = _("{A_BUTTON}CHECK {B_BUTTON}CANCEL");
const u8 gText_NavgearRibbons_RibbonCheckButtons[] = _("{B_BUTTON}CANCEL");
const u8 gText_NatureSlash[] = _("NATURE/");
const u8 gText_TrainerCloseBy[] = _("That TRAINER is close by.\nTalk to the TRAINER in person!");
const u8 gText_InParty[] = _("IN PARTY");