Skip to content

Commit

Permalink
Merge pull request #328 from iriv24/pal-park
Browse files Browse the repository at this point in the history
  • Loading branch information
@lhearachel
lhearachel committed Jan 5, 2025
1 parent a36c895 commit 32ebda6
Showing 1 changed file with 86 additions and 86 deletions.
172 changes: 86 additions & 86 deletions platinumus.xMAP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6794,7 +6794,7 @@
4](TP_GetUserInfo,func) found in global libspi.a
5](TP_CalcCalibrateParam,func) found in global libspi.a
4](TP_SetCalibrateParam,func) found in global libspi.a
3](sub_02017B70,func) found in global src_unk_02017728.c.o
3](SetGBACartridgeVersion,func) found in global src_unk_02017728.c.o
3](sub_0202419C,func) found in global src_unk_0202419C.c.o
4](Unk_021C0788,object) found in local src_unk_0202419C.c.o
3](InitRTC,func) found in global src_rtc.c.o
Expand Down Expand Up @@ -30694,7 +30694,7 @@
39](sub_0206B1B0,func) found in global src_unk_0206AFE0.c.o
39](sub_0206B1D8,func) found in global src_unk_0206AFE0.c.o
38](ScrCmd_26F,func) found in local src_scrcmd.c.o
38](ScrCmd_26E,func) found in local src_scrcmd.c.o
38](ScrCmd_GetGBACartridgeVersion,func) found in local src_scrcmd.c.o
38](ScrCmd_26D,func) found in local src_scrcmd.c.o
38](ScrCmd_26C,func) found in local src_scrcmd.c.o
39](sub_02029D50,func) found in global src_unk_020298BC.c.o
Expand Down Expand Up @@ -30821,14 +30821,14 @@
41](ov7_0224BEFC,func) found in global src_overlay007_ov7_0224BE9C.c.o
42](ov7_0224C3B8,func) found in local src_overlay007_ov7_0224BE9C.c.o
42](ov7_0224C3E0,func) found in local src_overlay007_ov7_0224BE9C.c.o
38](ScrCmd_256,func) found in global src_unk_0204C500.c.o
39](sub_020563D0,func) found in global src_unk_020562F8.c.o
40](sub_02056698,func) found in local src_unk_020562F8.c.o
40](Unk_021C07FC,object) found in local src_unk_020562F8.c.o
39](sub_020563E0,func) found in global src_unk_020562F8.c.o
40](sub_0205671C,func) found in local src_unk_020562F8.c.o
39](sub_020563F0,func) found in global src_unk_020562F8.c.o
40](sub_020566AC,func) found in local src_unk_020562F8.c.o
38](ScrCmd_CalcCatchingShowPoints,func) found in global src_unk_0204C500.c.o
39](CatchingShow_CalcCatchingPoints,func) found in global src_catching_show.c.o
40](CalcCatchingPoints,func) found in local src_catching_show.c.o
40](sCatchingShow,object) found in local src_catching_show.c.o
39](CatchingShow_GetTimePoints,func) found in global src_catching_show.c.o
40](GetTimePoints,func) found in local src_catching_show.c.o
39](CatchingShow_GetTypePoints,func) found in global src_catching_show.c.o
40](CalculateTypePoints,func) found in local src_catching_show.c.o
38](ScrCmd_255,func) found in global src_unk_0204C500.c.o
39](SaveData_PalParkTransfer,func) found in global src_savedata_save_table.c.o
39](sub_0202F000,func) found in global src_unk_0202EEC0.c.o
Expand All @@ -30838,12 +30838,12 @@
39](sub_0202F028,func) found in global src_unk_0202EEC0.c.o
38](ScrCmd_253,func) found in global src_unk_0204C500.c.o
39](SystemFlag_SetInPalPark,func) found in global src_system_flags.c.o
39](sub_020562F8,func) found in global src_unk_020562F8.c.o
40](sub_0205642C,func) found in local src_unk_020562F8.c.o
41](sub_02056400,func) found in local src_unk_020562F8.c.o
40](sub_020564D0,func) found in local src_unk_020562F8.c.o
39](CatchingShow_Start,func) found in global src_catching_show.c.o
40](InitEncounterData,func) found in local src_catching_show.c.o
41](sub_02056400,func) found in local src_catching_show.c.o
40](ResetStepCount,func) found in local src_catching_show.c.o
39](SystemFlag_ClearInPalPark,func) found in global src_system_flags.c.o
39](sub_02056328,func) found in global src_unk_020562F8.c.o
39](CatchingShow_End,func) found in global src_catching_show.c.o
38](ScrCmd_252,func) found in local src_scrcmd.c.o
39](sub_02079A50,func) found in global src_unk_020797C8.c.o
38](ScrCmd_251,func) found in global src_unk_020474B8.c.o
Expand Down Expand Up @@ -36477,8 +36477,8 @@
47](sub_0203E0AC,func) found in global src_unk_0203D1B8.c.o
47](FieldMenu_PokedexEnd,func) found in local src_field_menu.c.o
42](sub_0203B094,func) found in local src_field_menu.c.o
43](sub_020563BC,func) found in global src_unk_020562F8.c.o
44](sub_020564B4,func) found in local src_unk_020562F8.c.o
43](CatchingShow_GetParkBallCount,func) found in global src_catching_show.c.o
44](NumMonsCaptured,func) found in local src_catching_show.c.o
42](FieldMenu_Select,func) found in local src_field_menu.c.o
43](sub_0203B5B4,func) found in local src_field_menu.c.o
43](sub_0203B5E8,func) found in local src_field_menu.c.o
Expand Down Expand Up @@ -37255,17 +37255,17 @@
22](ov5_021E0390,func) found in local src_overlay005_ov5_021DFB54.c.o
23](ov5_021E03C8,func) found in local src_overlay005_ov5_021DFB54.c.o
19](Field_CheckWildEncounter,func) found in local src_overlay005_field_control.c.o
20](sub_02056374,func) found in global src_unk_020562F8.c.o
21](sub_020564F4,func) found in local src_unk_020562F8.c.o
21](sub_02056554,func) found in local src_unk_020562F8.c.o
22](sub_0205650C,func) found in local src_unk_020562F8.c.o
20](sub_0205639C,func) found in global src_unk_020562F8.c.o
21](sub_0205664C,func) found in local src_unk_020562F8.c.o
20](CatchingShow_CheckWildEncounter,func) found in global src_catching_show.c.o
21](IsStepCountZero,func) found in local src_catching_show.c.o
21](TryStartEncounter,func) found in local src_catching_show.c.o
22](GetEncounterArea,func) found in local src_catching_show.c.o
20](CatchingShow_GetBattleDTO,func) found in global src_catching_show.c.o
21](SetupBattleDTO,func) found in local src_catching_show.c.o
22](FieldBattleDTO_NewPalPark,func) found in global src_field_battle_data_transfer.c.o
20](Encounter_NewVsPalParkTransfer,func) found in global src_encounter.c.o
21](FieldTask_PalParkEncounter,func) found in local src_encounter.c.o
22](sub_020563AC,func) found in global src_unk_020562F8.c.o
23](sub_02056624,func) found in local src_unk_020562F8.c.o
22](CatchingShow_UpdateBattleResult,func) found in global src_catching_show.c.o
23](UpdateBattleResultInternal,func) found in local src_catching_show.c.o
20](ov6_02240D5C,func) found in global src_overlay006_ov6_02240C9C.c.o
21](sub_020696DC,func) found in global src_pokeradar.c.o
22](sub_020698AC,func) found in local src_pokeradar.c.o
Expand Down Expand Up @@ -41974,7 +41974,7 @@
02017AF4 0000007C .text InitKeypadAndTouchpad (src_unk_02017728.c.o)
02017B54 00000000 .text $d (src_unk_02017728.c.o)
02017B70 00000000 .text $t (src_unk_02017728.c.o)
02017B70 0000000C .text sub_02017B70 (src_unk_02017728.c.o)
02017B70 0000000C .text SetGBACartridgeVersion (src_unk_02017728.c.o)
02017B78 00000000 .text $d (src_unk_02017728.c.o)
02017B7C 00000000 .text $t (src_unk_02017728.c.o)
02017B7C 00000010 .text SleepLock (src_unk_02017728.c.o)
Expand Down Expand Up @@ -49775,7 +49775,7 @@
02045650 00000098 .text ScrCmd_26C (src_scrcmd.c.o)
020456E4 00000000 .text $d (src_scrcmd.c.o)
020456E8 00000000 .text $t (src_scrcmd.c.o)
020456E8 00000020 .text ScrCmd_26E (src_scrcmd.c.o)
020456E8 00000020 .text ScrCmd_GetGBACartridgeVersion (src_scrcmd.c.o)
02045704 00000000 .text $d (src_scrcmd.c.o)
02045708 00000016 .text ScrCmd_26F (src_scrcmd.c.o)
02045708 00000000 .text $t (src_scrcmd.c.o)
Expand Down Expand Up @@ -50657,7 +50657,7 @@
0204C554 00000000 .text $t (src_unk_0204C500.c.o)
0204C59C 0000009A .text ScrCmd_255 (src_unk_0204C500.c.o)
0204C59C 00000000 .text $t (src_unk_0204C500.c.o)
0204C638 00000090 .text ScrCmd_256 (src_unk_0204C500.c.o)
0204C638 00000090 .text ScrCmd_CalcCatchingShowPoints (src_unk_0204C500.c.o)
0204C638 00000000 .text $t (src_unk_0204C500.c.o)
0204C6C8 00000050 .text ScrCmd_075 (src_unk_0204C6C8.c.o)
0204C6C8 00000000 .text $t (src_unk_0204C6C8.c.o)
Expand Down Expand Up @@ -51719,60 +51719,60 @@
020562D4 00000000 .text $d (src_unk_02055C50.c.o)
020562D8 0000001E .text sub_020562D8 (src_unk_02055C50.c.o)
020562D8 00000000 .text $t (src_unk_02055C50.c.o)
020562F8 00000000 .text $t (src_unk_020562F8.c.o)
020562F8 00000030 .text sub_020562F8 (src_unk_020562F8.c.o)
02056320 00000000 .text $d (src_unk_020562F8.c.o)
02056328 00000000 .text $t (src_unk_020562F8.c.o)
02056328 0000004C .text sub_02056328 (src_unk_020562F8.c.o)
0205636C 00000000 .text $d (src_unk_020562F8.c.o)
02056374 00000000 .text $t (src_unk_020562F8.c.o)
02056374 00000028 .text sub_02056374 (src_unk_020562F8.c.o)
02056398 00000000 .text $d (src_unk_020562F8.c.o)
0205639C 00000000 .text $t (src_unk_020562F8.c.o)
0205639C 00000010 .text sub_0205639C (src_unk_020562F8.c.o)
020563A4 00000000 .text $d (src_unk_020562F8.c.o)
020563AC 00000000 .text $t (src_unk_020562F8.c.o)
020563AC 00000010 .text sub_020563AC (src_unk_020562F8.c.o)
020563B4 00000000 .text $d (src_unk_020562F8.c.o)
020563BC 00000000 .text $t (src_unk_020562F8.c.o)
020563BC 00000014 .text sub_020563BC (src_unk_020562F8.c.o)
020563CC 00000000 .text $d (src_unk_020562F8.c.o)
020563D0 00000000 .text $t (src_unk_020562F8.c.o)
020563D0 00000010 .text sub_020563D0 (src_unk_020562F8.c.o)
020563D8 00000000 .text $d (src_unk_020562F8.c.o)
020563E0 00000000 .text $t (src_unk_020562F8.c.o)
020563E0 00000010 .text sub_020563E0 (src_unk_020562F8.c.o)
020563E8 00000000 .text $d (src_unk_020562F8.c.o)
020563F0 00000000 .text $t (src_unk_020562F8.c.o)
020563F0 00000010 .text sub_020563F0 (src_unk_020562F8.c.o)
020563F8 00000000 .text $d (src_unk_020562F8.c.o)
02056400 00000000 .text $t (src_unk_020562F8.c.o)
02056400 0000002C .text sub_02056400 (src_unk_020562F8.c.o)
02056428 00000000 .text $d (src_unk_020562F8.c.o)
0205642C 00000086 .text sub_0205642C (src_unk_020562F8.c.o)
0205642C 00000000 .text $t (src_unk_020562F8.c.o)
020564B4 0000001A .text sub_020564B4 (src_unk_020562F8.c.o)
020564B4 00000000 .text $t (src_unk_020562F8.c.o)
020564D0 00000000 .text $t (src_unk_020562F8.c.o)
020564D0 00000024 .text sub_020564D0 (src_unk_020562F8.c.o)
020564F0 00000000 .text $d (src_unk_020562F8.c.o)
020564F4 00000016 .text sub_020564F4 (src_unk_020562F8.c.o)
020564F4 00000000 .text $t (src_unk_020562F8.c.o)
0205650C 00000046 .text sub_0205650C (src_unk_020562F8.c.o)
0205650C 00000000 .text $t (src_unk_020562F8.c.o)
02056554 00000000 .text $t (src_unk_020562F8.c.o)
02056554 000000D0 .text sub_02056554 (src_unk_020562F8.c.o)
02056620 00000000 .text $d (src_unk_020562F8.c.o)
02056624 00000028 .text sub_02056624 (src_unk_020562F8.c.o)
02056624 00000000 .text $t (src_unk_020562F8.c.o)
0205664C 0000004A .text sub_0205664C (src_unk_020562F8.c.o)
0205664C 00000000 .text $t (src_unk_020562F8.c.o)
02056698 00000014 .text sub_02056698 (src_unk_020562F8.c.o)
02056698 00000000 .text $t (src_unk_020562F8.c.o)
020566AC 00000070 .text sub_020566AC (src_unk_020562F8.c.o)
020566AC 00000000 .text $t (src_unk_020562F8.c.o)
0205671C 00000004 .text sub_0205671C (src_unk_020562F8.c.o)
0205671C 00000000 .text $t (src_unk_020562F8.c.o)
020562F8 00000000 .text $t (src_catching_show.c.o)
020562F8 00000030 .text CatchingShow_Start (src_catching_show.c.o)
02056320 00000000 .text $d (src_catching_show.c.o)
02056328 00000000 .text $t (src_catching_show.c.o)
02056328 0000004C .text CatchingShow_End (src_catching_show.c.o)
0205636C 00000000 .text $d (src_catching_show.c.o)
02056374 00000000 .text $t (src_catching_show.c.o)
02056374 00000028 .text CatchingShow_CheckWildEncounter (src_catching_show.c.o)
02056398 00000000 .text $d (src_catching_show.c.o)
0205639C 00000000 .text $t (src_catching_show.c.o)
0205639C 00000010 .text CatchingShow_GetBattleDTO (src_catching_show.c.o)
020563A4 00000000 .text $d (src_catching_show.c.o)
020563AC 00000000 .text $t (src_catching_show.c.o)
020563AC 00000010 .text CatchingShow_UpdateBattleResult (src_catching_show.c.o)
020563B4 00000000 .text $d (src_catching_show.c.o)
020563BC 00000000 .text $t (src_catching_show.c.o)
020563BC 00000014 .text CatchingShow_GetParkBallCount (src_catching_show.c.o)
020563CC 00000000 .text $d (src_catching_show.c.o)
020563D0 00000000 .text $t (src_catching_show.c.o)
020563D0 00000010 .text CatchingShow_CalcCatchingPoints (src_catching_show.c.o)
020563D8 00000000 .text $d (src_catching_show.c.o)
020563E0 00000000 .text $t (src_catching_show.c.o)
020563E0 00000010 .text CatchingShow_GetTimePoints (src_catching_show.c.o)
020563E8 00000000 .text $d (src_catching_show.c.o)
020563F0 00000000 .text $t (src_catching_show.c.o)
020563F0 00000010 .text CatchingShow_GetTypePoints (src_catching_show.c.o)
020563F8 00000000 .text $d (src_catching_show.c.o)
02056400 00000000 .text $t (src_catching_show.c.o)
02056400 0000002C .text sub_02056400 (src_catching_show.c.o)
02056428 00000000 .text $d (src_catching_show.c.o)
0205642C 00000086 .text InitEncounterData (src_catching_show.c.o)
0205642C 00000000 .text $t (src_catching_show.c.o)
020564B4 0000001A .text NumMonsCaptured (src_catching_show.c.o)
020564B4 00000000 .text $t (src_catching_show.c.o)
020564D0 00000000 .text $t (src_catching_show.c.o)
020564D0 00000024 .text ResetStepCount (src_catching_show.c.o)
020564F0 00000000 .text $d (src_catching_show.c.o)
020564F4 00000016 .text IsStepCountZero (src_catching_show.c.o)
020564F4 00000000 .text $t (src_catching_show.c.o)
0205650C 00000046 .text GetEncounterArea (src_catching_show.c.o)
0205650C 00000000 .text $t (src_catching_show.c.o)
02056554 00000000 .text $t (src_catching_show.c.o)
02056554 000000D0 .text TryStartEncounter (src_catching_show.c.o)
02056620 00000000 .text $d (src_catching_show.c.o)
02056624 00000028 .text UpdateBattleResultInternal (src_catching_show.c.o)
02056624 00000000 .text $t (src_catching_show.c.o)
0205664C 0000004A .text SetupBattleDTO (src_catching_show.c.o)
0205664C 00000000 .text $t (src_catching_show.c.o)
02056698 00000014 .text CalcCatchingPoints (src_catching_show.c.o)
02056698 00000000 .text $t (src_catching_show.c.o)
020566AC 00000070 .text CalculateTypePoints (src_catching_show.c.o)
020566AC 00000000 .text $t (src_catching_show.c.o)
0205671C 00000004 .text GetTimePoints (src_catching_show.c.o)
0205671C 00000000 .text $t (src_catching_show.c.o)
02056720 00000006 .text Poketch_SaveSize (src_poketch_data.c.o)
02056720 00000000 .text $t (src_poketch_data.c.o)
02056728 00000000 .text $t (src_poketch_data.c.o)
Expand Down Expand Up @@ -67702,8 +67702,8 @@
021C07F0 00000002 .bss Unk_021C07F0 (src_unk_020480A8.c.o)
021C07F2 00000002 .bss Unk_021C07F2 (src_unk_020480A8.c.o)
021C07F4 00000008 .bss sUnknownFlags (src_vars_flags.c.o)
021C07FC 00000000 .bss .bss (src_unk_020562F8.c.o)
021C07FC 0000004C .bss Unk_021C07FC (src_unk_020562F8.c.o)
021C07FC 00000000 .bss .bss (src_catching_show.c.o)
021C07FC 0000004C .bss sCatchingShow (src_catching_show.c.o)
021C0848 00000000 .bss .bss (src_comm_player_manager.c.o)
021C0848 00000004 .bss sCommPlayerManager (src_comm_player_manager.c.o)
021C084C 00000000 .bss .bss (src_field_comm_manager.c.o)
Expand Down Expand Up @@ -137822,5 +137822,5 @@
00000000 00000000 00000660 check.ITCM
00000000 00000000 00000880 check.DTCM

# Link start time: Sun Jan 05 05:56:44 2025
# Link end time: Sun Jan 05 05:56:57 2025
# Link start time: Sun Jan 05 21:14:10 2025
# Link end time: Sun Jan 05 21:14:24 2025

0 comments on commit 32ebda6

Please sign in to comment.