Skip to content

Commit

Permalink
Merge pull request pret#859 from AreaZeroArven/work9
Browse files Browse the repository at this point in the history
  • Loading branch information
GriffinRichards committed Oct 11, 2024
1 parent 1d0bc2d commit 34e5cb0
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 759 deletions.
74 changes: 5 additions & 69 deletions pokeruby.sym
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@
08003418 g 00000048 Text_PrintWindowSimple
08003460 g 0000002e Text_InitWindowAndPrintText
08003490 g 00000042 sub_8003490
080034d4 g 00000018 sub_80034D4
080034d4 g 00000018 RenderTextHandleBold
080034ec g 00000018 sub_80034EC
08003504 g 00000054 sub_8003504
08003558 g 00000054 sub_8003558
Expand Down Expand Up @@ -2422,7 +2422,7 @@
080438e0 g 00000032 unref_sub_80438E0
08043914 g 00000328 battle_make_oam_normal_battle
08043c3c g 000000a0 battle_make_oam_safari_battle
08043cdc l 00000010 sub_8043CDC
08043cdc l 00000010 GetHealthboxElementGfxPtr
08043cec l 00000070 sub_8043CEC
08043d5c l 00000028 sub_8043D5C
08043d84 g 0000002c sub_8043D84
Expand All @@ -2436,73 +2436,9 @@
08043fc0 g 0000012c sub_8043FC0
080440ec g 00000124 sub_80440EC
08044210 g 00000128 sub_8044210
08044338 g 00000214 sub_8044338
08044338 g 00000214 PrintSafariMonInfo
0804454c g 000002b8 sub_804454C
08044804 g 0000049c sub_8044804
08044834 l 00000000 _08044834
08044850 l 00000000 _08044850
08044854 l 00000000 _08044854
08044864 l 00000000 _08044864
0804486a l 00000000 _0804486A
0804486e l 00000000 _0804486E
08044874 l 00000000 _08044874
08044878 l 00000000 _08044878
08044882 l 00000000 _08044882
08044884 l 00000000 _08044884
080448a0 l 00000000 _080448A0
080448b4 l 00000000 _080448B4
08044930 l 00000000 _08044930
08044934 l 00000000 _08044934
08044938 l 00000000 _08044938
0804493c l 00000000 _0804493C
08044940 l 00000000 _08044940
08044944 l 00000000 _08044944
08044948 l 00000000 _08044948
0804494c l 00000000 _0804494C
08044950 l 00000000 _08044950
08044954 l 00000000 _08044954
0804495a l 00000000 _0804495A
08044970 l 00000000 _08044970
080449a0 l 00000000 _080449A0
080449be l 00000000 _080449BE
08044a04 l 00000000 _08044A04
08044a08 l 00000000 _08044A08
08044a0c l 00000000 _08044A0C
08044a10 l 00000000 _08044A10
08044a14 l 00000000 _08044A14
08044a18 l 00000000 _08044A18
08044a56 l 00000000 _08044A56
08044a76 l 00000000 _08044A76
08044a9a l 00000000 _08044A9A
08044ac4 l 00000000 _08044AC4
08044ac8 l 00000000 _08044AC8
08044acc l 00000000 _08044ACC
08044ad0 l 00000000 _08044AD0
08044ad4 l 00000000 _08044AD4
08044ad8 l 00000000 _08044AD8
08044adc l 00000000 _08044ADC
08044ae6 l 00000000 _08044AE6
08044b14 l 00000000 _08044B14
08044b2e l 00000000 _08044B2E
08044b46 l 00000000 _08044B46
08044b52 l 00000000 _08044B52
08044b5e l 00000000 _08044B5E
08044b78 l 00000000 _08044B78
08044ba4 l 00000000 _08044BA4
08044ba8 l 00000000 _08044BA8
08044bac l 00000000 _08044BAC
08044bb0 l 00000000 _08044BB0
08044bb4 l 00000000 _08044BB4
08044bb8 l 00000000 _08044BB8
08044bc2 l 00000000 _08044BC2
08044bf0 l 00000000 _08044BF0
08044c0a l 00000000 _08044C0A
08044c22 l 00000000 _08044C22
08044c2e l 00000000 _08044C2E
08044c38 l 00000000 _08044C38
08044c62 l 00000000 _08044C62
08044c98 l 00000000 _08044C98
08044c9c l 00000000 _08044C9C
08044804 g 0000049c CreatePartyStatusSummarySprites
08044ca0 g 000001d4 sub_8044CA0
08044e74 l 00000058 sub_8044E74
08044ecc l 000000a4 sub_8044ECC
Expand Down Expand Up @@ -27757,7 +27693,7 @@
0820a848 g 0000000c gUnknown_0820A848
0820a854 g 00000008 gUnknown_0820A854
0820a85c g 00000008 gUnknown_0820A85C
0820a864 g 00000016 gUnknown_0820A864
0820a864 g 00000016 sEmptyWhiteText_GrayHighlight
0820a87c g 00000018 gUnknown_0820A87C
0820a894 g 00000008 gUnknown_0820A894
0820a89c g 00000014 gUnknown_0820A89C
Expand Down
74 changes: 5 additions & 69 deletions pokeruby_de.sym
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@
0800354c g 00000048 Text_PrintWindowSimple
08003594 g 0000002e Text_InitWindowAndPrintText
080035c4 g 00000042 sub_8003490
08003608 g 00000018 sub_80034D4
08003608 g 00000018 RenderTextHandleBold
08003620 g 00000018 sub_80034EC
08003638 g 00000054 sub_8003504
0800368c g 00000054 sub_8003558
Expand Down Expand Up @@ -2449,7 +2449,7 @@
08043c04 g 00000032 unref_sub_80438E0
08043c38 g 00000328 battle_make_oam_normal_battle
08043f60 g 000000a0 battle_make_oam_safari_battle
08044000 l 00000010 sub_8043CDC
08044000 l 00000010 GetHealthboxElementGfxPtr
08044010 l 00000070 sub_8043CEC
08044080 l 00000028 sub_8043D5C
080440a8 g 0000002c sub_8043D84
Expand All @@ -2463,73 +2463,9 @@
080442e4 g 0000012c sub_8043FC0
08044410 g 00000124 sub_80440EC
08044534 g 00000128 sub_8044210
0804465c g 00000214 sub_8044338
0804465c g 00000214 PrintSafariMonInfo
08044870 g 000002b8 sub_804454C
08044b28 g 0000049c sub_8044804
08044b58 l 00000000 _08044834
08044b74 l 00000000 _08044850
08044b78 l 00000000 _08044854
08044b88 l 00000000 _08044864
08044b8e l 00000000 _0804486A
08044b92 l 00000000 _0804486E
08044b98 l 00000000 _08044874
08044b9c l 00000000 _08044878
08044ba6 l 00000000 _08044882
08044ba8 l 00000000 _08044884
08044bc4 l 00000000 _080448A0
08044bd8 l 00000000 _080448B4
08044c54 l 00000000 _08044930
08044c58 l 00000000 _08044934
08044c5c l 00000000 _08044938
08044c60 l 00000000 _0804493C
08044c64 l 00000000 _08044940
08044c68 l 00000000 _08044944
08044c6c l 00000000 _08044948
08044c70 l 00000000 _0804494C
08044c74 l 00000000 _08044950
08044c78 l 00000000 _08044954
08044c7e l 00000000 _0804495A
08044c94 l 00000000 _08044970
08044cc4 l 00000000 _080449A0
08044ce2 l 00000000 _080449BE
08044d28 l 00000000 _08044A04
08044d2c l 00000000 _08044A08
08044d30 l 00000000 _08044A0C
08044d34 l 00000000 _08044A10
08044d38 l 00000000 _08044A14
08044d3c l 00000000 _08044A18
08044d7a l 00000000 _08044A56
08044d9a l 00000000 _08044A76
08044dbe l 00000000 _08044A9A
08044de8 l 00000000 _08044AC4
08044dec l 00000000 _08044AC8
08044df0 l 00000000 _08044ACC
08044df4 l 00000000 _08044AD0
08044df8 l 00000000 _08044AD4
08044dfc l 00000000 _08044AD8
08044e00 l 00000000 _08044ADC
08044e0a l 00000000 _08044AE6
08044e38 l 00000000 _08044B14
08044e52 l 00000000 _08044B2E
08044e6a l 00000000 _08044B46
08044e76 l 00000000 _08044B52
08044e82 l 00000000 _08044B5E
08044e9c l 00000000 _08044B78
08044ec8 l 00000000 _08044BA4
08044ecc l 00000000 _08044BA8
08044ed0 l 00000000 _08044BAC
08044ed4 l 00000000 _08044BB0
08044ed8 l 00000000 _08044BB4
08044edc l 00000000 _08044BB8
08044ee6 l 00000000 _08044BC2
08044f14 l 00000000 _08044BF0
08044f2e l 00000000 _08044C0A
08044f46 l 00000000 _08044C22
08044f52 l 00000000 _08044C2E
08044f5c l 00000000 _08044C38
08044f86 l 00000000 _08044C62
08044fbc l 00000000 _08044C98
08044fc0 l 00000000 _08044C9C
08044b28 g 0000049c CreatePartyStatusSummarySprites
08044fc4 g 000001d4 sub_8044CA0
08045198 l 00000058 sub_8044E74
080451f0 l 000000a4 sub_8044ECC
Expand Down Expand Up @@ -27778,7 +27714,7 @@
08217818 g 0000000c gUnknown_0820A848
08217824 g 00000008 gUnknown_0820A854
0821782c g 00000008 gUnknown_0820A85C
08217834 g 00000016 gUnknown_0820A864
08217834 g 00000016 sEmptyWhiteText_GrayHighlight
0821784c g 00000018 gUnknown_0820A87C
08217864 g 00000008 gUnknown_0820A894
0821786c g 00000014 gUnknown_0820A89C
Expand Down
74 changes: 5 additions & 69 deletions pokeruby_de_debug.sym
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
08003564 g 00000048 Text_PrintWindowSimple
080035ac g 0000002e Text_InitWindowAndPrintText
080035dc g 00000042 sub_8003490
08003620 g 00000018 sub_80034D4
08003620 g 00000018 RenderTextHandleBold
08003638 g 00000018 sub_80034EC
08003650 g 00000054 sub_8003504
080036a4 g 00000054 sub_8003558
Expand Down Expand Up @@ -2577,7 +2577,7 @@
08047d80 g 00000032 unref_sub_80438E0
08047db4 g 00000328 battle_make_oam_normal_battle
080480dc g 000000a0 battle_make_oam_safari_battle
0804817c l 00000010 sub_8043CDC
0804817c l 00000010 GetHealthboxElementGfxPtr
0804818c l 00000070 sub_8043CEC
080481fc l 00000028 sub_8043D5C
08048224 g 0000002c sub_8043D84
Expand All @@ -2591,73 +2591,9 @@
08048460 g 0000012c sub_8043FC0
0804858c g 00000124 sub_80440EC
080486b0 g 00000128 sub_8044210
080487d8 g 00000214 sub_8044338
080487d8 g 00000214 PrintSafariMonInfo
080489ec g 000002c4 sub_804454C
08048cb0 g 0000049c sub_8044804
08048ce0 l 00000000 _08044834
08048cfc l 00000000 _08044850
08048d00 l 00000000 _08044854
08048d10 l 00000000 _08044864
08048d16 l 00000000 _0804486A
08048d1a l 00000000 _0804486E
08048d20 l 00000000 _08044874
08048d24 l 00000000 _08044878
08048d2e l 00000000 _08044882
08048d30 l 00000000 _08044884
08048d4c l 00000000 _080448A0
08048d60 l 00000000 _080448B4
08048ddc l 00000000 _08044930
08048de0 l 00000000 _08044934
08048de4 l 00000000 _08044938
08048de8 l 00000000 _0804493C
08048dec l 00000000 _08044940
08048df0 l 00000000 _08044944
08048df4 l 00000000 _08044948
08048df8 l 00000000 _0804494C
08048dfc l 00000000 _08044950
08048e00 l 00000000 _08044954
08048e06 l 00000000 _0804495A
08048e1c l 00000000 _08044970
08048e4c l 00000000 _080449A0
08048e6a l 00000000 _080449BE
08048eb0 l 00000000 _08044A04
08048eb4 l 00000000 _08044A08
08048eb8 l 00000000 _08044A0C
08048ebc l 00000000 _08044A10
08048ec0 l 00000000 _08044A14
08048ec4 l 00000000 _08044A18
08048f02 l 00000000 _08044A56
08048f22 l 00000000 _08044A76
08048f46 l 00000000 _08044A9A
08048f70 l 00000000 _08044AC4
08048f74 l 00000000 _08044AC8
08048f78 l 00000000 _08044ACC
08048f7c l 00000000 _08044AD0
08048f80 l 00000000 _08044AD4
08048f84 l 00000000 _08044AD8
08048f88 l 00000000 _08044ADC
08048f92 l 00000000 _08044AE6
08048fc0 l 00000000 _08044B14
08048fda l 00000000 _08044B2E
08048ff2 l 00000000 _08044B46
08048ffe l 00000000 _08044B52
0804900a l 00000000 _08044B5E
08049024 l 00000000 _08044B78
08049050 l 00000000 _08044BA4
08049054 l 00000000 _08044BA8
08049058 l 00000000 _08044BAC
0804905c l 00000000 _08044BB0
08049060 l 00000000 _08044BB4
08049064 l 00000000 _08044BB8
0804906e l 00000000 _08044BC2
0804909c l 00000000 _08044BF0
080490b6 l 00000000 _08044C0A
080490ce l 00000000 _08044C22
080490da l 00000000 _08044C2E
080490e4 l 00000000 _08044C38
0804910e l 00000000 _08044C62
08049144 l 00000000 _08044C98
08049148 l 00000000 _08044C9C
08048cb0 g 0000049c CreatePartyStatusSummarySprites
0804914c g 000001d4 sub_8044CA0
08049320 l 00000058 sub_8044E74
08049378 l 000000a4 sub_8044ECC
Expand Down Expand Up @@ -28840,7 +28776,7 @@
082309b0 g 0000000c gUnknown_0820A848
082309bc g 00000008 gUnknown_0820A854
082309c4 g 00000008 gUnknown_0820A85C
082309cc g 00000016 gUnknown_0820A864
082309cc g 00000016 sEmptyWhiteText_GrayHighlight
082309e4 g 00000018 gUnknown_0820A87C
082309fc g 00000008 gUnknown_0820A894
08230a04 g 00000014 gUnknown_0820A89C
Expand Down
Loading

0 comments on commit 34e5cb0

Please sign in to comment.