Merge branch 'master' into pokeblock

data/field_specials.s

@@ -1,75 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_083F8358:: @ 83F8358
-	.byte 7, 9, 8, 10
-
-gUnknown_083F835C:: @ 83F835C
-	.byte    0,   1
-	.byte    1,   0
-	.byte    0,  -1
-	.byte   -1,   0
-
-	.align 2
-gUnknown_083F8364:: @ 83F8364
-	.byte    7,  16,   0,   0
-	.byte   15,  18,   0,   0
-	.byte   11,  22,   0,   0
-
-gUnknown_083F8370:: @ 83F8370
-	.byte 0, 1, 1, 1, 1
-
-	.align 1
-gUnknown_083F8376:: @ 83F8376
-	.2byte 0x218, 0x219, 0x21A, 0x21B, 0x21C
-
-	.align 2
-gUnknown_083F8380:: @ 83F8380
-	.4byte OtherText_1F
-	.4byte OtherText_2F
-	.4byte OtherText_3F
-	.4byte OtherText_4F
-	.4byte OtherText_5F
-	.4byte OtherText_6F
-	.4byte OtherText_7F
-	.4byte OtherText_8F
-	.4byte OtherText_9F
-	.4byte OtherText_10F
-	.4byte OtherText_11F
-	.4byte OtherText_B1F
-	.4byte OtherText_B2F
-	.4byte OtherText_B3F
-	.4byte OtherText_B4F
-	.4byte OtherText_Rooftop
-
-	.align 2
-gUnknown_083F83C0:: @ 83F83C0
-	.4byte OtherText_BlueFlute
-	.4byte OtherText_YellowFlute
-	.4byte OtherText_RedFlute
-	.4byte OtherText_WhiteFlute
-	.4byte OtherText_BlackFlute
-	.4byte OtherText_PrettyChair
-	.4byte OtherText_PrettyDesk
-	.4byte gOtherText_CancelNoTerminator
-
-gUnknown_083F83E0:: @ 83F83E0
-	.byte 12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6
-
-gUnknown_083F83EC:: @ 83F83EC
-	.byte 0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5
-
-gUnknown_083F83F8:: @ 83F83F8
-	.byte 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5
-
-gUnknown_083F8404:: @ 83F8404
-	.byte 2, 1, 2, 1
-
-gUnknown_083F8408:: @ 83F8408
-	.byte  8,  9, 10, 11, 12, 13, 14, 15
-
-gUnknown_083F8410:: @ 83F8410
-	.byte  8, 13, 14, 11, 10, 12, 15,  9

include/battle_tower.h

@@ -3,5 +3,6 @@
 
 void sub_8134AC0(void *);
 u16 sub_8135D3C(u8);
+void sub_8135FF4(u8*);
 
 #endif // GUARD_BATTLE_TOWER_H

include/field_map_obj.h

@@ -426,5 +426,8 @@ u8 sub_8060B38(u8);
 u8 sub_8060B64(u8);
 u8 GetOppositeDirection(u8);
 void sub_80634D0(struct MapObject *, struct Sprite *);
+u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
+void CameraObjectSetFollowedObjectId(u8);
+u8 sub_805ADDC(u8);
 
 #endif // GUARD_FIELD_MAP_OBJ_H

include/field_region_map.h

@@ -1,6 +1,7 @@
 #ifndef GUARD_FIELD_REGION_MAP_H
 #define GUARD_FIELD_REGION_MAP_H
 
+void FieldInitRegionMap(void(void));
 void CB2_FieldInitRegionMap(void);
 void VBlankCB_FieldRegionMap(void);
 void CB2_FieldRegionMap(void);

include/field_specials.h

@@ -1,6 +1,30 @@
 #ifndef GUARD_FIELD_SPECIALS_H
 #define GUARD_FIELD_SPECIALS_H
 
+struct ElevatorMenu {
+    u8 var0;
+    s8 var1;
+    s8 var2;
+    u8 var3;
+};
+
+extern struct ElevatorMenu gUnknown_03000760[20];
+extern struct WarpData gUnknown_020297F0;
+extern u8 gBattleOutcome;
+
+extern u16 gScriptResult;
+extern u8 gUnknown_02039250;
+extern u8 gUnknown_02039251;
+extern u32 gUnknown_02039254;
+extern u8 gUnknown_02039258;
+extern u8 gUnknown_02039259;
+extern u8 gUnknown_0203925A;
+extern u8 gUnknown_0203925B;
+extern u8 gUnknown_0203925C;
+
+extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8005;
+
 void ResetCyclingRoadChallengeData(void);
 bool32 CountSSTidalStep(u16);
 u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *);

include/pokeblock.h

