Skip to content

Commit

Permalink
Merge pull request #859 from AreaZeroArven/work9
Browse files Browse the repository at this point in the history
  • Loading branch information
@luckytyphlosion
luckytyphlosion committed Oct 1, 2024
1 parent 4ffe7ec commit 228dd63
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 44 deletions.
8 changes: 4 additions & 4 deletions pokeruby.sym
View file
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,7 +2436,7 @@
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 CreatePartyStatusSummarySprites
08044ca0 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27693,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
8 changes: 4 additions & 4 deletions pokeruby_de.sym
View file
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,7 +2463,7 @@
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 CreatePartyStatusSummarySprites
08044fc4 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27714,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
8 changes: 4 additions & 4 deletions pokeruby_de_debug.sym
View file
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,7 +2591,7 @@
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 CreatePartyStatusSummarySprites
0804914c g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -28776,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
8 changes: 4 additions & 4 deletions pokeruby_de_rev1.sym
View file
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,7 +2463,7 @@
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 CreatePartyStatusSummarySprites
08044fc4 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27714,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
8 changes: 4 additions & 4 deletions pokeruby_rev1.sym
View file
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 @@
08043900 g 00000032 unref_sub_80438E0
08043934 g 00000328 battle_make_oam_normal_battle
08043c5c g 000000a0 battle_make_oam_safari_battle
08043cfc l 00000010 sub_8043CDC
08043cfc l 00000010 GetHealthboxElementGfxPtr
08043d0c l 00000070 sub_8043CEC
08043d7c l 00000028 sub_8043D5C
08043da4 g 0000002c sub_8043D84
Expand All @@ -2436,7 +2436,7 @@
08043fe0 g 0000012c sub_8043FC0
0804410c g 00000124 sub_80440EC
08044230 g 00000128 sub_8044210
08044358 g 00000214 sub_8044338
08044358 g 00000214 PrintSafariMonInfo
0804456c g 000002b8 sub_804454C
08044824 g 0000049c CreatePartyStatusSummarySprites
08044cc0 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27693,7 +27693,7 @@
0820a860 g 0000000c gUnknown_0820A848
0820a86c g 00000008 gUnknown_0820A854
0820a874 g 00000008 gUnknown_0820A85C
0820a87c g 00000016 gUnknown_0820A864
0820a87c g 00000016 sEmptyWhiteText_GrayHighlight
0820a894 g 00000018 gUnknown_0820A87C
0820a8ac g 00000008 gUnknown_0820A894
0820a8b4 g 00000014 gUnknown_0820A89C
Expand Down
8 changes: 4 additions & 4 deletions pokeruby_rev2.sym
View file
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 @@
08043900 g 00000032 unref_sub_80438E0
08043934 g 00000328 battle_make_oam_normal_battle
08043c5c g 000000a0 battle_make_oam_safari_battle
08043cfc l 00000010 sub_8043CDC
08043cfc l 00000010 GetHealthboxElementGfxPtr
08043d0c l 00000070 sub_8043CEC
08043d7c l 00000028 sub_8043D5C
08043da4 g 0000002c sub_8043D84
Expand All @@ -2436,7 +2436,7 @@
08043fe0 g 0000012c sub_8043FC0
0804410c g 00000124 sub_80440EC
08044230 g 00000128 sub_8044210
08044358 g 00000214 sub_8044338
08044358 g 00000214 PrintSafariMonInfo
0804456c g 000002b8 sub_804454C
08044824 g 0000049c CreatePartyStatusSummarySprites
08044cc0 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27693,7 +27693,7 @@
0820a860 g 0000000c gUnknown_0820A848
0820a86c g 00000008 gUnknown_0820A854
0820a874 g 00000008 gUnknown_0820A85C
0820a87c g 00000016 gUnknown_0820A864
0820a87c g 00000016 sEmptyWhiteText_GrayHighlight
0820a894 g 00000018 gUnknown_0820A87C
0820a8ac g 00000008 gUnknown_0820A894
0820a8b4 g 00000014 gUnknown_0820A89C
Expand Down
8 changes: 4 additions & 4 deletions pokesapphire.sym
View file
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,7 +2436,7 @@
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 CreatePartyStatusSummarySprites
08044ca0 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27693,7 +27693,7 @@
0820a7d8 g 0000000c gUnknown_0820A848
0820a7e4 g 00000008 gUnknown_0820A854
0820a7ec g 00000008 gUnknown_0820A85C
0820a7f4 g 00000016 gUnknown_0820A864
0820a7f4 g 00000016 sEmptyWhiteText_GrayHighlight
0820a80c g 00000018 gUnknown_0820A87C
0820a824 g 00000008 gUnknown_0820A894
0820a82c g 00000014 gUnknown_0820A89C
Expand Down
8 changes: 4 additions & 4 deletions pokesapphire_de.sym
View file
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,7 +2463,7 @@
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 CreatePartyStatusSummarySprites
08044fc4 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27714,7 +27714,7 @@
082177ac g 0000000c gUnknown_0820A848
082177b8 g 00000008 gUnknown_0820A854
082177c0 g 00000008 gUnknown_0820A85C
082177c8 g 00000016 gUnknown_0820A864
082177c8 g 00000016 sEmptyWhiteText_GrayHighlight
082177e0 g 00000018 gUnknown_0820A87C
082177f8 g 00000008 gUnknown_0820A894
08217800 g 00000014 gUnknown_0820A89C
Expand Down
8 changes: 4 additions & 4 deletions pokesapphire_de_rev1.sym
View file
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,7 +2463,7 @@
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 CreatePartyStatusSummarySprites
08044fc4 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27714,7 +27714,7 @@
082177ac g 0000000c gUnknown_0820A848
082177b8 g 00000008 gUnknown_0820A854
082177c0 g 00000008 gUnknown_0820A85C
082177c8 g 00000016 gUnknown_0820A864
082177c8 g 00000016 sEmptyWhiteText_GrayHighlight
082177e0 g 00000018 gUnknown_0820A87C
082177f8 g 00000008 gUnknown_0820A894
08217800 g 00000014 gUnknown_0820A89C
Expand Down
8 changes: 4 additions & 4 deletions pokesapphire_rev1.sym
View file
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 @@
08043900 g 00000032 unref_sub_80438E0
08043934 g 00000328 battle_make_oam_normal_battle
08043c5c g 000000a0 battle_make_oam_safari_battle
08043cfc l 00000010 sub_8043CDC
08043cfc l 00000010 GetHealthboxElementGfxPtr
08043d0c l 00000070 sub_8043CEC
08043d7c l 00000028 sub_8043D5C
08043da4 g 0000002c sub_8043D84
Expand All @@ -2436,7 +2436,7 @@
08043fe0 g 0000012c sub_8043FC0
0804410c g 00000124 sub_80440EC
08044230 g 00000128 sub_8044210
08044358 g 00000214 sub_8044338
08044358 g 00000214 PrintSafariMonInfo
0804456c g 000002b8 sub_804454C
08044824 g 0000049c CreatePartyStatusSummarySprites
08044cc0 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27693,7 +27693,7 @@
0820a7f0 g 0000000c gUnknown_0820A848
0820a7fc g 00000008 gUnknown_0820A854
0820a804 g 00000008 gUnknown_0820A85C
0820a80c g 00000016 gUnknown_0820A864
0820a80c g 00000016 sEmptyWhiteText_GrayHighlight
0820a824 g 00000018 gUnknown_0820A87C
0820a83c g 00000008 gUnknown_0820A894
0820a844 g 00000014 gUnknown_0820A89C
Expand Down
8 changes: 4 additions & 4 deletions pokesapphire_rev2.sym
View file
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 @@
08043900 g 00000032 unref_sub_80438E0
08043934 g 00000328 battle_make_oam_normal_battle
08043c5c g 000000a0 battle_make_oam_safari_battle
08043cfc l 00000010 sub_8043CDC
08043cfc l 00000010 GetHealthboxElementGfxPtr
08043d0c l 00000070 sub_8043CEC
08043d7c l 00000028 sub_8043D5C
08043da4 g 0000002c sub_8043D84
Expand All @@ -2436,7 +2436,7 @@
08043fe0 g 0000012c sub_8043FC0
0804410c g 00000124 sub_80440EC
08044230 g 00000128 sub_8044210
08044358 g 00000214 sub_8044338
08044358 g 00000214 PrintSafariMonInfo
0804456c g 000002b8 sub_804454C
08044824 g 0000049c CreatePartyStatusSummarySprites
08044cc0 g 000001d4 sub_8044CA0
Expand Down Expand Up @@ -27693,7 +27693,7 @@
0820a7f0 g 0000000c gUnknown_0820A848
0820a7fc g 00000008 gUnknown_0820A854
0820a804 g 00000008 gUnknown_0820A85C
0820a80c g 00000016 gUnknown_0820A864
0820a80c g 00000016 sEmptyWhiteText_GrayHighlight
0820a824 g 00000018 gUnknown_0820A87C
0820a83c g 00000008 gUnknown_0820A894
0820a844 g 00000014 gUnknown_0820A89C
Expand Down

0 comments on commit 228dd63

Please sign in to comment.