From 4b459cd4607a48a84bcc14122d2ad324424fdff2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 5 Jan 2019 17:08:30 -0500 Subject: through sub_815E1F0 --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 50ac09d9e..5e2e4c11c 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -82,6 +82,7 @@ void sub_8055DC4(void); u8 sav1_map_get_name(void); void sub_8055D40(u16 mapDataId); +void sub_80563F0(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; -- cgit v1.2.3 From b16831e97bb8b94c29854a81e11647e8a5db68c6 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 6 Jan 2019 11:57:00 -0500 Subject: through ScrCmd_fadeinbgm --- include/overworld.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 50ac09d9e..6aa58baa9 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -35,7 +35,10 @@ void Overworld_SetMapObjTemplateMovementType(u8, u8); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); -void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetDynamicWarpWithCoords(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void Overworld_SetHealLocationWarp(u8); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084E2C(s8, s8, s8, s8, s8); @@ -81,7 +84,10 @@ void sub_8055DC4(void); u8 sav1_map_get_name(void); -void sub_8055D40(u16 mapDataId); +void SetCurrentMapLayout(u16 mapDataId); +void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); + +void ResetInitialPlayerAvatarState(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; -- cgit v1.2.3 From abac6f3ec853f451a7d456cfd336d8c51c0541c1 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 6 Jan 2019 16:14:59 -0500 Subject: Through ScrCmd_takecoins --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 53914b627..fbea3a4d9 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -95,5 +95,6 @@ extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; extern bool8 (* gUnknown_3005024)(void); +void SetLastHealLocationWarp(u8 healLocaionId); #endif //GUARD_ROM4_H -- cgit v1.2.3 From 38abcf9774612094d8552904fbeed3d1b2c4bba1 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 7 Jan 2019 16:39:32 -0500 Subject: through sub_80598CC --- include/overworld.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index fbea3a4d9..b32d9cf48 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -24,6 +24,8 @@ struct UCoords32 u32 x, y; }; +extern struct UCoords32 gDirectionToVectors[]; + extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; extern MainCallback gFieldCallback; @@ -96,5 +98,6 @@ extern u8 gUnknown_2036E28; extern bool8 (* gUnknown_3005024)(void); void SetLastHealLocationWarp(u8 healLocaionId); +void sub_8055864(u8 mapGroup, u8 mapNum); #endif //GUARD_ROM4_H -- cgit v1.2.3 From 35892e6b5381190269a61f3a87743086a6a44c12 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Apr 2019 20:26:51 -0400 Subject: through sub_8130C20 --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index b32d9cf48..8c32d3e06 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -99,5 +99,6 @@ extern u8 gUnknown_2036E28; extern bool8 (* gUnknown_3005024)(void); void SetLastHealLocationWarp(u8 healLocaionId); void sub_8055864(u8 mapGroup, u8 mapNum); +void CB2_NewGame(void); #endif //GUARD_ROM4_H -- cgit v1.2.3 From d74dda011ad0fc50d3ffb1a98213308e114933cf Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 17 Apr 2019 14:09:54 -0700 Subject: Port fldeff_teleport --- include/overworld.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 8c32d3e06..234fb7c01 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -96,9 +96,11 @@ void sub_80563F0(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; -extern bool8 (* gUnknown_3005024)(void); +extern bool8 (* gFieldCallback2)(void); void SetLastHealLocationWarp(u8 healLocaionId); void sub_8055864(u8 mapGroup, u8 mapNum); void CB2_NewGame(void); +bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); +void Overworld_ResetStateAfterTeleport(void); #endif //GUARD_ROM4_H -- cgit v1.2.3 From 2ef974d7766f899bbe3c3d4af8974232c6a13610 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 24 Apr 2019 17:14:11 -0400 Subject: Decompile seagallop --- include/overworld.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 8c32d3e06..0020e9f57 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -96,9 +96,15 @@ void sub_80563F0(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; +extern void (*gUnknown_3005020)(void); + extern bool8 (* gUnknown_3005024)(void); void SetLastHealLocationWarp(u8 healLocaionId); void sub_8055864(u8 mapGroup, u8 mapNum); void CB2_NewGame(void); +void Overworld_FadeOutMapMusic(void); +void sub_805671C(void); +bool8 sub_8055FC4(void); + #endif //GUARD_ROM4_H -- cgit v1.2.3 From e9e87a0fe47406b5d2881b9360886842b8731c97 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 6 May 2019 10:49:10 -0400 Subject: egg_hatch as part of daycare --- include/overworld.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index ac3d5283f..f03db2a3a 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -63,7 +63,7 @@ void strange_npc_table_clear(void); const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16); void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); void sub_8086230(void); -void c2_exit_to_overworld_2_switch(void); +void CB2_ReturnToField(void); bool32 sub_8087598(void); void c2_exit_to_overworld_1_continue_scripts_restart_music(void); void warp_in(void); @@ -84,19 +84,19 @@ void sub_805726C(void); void sub_8057430(void); void sub_8055DC4(void); -u8 sav1_map_get_name(void); +u8 GetCurrentRegionMapSectionId(void); void SetCurrentMapLayout(u16 mapDataId); void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); void ResetInitialPlayerAvatarState(void); void sub_8055D40(u16 mapDataId); -void sub_80563F0(void); +void CleanupOverworldWindowsAndTilemaps(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; -extern void (*gUnknown_3005020)(void); +extern void (*gFieldCallback)(void); extern bool8 (* gFieldCallback2)(void); void SetLastHealLocationWarp(u8 healLocaionId); -- cgit v1.2.3 From 468d5a0594f64a4e9db5b313acad3e46ee45ba97 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 May 2019 17:44:16 -0400 Subject: finish heal_location --- include/overworld.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index f03db2a3a..5c4235b8c 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -29,6 +29,8 @@ extern struct UCoords32 gDirectionToVectors[]; extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; extern MainCallback gFieldCallback; +extern struct WarpData gUnknown_2031DBC; + void IncrementGameStat(u8 index); void Overworld_SetMapObjTemplateCoords(u8, s16, s16); -- cgit v1.2.3 From 12191612cd7a050283e37278fac1c02a2ef3776d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 10 Jun 2019 09:03:39 +0800 Subject: TeachyTvLoadMapPalette and fixes --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 5c4235b8c..a3fe1161f 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -109,6 +109,7 @@ void Overworld_ResetStateAfterTeleport(void); void Overworld_FadeOutMapMusic(void); void sub_805671C(void); +void sub_8055DC4(void); bool8 sub_8055FC4(void); #endif //GUARD_ROM4_H -- cgit v1.2.3 From 71d017a2bc12b584dad5e2d3a165e361e7866512 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 11 Jun 2019 17:32:33 -0400 Subject: help_system_812B1E0: through sub_812B4D8 --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index a3fe1161f..b8cf58b4d 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -111,5 +111,6 @@ void Overworld_FadeOutMapMusic(void); void sub_805671C(void); void sub_8055DC4(void); bool8 sub_8055FC4(void); +bool8 is_light_level_8_or_9(u8 mapType); #endif //GUARD_ROM4_H -- cgit v1.2.3 From 7eeba327bd6dc235a33f06a7779e3b3c52f04475 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 19 Jun 2019 18:03:24 -0400 Subject: Dump items and start decomp item_use --- include/overworld.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index b8cf58b4d..122d73736 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -31,6 +31,8 @@ extern MainCallback gFieldCallback; extern struct WarpData gUnknown_2031DBC; +extern u8 gUnknown_2031DE0; + void IncrementGameStat(u8 index); void Overworld_SetMapObjTemplateCoords(u8, s16, s16); @@ -112,5 +114,6 @@ void sub_805671C(void); void sub_8055DC4(void); bool8 sub_8055FC4(void); bool8 is_light_level_8_or_9(u8 mapType); +bool32 sub_8055C9C(void); #endif //GUARD_ROM4_H -- cgit v1.2.3 From 7abbe42763835f43dc2b08f8292a4ef83c50c5e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 20:00:13 -0400 Subject: Finish item_use --- include/overworld.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/overworld.h') diff --git a/include/overworld.h b/include/overworld.h index 122d73736..ab77542c2 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -115,5 +115,6 @@ void sub_8055DC4(void); bool8 sub_8055FC4(void); bool8 is_light_level_8_or_9(u8 mapType); bool32 sub_8055C9C(void); +void sub_8054D70(void); #endif //GUARD_ROM4_H -- cgit v1.2.3