@@ -30,5 +30,6 @@ void sub_810BA7C(u8);
 void ClearPokeblocks(void);
 bool8 sub_810CA6C(u8);
 s16 sub_810CAE4(u8, const struct Pokeblock *);
+u8 sub_810CB68(u8, u8*);
 
 #endif // GUARD_POKEBLOCK_H

include/pokemon.h

@@ -409,6 +409,7 @@ extern u8 gStatStageRatios[][2];
 
 extern struct Pokemon gPlayerParty[PARTY_SIZE];
 extern struct Pokemon gEnemyParty[PARTY_SIZE];
+extern struct PokemonStorage gPokemonStorage;
 
 void ZeroBoxMonData(struct BoxPokemon *boxMon);
 void ZeroMonData(struct Pokemon *mon);
@@ -511,5 +512,6 @@ void sub_8040B8C(void);
 void SetWildMonHeldItem(void);
 u8 *sub_8040D08();
 bool32 sub_8040D3C(u16 species, u8 *name, u8 language);
+u16 GetMonEVCount(struct Pokemon *);
 
 #endif // GUARD_POKEMON_H

include/pokemon_summary_screen.h

@@ -12,5 +12,6 @@ u8 GetMonStatusAndPokerus();
 u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8);
 u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level);
 u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon);
+bool8 CheckPartyPokerus(struct Pokemon *, u8);
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H

include/region_map.h

@@ -6,7 +6,7 @@ void sub_80FAB10(void);
 u8 sub_80FAB60(void);
 void sub_80FBB3C(u16, u16);
 void sub_80FBCF0(u32, u8);
-void sub_80FBFB4(u8 *str, u8 region, u8);
+void sub_80FBFB4(u8 *str, u16 region, u8);
 void CopyMapName();
 u8 *CopyLocationName(u8 *dest, u8 location);
 

include/script.h

@@ -56,5 +56,6 @@ void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
 u8 *GetRamScript(u8 objectId, u8 *script);
 u16 gScriptResult;
+extern u16 gScriptLastTalked;
 
 #endif // GUARD_SCRIPT_H

include/tv.h

@@ -18,7 +18,7 @@ enum
     TVSHOW_MASS_OUTBREAK = 41,
 };
 
-extern u8 *gUnknown_083D1464[3];
+extern u8 *const gUnknown_083D1464[3];
 
 void ClearTVShowData(void);
 u8 sub_80BDEAC(u8 *);
@@ -106,5 +106,6 @@ void DoTVShowTodaysSmartShopper(void);
 void sub_80BE3BC(void);
 void UpdateTVShowsPerDay(u16);
 void sub_80C045C();
+void sub_80BF088(u8, s32);
 
 #endif // GUARD_TV_H

include/vars.h

@@ -17,6 +17,7 @@
 
 #define VAR_DAYS                   0x4040
 
+#define VAR_DEPT_STORE_FLOOR       0x4043
 #define VAR_POKELOT_PRIZE          0x4045
 #define VAR_NATIONAL_DEX           0x4046
 #define VAR_SHROOMISH_SIZE_RECORD  0x4047
@@ -31,10 +32,12 @@
 #define VAR_0x4054                 0x4054
 
 #define VAR_0x4089                 0x4089
+#define VAR_0x4095                 0x4095
 #define VAR_0x4097                 0x4097
-
+#define VAR_0x409a                 0x409a
 #define VAR_PORTHOLE               0x40B4
 
 #define VAR_0x40BC                 0x40BC
+#define VAR_0x40C2                 0x40C2
 
 #endif // GUARD_VARS_H

ld_script.txt

@@ -219,7 +219,6 @@ SECTIONS {
         src/birch_pc.o(.text);
         src/hof_pc.o(.text);
         src/field_specials.o(.text);
-        asm/field_specials.o(.text);
         asm/battle_records.o(.text);
         src/battle_records.o(.text);
         asm/battle_records.o(.text_8110494);
@@ -441,7 +440,7 @@ SECTIONS {
         src/pokeblock.o(.rodata);
         data/fldeff_flash.o(.rodata);
         src/time_events.o(.rodata);
-        data/field_specials.o(.rodata);
+        src/field_specials.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
         data/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);

src/field_map_obj.c

@@ -3104,13 +3104,13 @@ void CameraObjectReset1(void)
     }
 }
 
-void CameraObjectSetFollowedObjectId(u8 state)
+void CameraObjectSetFollowedObjectId(u8 spriteId)
 {
     struct Sprite *cameraSprite = FindCameraObject();
 
     if (cameraSprite != NULL)
     {
-        cameraSprite->data0 = state;
+        cameraSprite->data0 = spriteId;
         CameraObjectReset1();
     }
 }